You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by vr...@apache.org on 2015/10/11 18:05:16 UTC
[01/29] incubator-apex-core git commit: APEX-158 - buffer server
tests intermittently fail. Temporarily disable testng provider while
investigating why unit tests fail.
Repository: incubator-apex-core
Updated Branches:
refs/heads/feature-module 4f507eab5 -> b17365f94
APEX-158 - buffer server tests intermittently fail. Temporarily disable testng provider while investigating why unit tests fail.
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/9990e159
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/9990e159
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/9990e159
Branch: refs/heads/feature-module
Commit: 9990e159599998bb3a6f574c8b51a73d5eaf2c3a
Parents: 0a85586
Author: Vlad Rozov <v....@datatorrent.com>
Authored: Sat Sep 26 09:30:39 2015 -0700
Committer: Vlad Rozov <v....@datatorrent.com>
Committed: Sat Sep 26 09:30:39 2015 -0700
----------------------------------------------------------------------
bufferserver/pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/9990e159/bufferserver/pom.xml
----------------------------------------------------------------------
diff --git a/bufferserver/pom.xml b/bufferserver/pom.xml
index 1c5027f..bbd27f2 100644
--- a/bufferserver/pom.xml
+++ b/bufferserver/pom.xml
@@ -35,6 +35,7 @@
<build>
<plugins>
+ <!--
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<dependencies>
@@ -45,6 +46,7 @@
</dependency>
</dependencies>
</plugin>
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
[21/29] incubator-apex-core git commit: Preparing for 3.3.0
development
Posted by vr...@apache.org.
Preparing for 3.3.0 development
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/e5a01842
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/e5a01842
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/e5a01842
Branch: refs/heads/feature-module
Commit: e5a01842b1604b6d037843b0893a50e8d08775f3
Parents: b986f70
Author: Thomas Weise <th...@datatorrent.com>
Authored: Mon Oct 5 20:31:40 2015 -0700
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Mon Oct 5 20:31:40 2015 -0700
----------------------------------------------------------------------
apex-app-archetype/pom.xml | 2 +-
apex-conf-archetype/pom.xml | 2 +-
api/pom.xml | 2 +-
bufferserver/pom.xml | 2 +-
common/pom.xml | 2 +-
engine/pom.xml | 2 +-
pom.xml | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/e5a01842/apex-app-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/apex-app-archetype/pom.xml b/apex-app-archetype/pom.xml
index 7c9f332..a26d36a 100644
--- a/apex-app-archetype/pom.xml
+++ b/apex-app-archetype/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<artifactId>apex-app-archetype</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/e5a01842/apex-conf-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/apex-conf-archetype/pom.xml b/apex-conf-archetype/pom.xml
index e5b4d3e..41501a8 100644
--- a/apex-conf-archetype/pom.xml
+++ b/apex-conf-archetype/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<artifactId>apex-conf-archetype</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/e5a01842/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 8c330dc..4262e8d 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<artifactId>dt-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/e5a01842/bufferserver/pom.xml
----------------------------------------------------------------------
diff --git a/bufferserver/pom.xml b/bufferserver/pom.xml
index 6317470..939da4f 100644
--- a/bufferserver/pom.xml
+++ b/bufferserver/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<artifactId>dt-bufferserver</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/e5a01842/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 520d09a..898b45c 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<artifactId>dt-common</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/e5a01842/engine/pom.xml
----------------------------------------------------------------------
diff --git a/engine/pom.xml b/engine/pom.xml
index 3efd33f..752fc0d 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<artifactId>dt-engine</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/e5a01842/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8f68dcb..e738908 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Apex Core</name>
[19/29] incubator-apex-core git commit: Merge branch 'readme-cleanup'
of https://github.com/tweise/incubator-apex-core into devel-3
Posted by vr...@apache.org.
Merge branch 'readme-cleanup' of https://github.com/tweise/incubator-apex-core into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/8104e25b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/8104e25b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/8104e25b
Branch: refs/heads/feature-module
Commit: 8104e25b6e0111d839038ac0c30e25593f2cb013
Parents: 5324f10 ec03f12
Author: Vlad Rozov <v....@datatorrent.com>
Authored: Sun Oct 4 17:08:53 2015 -0700
Committer: Vlad Rozov <v....@datatorrent.com>
Committed: Sun Oct 4 17:08:53 2015 -0700
----------------------------------------------------------------------
README.md | 23 +-
engine/src/test/resources/README | 9 -
...san_ RSA Public Key Cryptography in Java.pdf | 1932 ------------------
3 files changed, 5 insertions(+), 1959 deletions(-)
----------------------------------------------------------------------
[25/29] incubator-apex-core git commit: APEX-181 added utility
function to get all RM addresses
Posted by vr...@apache.org.
APEX-181 added utility function to get all RM addresses
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/3d0dd624
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/3d0dd624
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/3d0dd624
Branch: refs/heads/feature-module
Commit: 3d0dd624a1b83b819fa64ab1f9fc3da6402db7fb
Parents: c442568
Author: David Yan <da...@datatorrent.com>
Authored: Wed Oct 7 18:31:36 2015 -0700
Committer: David Yan <da...@datatorrent.com>
Committed: Thu Oct 8 10:35:18 2015 -0700
----------------------------------------------------------------------
.../stram/client/StramClientUtils.java | 17 +++++++++++++++++
.../stram/client/StramClientUtilsTest.java | 19 ++++++++++++++++---
2 files changed, 33 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/3d0dd624/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java b/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
index 04a3484..4ac6487 100644
--- a/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
+++ b/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
@@ -777,4 +777,21 @@ public class StramClientUtils
return host + ":" + socketAddress.getPort();
}
+ public static List<InetSocketAddress> getRMAddresses(Configuration conf)
+ {
+
+ List<InetSocketAddress> rmAddresses = new ArrayList<>();
+ if (ConfigUtils.isRMHAEnabled(conf)) {
+ // HA is enabled get all
+ for (String rmId : ConfigUtils.getRMHAIds(conf)) {
+ InetSocketAddress socketAddress = getRMWebAddress(conf, rmId);
+ rmAddresses.add(socketAddress);
+ }
+ } else {
+ InetSocketAddress socketAddress = getRMWebAddress(conf, null);
+ rmAddresses.add(socketAddress);
+ }
+ return rmAddresses;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/3d0dd624/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java
----------------------------------------------------------------------
diff --git a/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java b/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java
index e97b49f..f9fca05 100644
--- a/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java
+++ b/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java
@@ -19,7 +19,9 @@
package com.datatorrent.stram.client;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.net.UnknownHostException;
+import java.util.List;
import org.junit.Assert;
import org.junit.Test;
@@ -57,9 +59,16 @@ public class StramClientUtilsTest
conf.set(YarnConfiguration.RM_WEBAPP_ADDRESS, "192.168.1.1:8032");
conf.set(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS, "192.168.1.2:8032");
Assert.assertEquals(getHostString("192.168.1.1") + ":8032", StramClientUtils.getSocketConnectString(StramClientUtils.getRMWebAddress(conf, null)));
+ List<InetSocketAddress> addresses = StramClientUtils.getRMAddresses(conf);
+ Assert.assertEquals(1, addresses.size());
+ Assert.assertEquals(getHostString("192.168.1.1") + ":8032", StramClientUtils.getSocketConnectString(addresses.get(0)));
+
conf.setBoolean(CommonConfigurationKeysPublic.HADOOP_SSL_ENABLED_KEY, true);
Assert.assertEquals(getHostString("192.168.1.2") + ":8032", StramClientUtils.getSocketConnectString(StramClientUtils.getRMWebAddress(conf, null)));
-
+ addresses = StramClientUtils.getRMAddresses(conf);
+ Assert.assertEquals(1, addresses.size());
+ Assert.assertEquals(getHostString("192.168.1.2") + ":8032", StramClientUtils.getSocketConnectString(addresses.get(0)));
+
// set localhost if host is unknown
conf.set(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS, "someunknownhost.:8032");
@@ -70,12 +79,16 @@ public class StramClientUtilsTest
Assert.assertEquals(InetAddress.getLocalHost().getCanonicalHostName() + ":8032", StramClientUtils.getSocketConnectString(StramClientUtils.getRMWebAddress(conf, null)));
// test when HA is enabled
- conf.getBoolean(ConfigUtils.RM_HA_ENABLED, true);
+ conf.setBoolean(ConfigUtils.RM_HA_ENABLED, true);
conf.set(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS + ".rm1", "192.168.1.1:8032");
conf.set(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS + ".rm2", "192.168.1.2:8032");
+ conf.set("yarn.resourcemanager.ha.rm-ids", "rm1,rm2");
Assert.assertEquals(getHostString("192.168.1.1") + ":8032", StramClientUtils.getSocketConnectString(StramClientUtils.getRMWebAddress(conf, "rm1")));
Assert.assertEquals(getHostString("192.168.1.2") + ":8032", StramClientUtils.getSocketConnectString(StramClientUtils.getRMWebAddress(conf, "rm2")));
-
+ addresses = StramClientUtils.getRMAddresses(conf);
+ Assert.assertEquals(2, addresses.size());
+ Assert.assertEquals(getHostString("192.168.1.1") + ":8032", StramClientUtils.getSocketConnectString(addresses.get(0)));
+ Assert.assertEquals(getHostString("192.168.1.2") + ":8032", StramClientUtils.getSocketConnectString(addresses.get(1)));
}
}
[16/29] incubator-apex-core git commit: Using YarnConfiguration
getSocketAddr to get the individual rm addresses in HA mode as it will lookup
all the necessary configuration to return the address namely
yarn.resourcemanager.address followed by yarn.resou
Posted by vr...@apache.org.
Using YarnConfiguration getSocketAddr to get the individual rm addresses in HA mode as it will lookup all the necessary configuration to return the address namely yarn.resourcemanager.address followed by yarn.resourcemanager.hostname
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/45e891c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/45e891c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/45e891c7
Branch: refs/heads/feature-module
Commit: 45e891c7cd7f83a34a4eefc0de10306ba139d2da
Parents: bf72215
Author: Pramod Immaneni <pr...@datatorrent.com>
Authored: Fri Sep 25 01:39:48 2015 -0700
Committer: Pramod Immaneni <pr...@datatorrent.com>
Committed: Sun Oct 4 09:54:50 2015 -0700
----------------------------------------------------------------------
.../stram/client/StramClientUtils.java | 28 +++++++++++++-------
.../com/datatorrent/stram/util/ConfigUtils.java | 1 +
2 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/45e891c7/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java b/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
index d596a73..45d2feb 100644
--- a/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
+++ b/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
@@ -22,10 +22,6 @@ import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
-
import org.mozilla.javascript.Scriptable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,7 +34,6 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
-import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.security.Credentials;
import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.security.UserGroupInformation;
@@ -58,6 +53,10 @@ import org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier;
import org.apache.hadoop.yarn.util.ConverterUtils;
import org.apache.log4j.DTLoggerFactory;
+import com.google.common.base.Joiner;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Sets;
+
import com.datatorrent.api.StreamingApplication;
import com.datatorrent.stram.StramClient;
@@ -246,10 +245,7 @@ public class StramClientUtils
for (String rmId : ConfigUtils.getRMHAIds(conf)) {
LOG.info("Yarn Resource Manager id: {}", rmId);
// Set RM_ID to get the corresponding RM_ADDRESS
- services.add(SecurityUtil.buildTokenService(NetUtils.createSocketAddr(
- conf.get(RM_HOSTNAME_PREFIX + rmId),
- YarnConfiguration.DEFAULT_RM_PORT,
- RM_HOSTNAME_PREFIX + rmId)).toString());
+ services.add(SecurityUtil.buildTokenService(getRMHAAddress(rmId)).toString());
}
Text rmTokenService = new Text(Joiner.on(',').join(services));
@@ -284,6 +280,20 @@ public class StramClientUtils
credentials.addToken(token.getService(), token);
}
+ public InetSocketAddress getRMHAAddress(String rmId)
+ {
+ YarnConfiguration yarnConf;
+ if (conf instanceof YarnConfiguration) {
+ yarnConf = (YarnConfiguration)conf;
+ } else {
+ yarnConf = new YarnConfiguration(conf);
+ }
+ yarnConf.set(ConfigUtils.RM_HA_ID, rmId);
+ InetSocketAddress socketAddr = yarnConf.getSocketAddr(YarnConfiguration.RM_ADDRESS, YarnConfiguration.DEFAULT_RM_ADDRESS, YarnConfiguration.DEFAULT_RM_PORT);
+ yarnConf.unset(ConfigUtils.RM_HA_ID);
+ return socketAddr;
+ }
+
}
private static final Logger LOG = LoggerFactory.getLogger(StramClientUtils.class);
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/45e891c7/engine/src/main/java/com/datatorrent/stram/util/ConfigUtils.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/util/ConfigUtils.java b/engine/src/main/java/com/datatorrent/stram/util/ConfigUtils.java
index 481815f..68fe27b 100644
--- a/engine/src/main/java/com/datatorrent/stram/util/ConfigUtils.java
+++ b/engine/src/main/java/com/datatorrent/stram/util/ConfigUtils.java
@@ -39,6 +39,7 @@ public class ConfigUtils
private static final String RM_HA_PREFIX = YarnConfiguration.RM_PREFIX + "ha.";
public static final String RM_HA_ENABLED = RM_HA_PREFIX + "enabled";
public static final String RM_HA_IDS = RM_HA_PREFIX + "rm-ids";
+ public static final String RM_HA_ID = RM_HA_PREFIX + "id";
public static final boolean DEFAULT_RM_HA_ENABLED = false;
private static String yarnLogDir;
[17/29] incubator-apex-core git commit: Merge branch 'apex-116' of
https://github.com/PramodSSImmaneni/incubator-apex-core into devel-3
Posted by vr...@apache.org.
Merge branch 'apex-116' of https://github.com/PramodSSImmaneni/incubator-apex-core into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/2bd6a8db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/2bd6a8db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/2bd6a8db
Branch: refs/heads/feature-module
Commit: 2bd6a8db567964037dad0c5b8fcbe2bdcec88fb7
Parents: 88ee4ad 45e891c
Author: Vlad Rozov <v....@datatorrent.com>
Authored: Sun Oct 4 10:29:25 2015 -0700
Committer: Vlad Rozov <v....@datatorrent.com>
Committed: Sun Oct 4 10:29:25 2015 -0700
----------------------------------------------------------------------
.../stram/client/StramClientUtils.java | 28 +++++++++++++-------
.../com/datatorrent/stram/util/ConfigUtils.java | 1 +
2 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/2bd6a8db/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/2bd6a8db/engine/src/main/java/com/datatorrent/stram/util/ConfigUtils.java
----------------------------------------------------------------------
[04/29] incubator-apex-core git commit: APEX-159 #resolve Fix
application path in mini cluster test.
Posted by vr...@apache.org.
APEX-159 #resolve Fix application path in mini cluster test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/fb53705d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/fb53705d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/fb53705d
Branch: refs/heads/feature-module
Commit: fb53705d928f18087675a1bfb8b45c9580129682
Parents: 0a89c83
Author: Thomas Weise <th...@datatorrent.com>
Authored: Sun Sep 27 16:08:00 2015 -0700
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Sun Sep 27 16:08:00 2015 -0700
----------------------------------------------------------------------
.../java/com/datatorrent/stram/StramMiniClusterTest.java | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/fb53705d/engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java
----------------------------------------------------------------------
diff --git a/engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java b/engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java
index 493156b..f0fd325 100644
--- a/engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java
+++ b/engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java
@@ -51,7 +51,6 @@ import com.sun.jersey.api.client.WebResource;
import com.datatorrent.api.*;
import com.datatorrent.api.Context.OperatorContext;
-import com.datatorrent.common.util.AsyncFSStorageAgent;
import com.datatorrent.stram.client.StramClientUtils;
import com.datatorrent.stram.client.StramClientUtils.YarnClientHelper;
import com.datatorrent.stram.engine.GenericTestOperator;
@@ -206,9 +205,6 @@ public class StramMiniClusterTest
LogicalPlanConfiguration tb = new LogicalPlanConfiguration(conf);
tb.addFromProperties(dagProps, null);
LogicalPlan dag = createDAG(tb);
- AsyncFSStorageAgent agent = new AsyncFSStorageAgent(testMeta.dir, null);
- agent.setSyncCheckpoint(true);
- dag.setAttribute(OperatorContext.STORAGE_AGENT, agent);
Configuration yarnConf = new Configuration(yarnCluster.getConfig());
StramClient client = new StramClient(yarnConf, dag);
try {
@@ -231,7 +227,7 @@ public class StramMiniClusterTest
private LogicalPlan createDAG(LogicalPlanConfiguration lpc) throws Exception
{
LogicalPlan dag = new LogicalPlan();
- dag.setAttribute(LogicalPlan.APPLICATION_PATH, "file:" + System.getProperty("user.dir") + "/" + testMeta.dir);
+ dag.setAttribute(LogicalPlan.APPLICATION_PATH, new File(testMeta.dir).toURI().toString());
lpc.prepareDAG(dag,null,"testApp");
dag.validate();
Assert.assertEquals("", Integer.valueOf(128), dag.getValue(DAG.MASTER_MEMORY_MB));
@@ -364,10 +360,7 @@ public class StramMiniClusterTest
{
LogicalPlan dag = new LogicalPlan();
- dag.setAttribute(LogicalPlan.APPLICATION_PATH, testMeta.dir);
- AsyncFSStorageAgent agent = new AsyncFSStorageAgent(testMeta.dir, null);
- agent.setSyncCheckpoint(true);
- dag.setAttribute(OperatorContext.STORAGE_AGENT, agent);
+ dag.setAttribute(LogicalPlan.APPLICATION_PATH, new File(testMeta.dir).toURI().toString());
FailingOperator badOperator = dag.addOperator("badOperator", FailingOperator.class);
dag.getContextAttributes(badOperator).put(OperatorContext.RECOVERY_ATTEMPTS, 1);
[03/29] incubator-apex-core git commit: APEX-159 #resolve
StramMiniClusterTest.testOperatorFailureRecovery succeeds with unexpected
error condition
Posted by vr...@apache.org.
APEX-159 #resolve StramMiniClusterTest.testOperatorFailureRecovery succeeds with unexpected error condition
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/0fc22a09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/0fc22a09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/0fc22a09
Branch: refs/heads/feature-module
Commit: 0fc22a094d5ae67e249f8dbc728c5e6a32eecfbc
Parents: 0a85586
Author: Vlad Rozov <v....@datatorrent.com>
Authored: Sat Sep 26 19:59:02 2015 -0700
Committer: Vlad Rozov <v....@datatorrent.com>
Committed: Sat Sep 26 19:59:02 2015 -0700
----------------------------------------------------------------------
.../stram/LaunchContainerRunnable.java | 27 +++++++-------------
.../java/com/datatorrent/stram/StramClient.java | 10 +-------
.../datatorrent/stram/StramMiniClusterTest.java | 4 +--
3 files changed, 12 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/0fc22a09/engine/src/main/java/com/datatorrent/stram/LaunchContainerRunnable.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/LaunchContainerRunnable.java b/engine/src/main/java/com/datatorrent/stram/LaunchContainerRunnable.java
index 0a6c062..863808a 100644
--- a/engine/src/main/java/com/datatorrent/stram/LaunchContainerRunnable.java
+++ b/engine/src/main/java/com/datatorrent/stram/LaunchContainerRunnable.java
@@ -118,28 +118,19 @@ public class LaunchContainerRunnable implements Runnable
LOG.info("CLASSPATH: {}", classPathEnv);
}
+ public static void addFileToLocalResources(final String name, final FileStatus fileStatus, final LocalResourceType type, final Map<String, LocalResource> localResources)
+ {
+ final LocalResource localResource = LocalResource.newInstance(ConverterUtils.getYarnUrlFromPath(fileStatus.getPath()),
+ type, LocalResourceVisibility.APPLICATION, fileStatus.getLen(), fileStatus.getModificationTime());
+ localResources.put(name, localResource);
+ }
+
public static void addFilesToLocalResources(LocalResourceType type, String commaSeparatedFileNames, Map<String, LocalResource> localResources, FileSystem fs) throws IOException
{
String[] files = StringUtils.splitByWholeSeparator(commaSeparatedFileNames, StramClient.LIB_JARS_SEP);
for (String file : files) {
- Path dst = new Path(file);
- // Create a local resource to point to the destination jar path
- FileStatus destStatus = fs.getFileStatus(dst);
- LocalResource amJarRsrc = Records.newRecord(LocalResource.class);
- // Set the type of resource - file or archive
- amJarRsrc.setType(type);
- // Set visibility of the resource
- // Setting to most private option
- amJarRsrc.setVisibility(LocalResourceVisibility.APPLICATION);
- // Set the resource to be copied over
- amJarRsrc.setResource(ConverterUtils.getYarnUrlFromPath(dst));
- // Set timestamp and length of file so that the framework
- // can do basic sanity checks for the local resource
- // after it has been copied over to ensure it is the same
- // resource the client intended to use with the application
- amJarRsrc.setTimestamp(destStatus.getModificationTime());
- amJarRsrc.setSize(destStatus.getLen());
- localResources.put(dst.getName(), amJarRsrc);
+ final Path dst = new Path(file);
+ addFileToLocalResources(dst.getName(), fs.getFileStatus(dst), type, localResources);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/0fc22a09/engine/src/main/java/com/datatorrent/stram/StramClient.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/StramClient.java b/engine/src/main/java/com/datatorrent/stram/StramClient.java
index 7edc628..7abfc82 100644
--- a/engine/src/main/java/com/datatorrent/stram/StramClient.java
+++ b/engine/src/main/java/com/datatorrent/stram/StramClient.java
@@ -497,15 +497,7 @@ public class StramClient
outStream = fs.create(launchConfigDst, true);
conf.writeXml(outStream);
outStream.close();
-
- FileStatus topologyFileStatus = fs.getFileStatus(cfgDst);
- LocalResource topologyRsrc = Records.newRecord(LocalResource.class);
- topologyRsrc.setType(LocalResourceType.FILE);
- topologyRsrc.setVisibility(LocalResourceVisibility.APPLICATION);
- topologyRsrc.setResource(ConverterUtils.getYarnUrlFromURI(cfgDst.toUri()));
- topologyRsrc.setTimestamp(topologyFileStatus.getModificationTime());
- topologyRsrc.setSize(topologyFileStatus.getLen());
- localResources.put(LogicalPlan.SER_FILE_NAME, topologyRsrc);
+ LaunchContainerRunnable.addFileToLocalResources(LogicalPlan.SER_FILE_NAME, fs.getFileStatus(cfgDst), LocalResourceType.FILE, localResources);
// Set local resource info into app master container launch context
amContainer.setLocalResources(localResources);
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/0fc22a09/engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java
----------------------------------------------------------------------
diff --git a/engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java b/engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java
index 493156b..5d37f76 100644
--- a/engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java
+++ b/engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java
@@ -364,8 +364,8 @@ public class StramMiniClusterTest
{
LogicalPlan dag = new LogicalPlan();
- dag.setAttribute(LogicalPlan.APPLICATION_PATH, testMeta.dir);
- AsyncFSStorageAgent agent = new AsyncFSStorageAgent(testMeta.dir, null);
+ dag.setAttribute(LogicalPlan.APPLICATION_PATH, "file:" + System.getProperty("user.dir") + '/' + testMeta.dir);
+ AsyncFSStorageAgent agent = new AsyncFSStorageAgent(dag.getAttributes().get(LogicalPlan.APPLICATION_PATH), null);
agent.setSyncCheckpoint(true);
dag.setAttribute(OperatorContext.STORAGE_AGENT, agent);
FailingOperator badOperator = dag.addOperator("badOperator", FailingOperator.class);
[23/29] incubator-apex-core git commit: Merge branch 'APEX-181' of
github.com:davidyan74/incubator-apex-core into devel-3
Posted by vr...@apache.org.
Merge branch 'APEX-181' of github.com:davidyan74/incubator-apex-core into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/42340242
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/42340242
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/42340242
Branch: refs/heads/feature-module
Commit: 423402420dd616d35ba2e7f445cf98f1995cb6a9
Parents: e5a0184 12af614
Author: Pramod Immaneni <pr...@datatorrent.com>
Authored: Wed Oct 7 17:26:21 2015 -0700
Committer: Pramod Immaneni <pr...@datatorrent.com>
Committed: Wed Oct 7 17:26:21 2015 -0700
----------------------------------------------------------------------
.../stram/client/StramClientUtils.java | 45 +++++++++++
.../security/StramWSFilterInitializer.java | 50 ++----------
.../stram/client/StramClientUtilsTest.java | 81 ++++++++++++++++++++
3 files changed, 134 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
[12/29] incubator-apex-core git commit: Merge branch 'APEX-164' of
github.com:vrozov/incubator-apex-core into vrozov-APEX-164
Posted by vr...@apache.org.
Merge branch 'APEX-164' of github.com:vrozov/incubator-apex-core into vrozov-APEX-164
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/88ee4ad1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/88ee4ad1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/88ee4ad1
Branch: refs/heads/feature-module
Commit: 88ee4ad16a5a3daba98a5e39d3eedda81c97e3ac
Parents: 9193ec8 7957570
Author: Chetan Narsude <ch...@datatorrent.com>
Authored: Fri Oct 2 14:12:30 2015 -0700
Committer: Chetan Narsude <ch...@datatorrent.com>
Committed: Fri Oct 2 14:12:30 2015 -0700
----------------------------------------------------------------------
api/src/test/resources/log4j.properties | 2 +-
bufferserver/src/test/resources/log4j.properties | 2 +-
engine/src/test/resources/log4j.properties | 6 +++---
.../testAppPackage/mydtapp/src/test/resources/log4j.properties | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[09/29] incubator-apex-core git commit: Merge branch 'APEX-157' into
devel-3
Posted by vr...@apache.org.
Merge branch 'APEX-157' into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/cf97d0b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/cf97d0b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/cf97d0b7
Branch: refs/heads/feature-module
Commit: cf97d0b7119edd1feea9ad5c9aac23aa9bf6732b
Parents: 4adac06 b799bd2
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Tue Sep 29 13:01:35 2015 -0700
Committer: Timothy Farkas <ti...@datatorrent.com>
Committed: Tue Sep 29 13:01:35 2015 -0700
----------------------------------------------------------------------
.../stram/plan/logical/LogicalPlan.java | 23 ++++++
.../logical/LogicalPlanConfigurationTest.java | 6 ++
.../stram/plan/logical/LogicalPlanTest.java | 83 +++++++++++++++++++-
engine/src/test/resources/testTopology.json | 2 +-
4 files changed, 112 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[08/29] incubator-apex-core git commit: APEX-157 #comment #resolve
Added changes for attribute serializable check in dag.validate
Posted by vr...@apache.org.
APEX-157 #comment #resolve Added changes for attribute serializable check in dag.validate
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/b799bd2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/b799bd2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/b799bd2d
Branch: refs/heads/feature-module
Commit: b799bd2d3edd7af3bdf4631129601e68ce349bf4
Parents: 4adac06
Author: ishark <is...@datatorrent.com>
Authored: Thu Sep 24 17:05:13 2015 -0700
Committer: ishark <is...@datatorrent.com>
Committed: Mon Sep 28 16:43:08 2015 -0700
----------------------------------------------------------------------
.../stram/plan/logical/LogicalPlan.java | 23 ++++++
.../logical/LogicalPlanConfigurationTest.java | 6 ++
.../stram/plan/logical/LogicalPlanTest.java | 83 +++++++++++++++++++-
engine/src/test/resources/testTopology.json | 2 +-
4 files changed, 112 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/b799bd2d/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java b/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java
index f068884..6405644 100644
--- a/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java
+++ b/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java
@@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.Sets;
import com.datatorrent.api.*;
+import com.datatorrent.api.Attribute.AttributeMap;
import com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap;
import com.datatorrent.api.Operator.InputPort;
import com.datatorrent.api.Operator.OutputPort;
@@ -1312,6 +1313,8 @@ public class LogicalPlan implements Serializable, DAG
Validation.buildDefaultValidatorFactory();
Validator validator = factory.getValidator();
+ checkAttributeValueSerializable(this.getAttributes(), DAG.class.getName());
+
// clear oioRoot values in all operators
for (OperatorMeta n: operators.values()) {
n.oioRoot = null;
@@ -1336,6 +1339,8 @@ public class LogicalPlan implements Serializable, DAG
OperatorMeta.PortMapping portMapping = n.getPortMapping();
+ checkAttributeValueSerializable(n.getAttributes(), n.getName());
+
// Check operator annotation
if (n.operatorAnnotation != null) {
// Check if partition property of the operator is being honored
@@ -1368,6 +1373,7 @@ public class LogicalPlan implements Serializable, DAG
// check that non-optional ports are connected
for (InputPortMeta pm: portMapping.inPortMap.values()) {
+ checkAttributeValueSerializable(pm.getAttributes(), n.getName() + "." + pm.getPortName());
StreamMeta sm = n.inputStreams.get(pm);
if (sm == null) {
if ((pm.portAnnotation == null || !pm.portAnnotation.optional()) && pm.classDeclaringHiddenPort == null) {
@@ -1397,6 +1403,7 @@ public class LogicalPlan implements Serializable, DAG
boolean allPortsOptional = true;
for (OutputPortMeta pm: portMapping.outPortMap.values()) {
+ checkAttributeValueSerializable(pm.getAttributes(), n.getName() + "." + pm.getPortName());
if (!n.outputStreams.containsKey(pm)) {
if ((pm.portAnnotation != null && !pm.portAnnotation.optional()) && pm.classDeclaringHiddenPort == null) {
throw new ValidationException("Output port connection required: " + n.name + "." + pm.getPortName());
@@ -1458,6 +1465,22 @@ public class LogicalPlan implements Serializable, DAG
}
+ private void checkAttributeValueSerializable(AttributeMap attributes, String context)
+ {
+ StringBuilder sb = new StringBuilder();
+ String delim = "";
+ // Check all attributes got operator are serializable
+ for (Entry<Attribute<?>, Object> entry : attributes.entrySet()) {
+ if (entry.getValue() != null && !(entry.getValue() instanceof Serializable)) {
+ sb.append(delim).append(entry.getKey().getSimpleName());
+ delim = ", ";
+ }
+ }
+ if (sb.length() > 0) {
+ throw new ValidationException("Attribute value(s) for " + sb.toString() + " in " + context + " are not serializable");
+ }
+ }
+
/*
* Validates OIO constraints for operators with more than one input streams
* For a node to be OIO,
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/b799bd2d/engine/src/test/java/com/datatorrent/stram/plan/logical/LogicalPlanConfigurationTest.java
----------------------------------------------------------------------
diff --git a/engine/src/test/java/com/datatorrent/stram/plan/logical/LogicalPlanConfigurationTest.java b/engine/src/test/java/com/datatorrent/stram/plan/logical/LogicalPlanConfigurationTest.java
index c4ad724..1d95afe 100644
--- a/engine/src/test/java/com/datatorrent/stram/plan/logical/LogicalPlanConfigurationTest.java
+++ b/engine/src/test/java/com/datatorrent/stram/plan/logical/LogicalPlanConfigurationTest.java
@@ -20,6 +20,7 @@ package com.datatorrent.stram.plan.logical;
import java.io.IOException;
import java.io.InputStream;
+import java.io.Serializable;
import java.io.StringWriter;
import java.lang.reflect.Field;
@@ -84,6 +85,11 @@ public class LogicalPlanConfigurationTest {
return n;
}
+ public static class TestStreamCodec<T> extends JsonStreamCodec<T> implements Serializable
+ {
+ private static final long serialVersionUID = 1L;
+ }
+
/**
* Test read from dt-site.xml in Hadoop configuration format.
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/b799bd2d/engine/src/test/java/com/datatorrent/stram/plan/logical/LogicalPlanTest.java
----------------------------------------------------------------------
diff --git a/engine/src/test/java/com/datatorrent/stram/plan/logical/LogicalPlanTest.java b/engine/src/test/java/com/datatorrent/stram/plan/logical/LogicalPlanTest.java
index 52c5f7d..a4ac488 100644
--- a/engine/src/test/java/com/datatorrent/stram/plan/logical/LogicalPlanTest.java
+++ b/engine/src/test/java/com/datatorrent/stram/plan/logical/LogicalPlanTest.java
@@ -19,9 +19,11 @@
package com.datatorrent.stram.plan.logical;
import com.datatorrent.common.util.BaseOperator;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.Serializable;
+import java.lang.reflect.Field;
import java.util.*;
import javax.validation.*;
@@ -41,6 +43,7 @@ import static org.junit.Assert.*;
import com.datatorrent.common.partitioner.StatelessPartitioner;
import com.datatorrent.api.*;
+import com.datatorrent.api.Context.DAGContext;
import com.datatorrent.api.Context.OperatorContext;
import com.datatorrent.api.Context.PortContext;
import com.datatorrent.api.DAG.Locality;
@@ -683,7 +686,85 @@ public class LogicalPlanTest {
Assert.assertNotNull("port object null", o1Clone.inport1);
}
- private static class TestStreamCodec implements StreamCodec<Object> {
+ @Test
+ public void testAttributeValuesSerializableCheck() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException
+ {
+ LogicalPlan dag = new LogicalPlan();
+ Attribute<Object> attr = new Attribute<Object>(new TestAttributeValue(), new Object2String());
+ Field nameField = Attribute.class.getDeclaredField("name");
+ nameField.setAccessible(true);
+ nameField.set(attr, "Test_Attribute");
+ nameField.setAccessible(false);
+
+ assertNotNull(attr);
+ // Dag attribute not serializable test
+ dag.setAttribute(attr, new TestAttributeValue());
+ try {
+ dag.validate();
+ Assert.fail("Setting not serializable attribute should throw exception");
+ } catch (ValidationException e) {
+ assertEquals("Validation Exception should match ", "Attribute value(s) for Test_Attribute in com.datatorrent.api.DAG are not serializable", e.getMessage());
+ }
+
+ // Operator attribute not serializable test
+ dag = new LogicalPlan();
+ TestGeneratorInputOperator operator = dag.addOperator("TestOperator", TestGeneratorInputOperator.class);
+ dag.setAttribute(operator, attr, new TestAttributeValue());
+ try {
+ dag.validate();
+ Assert.fail("Setting not serializable attribute should throw exception");
+ } catch (ValidationException e) {
+ assertEquals("Validation Exception should match ", "Attribute value(s) for Test_Attribute in TestOperator are not serializable", e.getMessage());
+ }
+
+ // Output Port attribute not serializable test
+ dag = new LogicalPlan();
+ operator = dag.addOperator("TestOperator", TestGeneratorInputOperator.class);
+ dag.setOutputPortAttribute(operator.outport, attr, new TestAttributeValue());
+ try {
+ dag.validate();
+ Assert.fail("Setting not serializable attribute should throw exception");
+ } catch (ValidationException e) {
+ assertEquals("Validation Exception should match ", "Attribute value(s) for Test_Attribute in TestOperator.outport are not serializable", e.getMessage());
+ }
+
+ // Input Port attribute not serializable test
+ dag = new LogicalPlan();
+ GenericTestOperator operator1 = dag.addOperator("TestOperator", GenericTestOperator.class);
+ dag.setInputPortAttribute(operator1.inport1, attr, new TestAttributeValue());
+ try {
+ dag.validate();
+ Assert.fail("Setting non serializable attribute should throw exception");
+ } catch (ValidationException e) {
+ assertEquals("Validation Exception should match ", "Attribute value(s) for Test_Attribute in TestOperator.inport1 are not serializable", e.getMessage());
+ }
+ }
+
+ private static class Object2String implements StringCodec<Object>
+ {
+
+ @Override
+ public Object fromString(String string)
+ {
+ // Stub method for testing - do nothing
+ return null;
+ }
+
+ @Override
+ public String toString(Object pojo)
+ {
+ // Stub method for testing - do nothing
+ return null;
+ }
+
+ }
+
+ private static class TestAttributeValue
+ {
+ }
+
+ private static class TestStreamCodec implements StreamCodec<Object>
+ {
@Override
public Object fromByteArray(Slice fragment)
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/b799bd2d/engine/src/test/resources/testTopology.json
----------------------------------------------------------------------
diff --git a/engine/src/test/resources/testTopology.json b/engine/src/test/resources/testTopology.json
index 62c5262..45e1f0e 100644
--- a/engine/src/test/resources/testTopology.json
+++ b/engine/src/test/resources/testTopology.json
@@ -25,7 +25,7 @@
"attributes": {
"UNIFIER_LIMIT": 8,
"STREAM_CODEC" : {
- "com.datatorrent.common.codec.JsonStreamCodec" : {}
+ "com.datatorrent.stram.plan.logical.LogicalPlanConfigurationTest$TestStreamCodec" : {}
}
}
}
[22/29] incubator-apex-core git commit: APEX-181 expose getting of rm
web app address
Posted by vr...@apache.org.
APEX-181 expose getting of rm web app address
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/12af6140
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/12af6140
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/12af6140
Branch: refs/heads/feature-module
Commit: 12af6140fe89c688b9add8dfe07f27fcd4c8ffa3
Parents: b986f70
Author: David Yan <da...@datatorrent.com>
Authored: Mon Oct 5 13:08:03 2015 -0700
Committer: David Yan <da...@datatorrent.com>
Committed: Wed Oct 7 16:48:28 2015 -0700
----------------------------------------------------------------------
.../stram/client/StramClientUtils.java | 45 +++++++++++
.../security/StramWSFilterInitializer.java | 50 ++----------
.../stram/client/StramClientUtilsTest.java | 81 ++++++++++++++++++++
3 files changed, 134 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/12af6140/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java b/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
index d679da4..04a3484 100644
--- a/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
+++ b/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
@@ -34,9 +34,11 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
+import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.security.Credentials;
import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.security.UserGroupInformation;
@@ -732,4 +734,47 @@ public class StramClientUtils
return null;
}
+ public static InetSocketAddress getRMWebAddress(Configuration conf, String rmId)
+ {
+ boolean sslEnabled = conf.getBoolean(CommonConfigurationKeysPublic.HADOOP_SSL_ENABLED_KEY, CommonConfigurationKeysPublic.HADOOP_SSL_ENABLED_DEFAULT);
+ return getRMWebAddress(conf, sslEnabled, rmId);
+ }
+
+ public static InetSocketAddress getRMWebAddress(Configuration conf, boolean sslEnabled, String rmId)
+ {
+ rmId = (rmId == null) ? "" : ("." + rmId);
+ InetSocketAddress address;
+ if (sslEnabled) {
+ address = conf.getSocketAddr(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS + rmId, YarnConfiguration.DEFAULT_RM_WEBAPP_HTTPS_ADDRESS, YarnConfiguration.DEFAULT_RM_WEBAPP_HTTPS_PORT);
+ } else {
+ address = conf.getSocketAddr(YarnConfiguration.RM_WEBAPP_ADDRESS + rmId, YarnConfiguration.DEFAULT_RM_WEBAPP_ADDRESS, YarnConfiguration.DEFAULT_RM_WEBAPP_PORT);
+ }
+ LOG.info("rm webapp address setting {}", address);
+ LOG.debug("rm setting sources {}", conf.getPropertySources(YarnConfiguration.RM_WEBAPP_ADDRESS));
+ InetSocketAddress resolvedSocketAddress = NetUtils.getConnectAddress(address);
+ InetAddress resolved = resolvedSocketAddress.getAddress();
+ if (resolved == null || resolved.isAnyLocalAddress() || resolved.isLoopbackAddress()) {
+ try {
+ resolvedSocketAddress = InetSocketAddress.createUnresolved(InetAddress.getLocalHost().getCanonicalHostName(), address.getPort());
+ } catch (UnknownHostException e) {
+ //Ignore and fallback.
+ }
+ }
+ return resolvedSocketAddress;
+ }
+
+ public static String getSocketConnectString(InetSocketAddress socketAddress)
+ {
+ String host;
+ InetAddress address = socketAddress.getAddress();
+ if (address == null) {
+ host = socketAddress.getHostString();
+ } else if (address.isAnyLocalAddress() || address.isLoopbackAddress()) {
+ host = address.getCanonicalHostName();
+ } else {
+ host = address.getHostName();
+ }
+ return host + ":" + socketAddress.getPort();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/12af6140/engine/src/main/java/com/datatorrent/stram/security/StramWSFilterInitializer.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/security/StramWSFilterInitializer.java b/engine/src/main/java/com/datatorrent/stram/security/StramWSFilterInitializer.java
index a2b2821..e9870c6 100644
--- a/engine/src/main/java/com/datatorrent/stram/security/StramWSFilterInitializer.java
+++ b/engine/src/main/java/com/datatorrent/stram/security/StramWSFilterInitializer.java
@@ -18,24 +18,21 @@
*/
package com.datatorrent.stram.security;
-import java.net.InetAddress;
import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.http.FilterContainer;
import org.apache.hadoop.http.FilterInitializer;
-import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.datatorrent.stram.client.StramClientUtils;
import com.datatorrent.stram.util.ConfigUtils;
/**
@@ -100,51 +97,20 @@ public class StramWSFilterInitializer extends FilterInitializer
Replace with methods from Hadoop when HA support is available
HttpConfig is not used as it's audience is private as well and it's interface has changed from Hadoop 2.2 to 2.6
*/
- public String getResolvedRMWebAppURLWithoutScheme(Configuration conf, String rmId) {
- boolean sslEnabled = conf.getBoolean(
- CommonConfigurationKeysPublic.HADOOP_SSL_ENABLED_KEY,
- CommonConfigurationKeysPublic.HADOOP_SSL_ENABLED_DEFAULT);
- return getResolvedRMWebAppURLWithoutScheme(conf, sslEnabled, (rmId != null) ? "." + rmId : "");
+ public String getResolvedRMWebAppURLWithoutScheme(Configuration conf, String rmId)
+ {
+ InetSocketAddress socketAddress = StramClientUtils.getRMWebAddress(conf, rmId);
+ return StramClientUtils.getSocketConnectString(socketAddress);
}
/*
From org.apache.hadoop.yarn.webapp.util.WebAppUtils
Modified for HA support
*/
- public String getResolvedRMWebAppURLWithoutScheme(Configuration conf, boolean sslEnabled, String rmPrpKey)
+ public String getResolvedRMWebAppURLWithoutScheme(Configuration conf, boolean sslEnabled, String rmId)
{
- InetSocketAddress address = null;
- if (sslEnabled) {
- address =
- conf.getSocketAddr(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS + rmPrpKey,
- YarnConfiguration.DEFAULT_RM_WEBAPP_HTTPS_ADDRESS,
- YarnConfiguration.DEFAULT_RM_WEBAPP_HTTPS_PORT);
- } else {
- address =
- conf.getSocketAddr(YarnConfiguration.RM_WEBAPP_ADDRESS + rmPrpKey,
- YarnConfiguration.DEFAULT_RM_WEBAPP_ADDRESS,
- YarnConfiguration.DEFAULT_RM_WEBAPP_PORT);
- }
- logger.info("rm webapp address setting {}", address);
- logger.debug("rm setting sources {}", conf.getPropertySources(YarnConfiguration.RM_WEBAPP_ADDRESS));
- address = NetUtils.getConnectAddress(address);
- StringBuffer sb = new StringBuffer();
- InetAddress resolved = address.getAddress();
- if (resolved == null || resolved.isAnyLocalAddress() ||
- resolved.isLoopbackAddress()) {
- String lh = address.getHostName();
- try {
- lh = InetAddress.getLocalHost().getCanonicalHostName();
- } catch (UnknownHostException e) {
- //Ignore and fallback.
- }
- sb.append(lh);
- } else {
- sb.append(address.getHostName());
- }
- sb.append(":").append(address.getPort());
- logger.info("rm webapp resolved hostname {}", sb.toString());
- return sb.toString();
+ InetSocketAddress socketAddress = StramClientUtils.getRMWebAddress(conf, sslEnabled, rmId);
+ return StramClientUtils.getSocketConnectString(socketAddress);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/12af6140/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java
----------------------------------------------------------------------
diff --git a/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java b/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java
new file mode 100644
index 0000000..2392b47
--- /dev/null
+++ b/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java
@@ -0,0 +1,81 @@
+/**
+ * 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.
+ */
+package com.datatorrent.stram.client;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
+import org.apache.hadoop.yarn.conf.YarnConfiguration;
+
+import com.datatorrent.stram.util.ConfigUtils;
+
+
+/**
+ * Unit tests for StramClientUtils
+ */
+public class StramClientUtilsTest
+{
+
+ private String getHostString(String host) throws UnknownHostException
+ {
+ InetAddress address = InetAddress.getByName(host);
+ if (address.isAnyLocalAddress() || address.isLoopbackAddress()) {
+ return address.getCanonicalHostName();
+ } else {
+ return address.getHostName();
+ }
+ }
+
+ @Test
+ public void testRMWebAddress() throws UnknownHostException
+ {
+ Configuration conf = new Configuration(false);
+
+ // basic test
+ conf.setBoolean(CommonConfigurationKeysPublic.HADOOP_SSL_ENABLED_KEY, false);
+ conf.set(YarnConfiguration.RM_WEBAPP_ADDRESS, "192.168.1.1:8032");
+ conf.set(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS, "192.168.1.2:8032");
+ Assert.assertEquals(getHostString("192.168.1.1") + ":8032", StramClientUtils.getSocketConnectString(StramClientUtils.getRMWebAddress(conf, null)));
+ conf.setBoolean(CommonConfigurationKeysPublic.HADOOP_SSL_ENABLED_KEY, true);
+ Assert.assertEquals(getHostString("192.168.1.2") + ":8032", StramClientUtils.getSocketConnectString(StramClientUtils.getRMWebAddress(conf, null)));
+
+ // set localhost if host is unknown
+ conf.set(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS, "someunknownhost:8032");
+
+ Assert.assertEquals(InetAddress.getLocalHost().getCanonicalHostName() + ":8032", StramClientUtils.getSocketConnectString(StramClientUtils.getRMWebAddress(conf, null)));
+
+ // set localhost
+ conf.set(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS, "127.0.0.1:8032");
+ Assert.assertEquals(InetAddress.getLocalHost().getCanonicalHostName() + ":8032", StramClientUtils.getSocketConnectString(StramClientUtils.getRMWebAddress(conf, null)));
+
+ // test when HA is enabled
+ conf.getBoolean(ConfigUtils.RM_HA_ENABLED, true);
+ conf.set(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS + ".rm1", "192.168.1.1:8032");
+ conf.set(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS + ".rm2", "192.168.1.2:8032");
+ Assert.assertEquals(getHostString("192.168.1.1") + ":8032", StramClientUtils.getSocketConnectString(StramClientUtils.getRMWebAddress(conf, "rm1")));
+ Assert.assertEquals(getHostString("192.168.1.2") + ":8032", StramClientUtils.getSocketConnectString(StramClientUtils.getRMWebAddress(conf, "rm2")));
+
+ }
+
+}
[24/29] incubator-apex-core git commit: APEX-181 Make sure unknown
host
Posted by vr...@apache.org.
APEX-181 Make sure unknown host
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/c442568a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/c442568a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/c442568a
Branch: refs/heads/feature-module
Commit: c442568a9f2ec995434d27ef263838c2822cbb41
Parents: 4234024
Author: David Yan <da...@datatorrent.com>
Authored: Wed Oct 7 18:02:09 2015 -0700
Committer: David Yan <da...@datatorrent.com>
Committed: Wed Oct 7 18:02:09 2015 -0700
----------------------------------------------------------------------
.../java/com/datatorrent/stram/client/StramClientUtilsTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/c442568a/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java
----------------------------------------------------------------------
diff --git a/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java b/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java
index 2392b47..e97b49f 100644
--- a/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java
+++ b/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java
@@ -61,7 +61,7 @@ public class StramClientUtilsTest
Assert.assertEquals(getHostString("192.168.1.2") + ":8032", StramClientUtils.getSocketConnectString(StramClientUtils.getRMWebAddress(conf, null)));
// set localhost if host is unknown
- conf.set(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS, "someunknownhost:8032");
+ conf.set(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS, "someunknownhost.:8032");
Assert.assertEquals(InetAddress.getLocalHost().getCanonicalHostName() + ":8032", StramClientUtils.getSocketConnectString(StramClientUtils.getRMWebAddress(conf, null)));
[29/29] incubator-apex-core git commit: Merge branch 'devel-3' of
https://github.com/apache/incubator-apex-core into feature-module
Posted by vr...@apache.org.
Merge branch 'devel-3' of https://github.com/apache/incubator-apex-core into feature-module
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/b17365f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/b17365f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/b17365f9
Branch: refs/heads/feature-module
Commit: b17365f94b7bc8c0edc014f2dd95c52f31798a15
Parents: 4f507ea 809e6f6
Author: Vlad Rozov <v....@datatorrent.com>
Authored: Sun Oct 11 08:59:54 2015 -0700
Committer: Vlad Rozov <v....@datatorrent.com>
Committed: Sun Oct 11 08:59:54 2015 -0700
----------------------------------------------------------------------
.travis.yml | 2 +
README.md | 23 +-
apex-app-archetype/pom.xml | 2 +-
apex-conf-archetype/pom.xml | 2 +-
apex_checks.xml | 7 +-
api/pom.xml | 4 +-
api/src/test/resources/log4j.properties | 2 +-
bufferserver/pom.xml | 6 +-
.../src/test/resources/log4j.properties | 2 +-
common/pom.xml | 4 +-
engine/pom.xml | 9 +-
.../stram/LaunchContainerRunnable.java | 27 +-
.../java/com/datatorrent/stram/StramClient.java | 11 +-
.../stram/client/StramClientUtils.java | 178 +-
.../stram/plan/logical/LogicalPlan.java | 23 +
.../stram/security/StramWSFilter.java | 47 +-
.../security/StramWSFilterInitializer.java | 53 +-
.../com/datatorrent/stram/util/ConfigUtils.java | 1 +
.../java/org/apache/log4j/DTLoggerFactory.java | 4 +-
.../datatorrent/stram/StramMiniClusterTest.java | 11 +-
.../stram/client/EvalPropertiesTest.java | 68 -
.../stram/client/StramClientUtilsTest.java | 131 ++
.../logical/LogicalPlanConfigurationTest.java | 6 +
.../stram/plan/logical/LogicalPlanTest.java | 83 +-
engine/src/test/resources/README | 9 -
...san_ RSA Public Key Cryptography in Java.pdf | 1932 ------------------
engine/src/test/resources/log4j.properties | 6 +-
.../mydtapp/src/test/resources/log4j.properties | 6 +-
engine/src/test/resources/testTopology.json | 2 +-
pom.xml | 20 +-
30 files changed, 478 insertions(+), 2203 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/b17365f9/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java
----------------------------------------------------------------------
[27/29] incubator-apex-core git commit: APEX-186 Enable license
header check in Travis CI.
Posted by vr...@apache.org.
APEX-186 Enable license header check in Travis CI.
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/14df1c6d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/14df1c6d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/14df1c6d
Branch: refs/heads/feature-module
Commit: 14df1c6d6bc222759655fde4a125e181cdc43630
Parents: e5a0184
Author: Thomas Weise <th...@datatorrent.com>
Authored: Fri Oct 9 11:29:21 2015 -0700
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Fri Oct 9 11:29:21 2015 -0700
----------------------------------------------------------------------
.travis.yml | 2 ++
pom.xml | 3 +++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/14df1c6d/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 9b18190..5540704 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,8 @@
language: java
+script: mvn apache-rat:check verify -Dlicense.skip=false
+
notifications:
slack:
secure: GlWD2EjgNC6Lg2DtAfZuKhg2RTHE0FMeyfHH24D7TKmV49gRVTzTTqvExwOdLLYDDIu966eOF5w90/PfiD11A4rpm6+WyjRHDkpOhTyjBKWc2btMqNwiP1hRf2uKEG6A+RgszaQJ4HkGiMxIpDJ3o/jaTpBseOeA399t8Z7Pkd6obXVAEMcnm2XtfUPzIBqGblVkiecS3OzbkzjKWaOG6+nlp+ajVO7MazsOR05JNZ1MXnDOK/Qq/7xLBtweF4r/O8okyg52fST4pGqk4JTTI++bVFoRySpjNWSSJbdrfkWG/7h0sfqMcwMj8TpZqojcCuTvZih+IyPZwX3MP6Ls4bF6OFcD3BvWg049WbstA6ZdKnVW9fOiJoJ+Bx9gNI0tKtYeDt/8nMBfSRVMmzRVEGdTOEEpFs7n79OVVytwbp8qYFU+waqlG1/tMQvCclSaxuY8d236Ybg410KLiMQ0YhQ8ZaTVagHu2l0KrfV16Xq3/CRsolHa8k7PxDzmCxdi07Ao/mrorQLmJWoc7FkxEw6ZrEGHP17HTn5uidoTkANgGak4AVgrJm6zLKdAERxvr1KMnfyuJLT1ZK1x73SV+3EpdzcMLxvq2dMaBpZcfARiYB04EwSHVBdm/D0AIZtRL2s1rG85y1OtCkDMd04ZEvbwdKYZ+fD+HjTn7Zo7AKM=
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/14df1c6d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e738908..e75d3c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,9 @@
<email>dev@apex.incubator.apache.org</email>
</properties>
<excludes>
+ <exclude>DISCLAIMER</exclude>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
<exclude>license.txt</exclude>
<exclude>**/*.md</exclude>
<exclude>**/*.txt</exclude>
[07/29] incubator-apex-core git commit: APEX-164 #resolve changed
log4j level to INFO from DEBUG
Posted by vr...@apache.org.
APEX-164 #resolve changed log4j level to INFO from DEBUG
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/7957570e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/7957570e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/7957570e
Branch: refs/heads/feature-module
Commit: 7957570e02edfd4221bfcc015922b5c660518158
Parents: 4adac06
Author: Vlad Rozov <v....@datatorrent.com>
Authored: Mon Sep 28 15:19:50 2015 -0700
Committer: Vlad Rozov <v....@datatorrent.com>
Committed: Mon Sep 28 15:19:50 2015 -0700
----------------------------------------------------------------------
api/src/test/resources/log4j.properties | 2 +-
bufferserver/src/test/resources/log4j.properties | 2 +-
engine/src/test/resources/log4j.properties | 6 +++---
.../testAppPackage/mydtapp/src/test/resources/log4j.properties | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/7957570e/api/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/api/src/test/resources/log4j.properties b/api/src/test/resources/log4j.properties
index b7516d4..26857d2 100644
--- a/api/src/test/resources/log4j.properties
+++ b/api/src/test/resources/log4j.properties
@@ -37,4 +37,4 @@ log4j.appender.SYSLOG.Facility=LOCAL1
#log4j.logger.org=info
#log4j.logger.org.apache.commons.beanutils=warn
-log4j.logger.com.datatorrent=debug
+log4j.logger.com.datatorrent=info
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/7957570e/bufferserver/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/bufferserver/src/test/resources/log4j.properties b/bufferserver/src/test/resources/log4j.properties
index b7516d4..26857d2 100644
--- a/bufferserver/src/test/resources/log4j.properties
+++ b/bufferserver/src/test/resources/log4j.properties
@@ -37,4 +37,4 @@ log4j.appender.SYSLOG.Facility=LOCAL1
#log4j.logger.org=info
#log4j.logger.org.apache.commons.beanutils=warn
-log4j.logger.com.datatorrent=debug
+log4j.logger.com.datatorrent=info
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/7957570e/engine/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/engine/src/test/resources/log4j.properties b/engine/src/test/resources/log4j.properties
index f944776..26857d2 100644
--- a/engine/src/test/resources/log4j.properties
+++ b/engine/src/test/resources/log4j.properties
@@ -17,7 +17,7 @@
# under the License.
#
-log4j.rootLogger=DEBUG,CONSOLE
+log4j.rootLogger=INFO,CONSOLE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
@@ -35,6 +35,6 @@ log4j.appender.SYSLOG.layout=org.apache.log4j.PatternLayout
log4j.appender.SYSLOG.layout.conversionPattern=${dt.cid} %-5p [%t] %c{2} %x - %m%n
log4j.appender.SYSLOG.Facility=LOCAL1
-log4j.logger.org=info
+#log4j.logger.org=info
#log4j.logger.org.apache.commons.beanutils=warn
-log4j.logger.com.datatorrent=debug
+log4j.logger.com.datatorrent=info
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/7957570e/engine/src/test/resources/testAppPackage/mydtapp/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/engine/src/test/resources/testAppPackage/mydtapp/src/test/resources/log4j.properties b/engine/src/test/resources/testAppPackage/mydtapp/src/test/resources/log4j.properties
index 451cff3..169b57e 100644
--- a/engine/src/test/resources/testAppPackage/mydtapp/src/test/resources/log4j.properties
+++ b/engine/src/test/resources/testAppPackage/mydtapp/src/test/resources/log4j.properties
@@ -17,7 +17,7 @@
# under the License.
#
-log4j.rootLogger=DEBUG,CONSOLE
+log4j.rootLogger=INFO,CONSOLE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
@@ -35,6 +35,6 @@ log4j.appender.SYSLOG.layout=org.apache.log4j.PatternLayout
log4j.appender.SYSLOG.layout.conversionPattern=${dt.cid} %-5p [%t] %c{2} %x - %m%n
log4j.appender.SYSLOG.Facility=LOCAL1
-log4j.logger.org=info
+#log4j.logger.org=info
#log4j.logger.org.apache.commons.beanutils=warn
-log4j.logger.com.datatorrent=debug
+log4j.logger.com.datatorrent=info
[15/29] incubator-apex-core git commit: Correct ownership related
info in pom.xml
Posted by vr...@apache.org.
Correct ownership related info in pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/0aa70063
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/0aa70063
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/0aa70063
Branch: refs/heads/feature-module
Commit: 0aa700634e0a1d487ee90f7545d4195d934ba841
Parents: 88ee4ad
Author: Thomas Weise <th...@datatorrent.com>
Authored: Sat Oct 3 17:52:48 2015 -0700
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Sat Oct 3 17:52:48 2015 -0700
----------------------------------------------------------------------
pom.xml | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/0aa70063/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0086730..8f68dcb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,12 +27,12 @@
<version>3.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Realtime Stream Processing Framework</name>
- <url>http://www.datatorrent.com</url>
+ <name>Apache Apex Core</name>
+ <url>http://apex.apache.org</url>
<organization>
- <name>DataTorrent, Inc.</name>
- <url>http://www.datatorrent.com/</url>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
</organization>
<licenses>
@@ -47,7 +47,7 @@
<snapshots>
<enabled>false</enabled>
</snapshots>
- <id>Datatorrent-Releases</id>
+ <id>datatorrent</id>
<name>DataTorrent Release Repository</name>
<url>https://www.datatorrent.com/maven/content/repositories/releases/</url>
</repository>
@@ -55,7 +55,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <netbeans.hint.license>datatorrent-inc</netbeans.hint.license>
<maven.compiler.optimize>false</maven.compiler.optimize>
<maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
<hadoop.version>2.2.0</hadoop.version>
@@ -96,8 +95,8 @@
<configuration>
<header>license.txt</header>
<properties>
- <owner>DataTorrent, Inc.</owner>
- <email>apex-dev@googlegroups.com</email>
+ <owner>Apache Software Foundation</owner>
+ <email>dev@apex.incubator.apache.org</email>
</properties>
<excludes>
<exclude>license.txt</exclude>
[13/29] incubator-apex-core git commit: Fix license header related
info in README.md, remove obsolete files.
Posted by vr...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/ec03f12c/engine/src/test/resources/codeartisan_ RSA Public Key Cryptography in Java.pdf
----------------------------------------------------------------------
diff --git a/engine/src/test/resources/codeartisan_ RSA Public Key Cryptography in Java.pdf b/engine/src/test/resources/codeartisan_ RSA Public Key Cryptography in Java.pdf
deleted file mode 100755
index c054f0b..0000000
--- a/engine/src/test/resources/codeartisan_ RSA Public Key Cryptography in Java.pdf
+++ /dev/null
@@ -1,1932 +0,0 @@
-%PDF-1.4
-%����
-15 0 obj
-<</Type /Catalog
-/Pages 1 0 R
-/Dests 16 0 R
->>
-endobj
-17 0 obj
-<</Type /Page
-/Parent 1 0 R
-/Resources <</ExtGState <</G0 18 0 R
->>
-/XObject <</X0 19 0 R
-/X1 20 0 R
-/X2 21 0 R
->>
-/Font <</F0 22 0 R
-/F1 23 0 R
-/F2 24 0 R
-/F3 25 0 R
-/F4 26 0 R
->>
-/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
->>
-/MediaBox [0 0 612 792]
-/Annots [<</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [45.8182 582.8052 173.1559 595.619]
-/A <</Type /Action
-/S /URI
-/URI (http://en.wikipedia.org/wiki/Public-key_cryptography)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [106.684 569.9913 298.0909 582.8052]
-/A <</Type /Action
-/S /URI
-/URI (http://java.sun.com/javase/technologies/security/)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [302.0952 569.9913 380.5801 582.8052]
-/A <</Type /Action
-/S /URI
-/URI (http://java.sun.com/j2se/1.4.2/docs/guide/security/jce/JCERefGuide.html)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [294.8875 544.3636 334.1299 557.1775]
-/A <</Type /Action
-/S /URI
-/URI (http://www.openssl.org/)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [301.2944 530.7489 322.1169 543.5627]
-/A <</Type /Action
-/S /URI
-/URI (http://en.wikipedia.org/wiki/RSA)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [267.658 443.4545 334.9308 456.2684]
-/A <</Type /Action
-/S /URI
-/URI (http://java.sun.com/j2se/1.5.0/docs/api/javax/crypto/package-frame.html)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [153.9351 280.8788 248.4372 293.6926]
-/A <</Type /Action
-/S /URI
-/URI (http://en.wikipedia.org/wiki/X.509)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [67.4416 216.0086 159.5411 228.8225]
-/A <</Type /Action
-/S /URI
-/URI (http://java.sun.com/j2se/1.3/docs/tooldocs/win32/keytool.html)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [416.619 627.6537 470.2771 640.4675]
-/A <</Type /Action
-/S /URI
-/URI (http://www.blogger.com/profile/00968563763838190660)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [416.619 606.8312 470.2771 619.645]
-/A <</Type /Action
-/S /URI
-/URI (http://www.blogger.com/profile/16766484929210129406)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [416.619 548.368 429.4329 562.7836]
-/A <</Type /Action
-/S /URI
-/URI (http://codeartisan.blogspot.com/feeds/posts/default)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [433.4373 549.9697 507.1169 562.7836]
-/A <</Type /Action
-/S /URI
-/URI (http://codeartisan.blogspot.com/feeds/posts/default)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [416.619 449.8615 433.4373 462.6753]
-/A <</Type /Action
-/S /URI
-/URI (javascript:void\(0\))
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [433.4373 449.8615 459.0649 462.6753]
-/A <</Type /Action
-/S /URI
-/URI (http://codeartisan.blogspot.com/search?updated-min=2012-01-01T00:00:00-05:00&updated-max=2013-01-01T00:00:00-05:00&max-results=4)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [416.619 426.6364 433.4373 439.4502]
-/A <</Type /Action
-/S /URI
-/URI (javascript:void\(0\))
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [433.4373 426.6364 459.0649 439.4502]
-/A <</Type /Action
-/S /URI
-/URI (http://codeartisan.blogspot.com/search?updated-min=2010-01-01T00:00:00-05:00&updated-max=2011-01-01T00:00:00-05:00&max-results=10)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [416.619 403.4113 433.4373 416.2251]
-/A <</Type /Action
-/S /URI
-/URI (javascript:void\(0\))
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [433.4373 403.4113 459.0649 416.2251]
-/A <</Type /Action
-/S /URI
-/URI (http://codeartisan.blogspot.com/search?updated-min=2009-01-01T00:00:00-05:00&updated-max=2010-01-01T00:00:00-05:00&max-results=7)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [429.4329 385.7922 446.2511 398.606]
-/A <</Type /Action
-/S /URI
-/URI (javascript:void\(0\))
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [446.2511 385.7922 488.697 398.606]
-/A <</Type /Action
-/S /URI
-/URI (http://codeartisan.blogspot.com/2009_10_01_archive.html)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [429.4329 362.5671 446.2511 375.381]
-/A <</Type /Action
-/S /URI
-/URI (javascript:void\(0\))
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [446.2511 362.5671 483.0909 375.381]
-/A <</Type /Action
-/S /URI
-/URI (http://codeartisan.blogspot.com/2009_08_01_archive.html)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [428.632 339.342 445.4502 352.1558]
-/A <</Type /Action
-/S /URI
-/URI (javascript:void\(0\))
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [445.4502 339.342 467.0736 352.1558]
-/A <</Type /Action
-/S /URI
-/URI (http://codeartisan.blogspot.com/2009_05_01_archive.html)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [442.2468 291.29 538.3506 334.5368]
-/A <</Type /Action
-/S /URI
-/URI (http://codeartisan.blogspot.com/2009/05/public-key-cryptography-in-java.html)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [429.4329 260.8571 446.2511 273.671]
-/A <</Type /Action
-/S /URI
-/URI (javascript:void\(0\))
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [446.2511 260.8571 492.7013 273.671]
-/A <</Type /Action
-/S /URI
-/URI (http://codeartisan.blogspot.com/2009_02_01_archive.html)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [429.4329 237.632 446.2511 250.4459]
-/A <</Type /Action
-/S /URI
-/URI (javascript:void\(0\))
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [446.2511 237.632 487.0952 250.4459]
-/A <</Type /Action
-/S /URI
-/URI (http://codeartisan.blogspot.com/2009_01_01_archive.html)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [416.619 206.3983 433.4373 219.2121]
-/A <</Type /Action
-/S /URI
-/URI (javascript:void\(0\))
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [433.4373 206.3983 459.0649 219.2121]
-/A <</Type /Action
-/S /URI
-/URI (http://codeartisan.blogspot.com/search?updated-min=2008-01-01T00:00:00-05:00&updated-max=2009-01-01T00:00:00-05:00&max-results=11)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [416.619 183.974 433.4373 196.7879]
-/A <</Type /Action
-/S /URI
-/URI (javascript:void\(0\))
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [433.4373 183.974 459.0649 196.7879]
-/A <</Type /Action
-/S /URI
-/URI (http://codeartisan.blogspot.com/search?updated-min=2007-01-01T00:00:00-05:00&updated-max=2008-01-01T00:00:00-05:00&max-results=27)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [45.0173 706.9394 169.9524 732.5671]
-/A <</Type /Action
-/S /URI
-/URI (http://codeartisan.blogspot.com/)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [416.619 524.342 489.4979 540.3593]
-/A <</Type /Action
-/S /URI
-/URI (http://add.my.yahoo.com/rss?url=http://codeartisan.blogspot.com/feeds/posts/default)
->>
->> <</Type /Annot
-/Subtype /Link
-/Border [0 0 0]
-/Rect [416.619 497.9134 580.7966 516.3333]
-/A <</Type /Action
-/S /URI
-/URI (http://www.newsgator.com/ngs/subscriber/subext.aspx?url=http://codeartisan.blogspot.com/feeds/posts/default)
->>
->>]
-/Contents 27 0 R
->>
-endobj
-27 0 obj
-<</Filter /FlateDecode
-/Length 11803
->> stream
-x��}ۊn9���~�x�ٵ|����u5=��t5CeU��0K����Y_;`�*22�u�-�Z��y]�������c����?�ɯWk�s��-�ҿ�?����o���_7<}�u�=Z�xMo�Ͽ��������o�|���7��۞�F�������_���~��m���?n<����[.o��ۿ\W���|���y`�R��`Y���i���*�Y Ϊq���_�����פ������'}����s�s��'��C�g���=4�n��5ip������ˀ��b�Ճi�9p���ݳA�{�f��OJ�0�[����l�_Ł�a�x��A^<��h,{�W�s/CZ)ޕ����`kL��i�O\��Jj�RKZ����X����Yj)��<i�й��<{ʝ�y��J��K��-1/)�����>BfJyỏJ_��a��G�1�X��J&�eV��eR.�̝�����ź`[>���O&��𢡊�6R������W�ȍq��7/�z��ϩ��+�D���i՜�2��
�@7gK���V�H�g����z��%��<Рu�C�����ֹ�̄�id�1e�J�:��ҕɤ�2�^��X��KIS���j���DʙB��Β���P��`v^�*�l���6Y���E5�J,5�N�.5��n���k|���CY�I�H�S5�wP���yY��杓�he�c�z��2�U��x���Eh���|���˼4rND9WbW�� ,�z�EK��5~iL�$ ��3Ml��0y�k&��l#�q��o��~r�6�Nm�@���Zr���~�6�����F�O��~ؠ��`������߿V�諼�4�z��B"���m��s��TO���_&��~����� j��^#����{)"��o��������;g7���;�<^��]��K
-3��?؊:�r�=��X {�_
-��!�u��@_�i荩�9ڮ��\��]]`zdq%� ��Q1Aw����x��kR�$�� -�jʕ�k�K%�X�� �h��R������>��n���
-���VT[�_�둾���H����:�\
-K*��
-K��g�%U���hv`yR�GzJ��j3,����S��w鱾����'9�y%]+�_�T�#H��#_"z^XR݉�м4
-�"4�l,�WO��C����m�*][TN���*���u&�j��&F�O��=\����� ���AN�+��;�>:�;�sX�Wu9�V5M��� ��u�F:?�ce>As�9��ILm�.��ǻ��Yӭ���Ql��&�E������JB�U�������l��|X6� �ۦ���'ݚ��$�D�+O�"J�jl��AU�y�F0gc���&k-���\�A璉��¼3Ml�g;/�-���o��E�2����>�1S'��K�Ũ*FG�Rg�����d�j�����+�bb(f<C3sh�1�gF�`�\���<t2-,Y|����2c����28�6q��B�^6?bV�iˊG]�R���B�h=wK}Qah �� l.=�Y�0��0?+�se��'�5K���^�QPѓ&#���`R6b�9�$FUDͲ�T2w�#{J2�'Fs�L���y���2���O'V��LLW
-��_�+�d��������"Ɲ� �ȍ�������`��ZyI�D|.O"|^5~�K��7���5�Kjd�bt�ワ��[�A_X+��QO?�J5��,��s1��&@c�6�sy��(\L�����;�Ʃ*U6�DVoM�Z����kӇζ�o��R��[D~we�ܢ#( ��H���H�����~�葎ڮ�=T��Ny3��C����2��U��R� ��<ޢ��)U�P�k�e�ʱ2���p4\����;�qmOP��Irt��d�!G��f�BXLG;�?���"������1��\��w����s+D��i9���R5.��<&�B��q��Mg-2o1>�[���/�o��&�� ^R\�6�"�4@K[�bKg־wϡ��ɬ������ԏ���W�s�H��h�^�����P/~��z�<ԋ_�S��y�?�C����P/�X��u���G�/-"���
-��p��U�O:��Gk�p��`c[%�"W/bŦ���b�dTI0����y1�r�(�d��9'����v�7�֝�b���G�B�N �RXx��tƴ�'�~^���6]W'�(�x
-�3��%<�s�r;�ۄf"ٝ�B���p(�b5�7��"v��[5}�T����m�Ԛ�7�ʤZ5>��ޖ�^Q'���&o{�jQ�q�h❯+4�L�6k�'�R@9�!�זA+�wF�F&h'�vjj�R!#%`<s�)��w�
-�5Y���-+�g���1�W3ah'�P���:WJ��Jn��6��yf&�Ŕ��Y�y�2o'��B������f�Z>8�¬5��i�����N��3Y���5:�Z2�wu��\��&e�G{��@�� �/� 矮�j:��]���7�v=�ͯ[;�8�~%=v*�adP�a�6�b�^A��
-5]c>��(���O;��&��S+���� L�r��D�p�W���������'ޮ�������L��Â髿�P{�V5��+)�KK�F���RnD�¬�p;�[��hK�f^H��a�Z�p@l�K�il����.=��N�/F���X��jv�� ����-F��0�-����=��]�3\���睔_グY�&�b6Y�~q��<��b��llDV�hw�ڞ�zTe���0�A�\:�뱘f�!�F�J�bVW����t'��
-�t�bu@���h�υz�7O��g�?��
-�̡�:VD�)cj�5�D�p/x�o��J� Ǚj,��mDHr�%�oc1I�7Vy2��y�1�o[l�^摙4���<;�w1O�ќ�!S2f�A��2�����0ClR)G�h���x�\Z"T��0��$9�w���D�r�7�:��K"�ՠ?V4::X��~�`tG�53���ښ�IdUz!6Y��
-��0~��XjY�j�lc����@}5��������[�K�B���ol�HϜ������u2�(�O� 牳j��5��Hg�K��+�I&���=�
-��u�j���j��H�b�VJsc
-�y2���yd�y��뻆���E2���u�L8��=1�'9�̐4G�@͝p��d<oaZ�˽
-
-;�Ƥљ$��\����3a&��y2��b�h��g^��;���5�YNQcu1Of6� ��\�0~��b���6�ь��<����3�MN:v��$�ט�EC��)�ykll.D�rU7���xh{5�����@��c�k ^Fz�~#�4Z���GݢG�Ҭf%}b�2_��АQ���4�/L�z�N�UK!#%�����vdB��h}����
-�sM�V�o)��ԝ�ov �l<�goџ��*7��Mc��l�B��Y������ǣy2kK�����?��Ӌ�&!�rE+�j�c̙y��#�V��$�e���&.L*��<(̓Yl6ڇ��b+o�b~�e��.�����~�+�F���1�� +�oiL��3I|��/,�&���/d�Ŭ�^��\�aޏDYO��6���4�P�~�f.%��?f�����X��`��z��RS�=dj��~h tjj�Q�Ԥ�P����~�������,��P���"�._�H]s�,�m��ۮ���3��-�V.(�T��XGrA9���~�9���`����мkc�M��f��o�{f��Ũ�Ir�p�k��jb�ɋ����7n,�'!�LdW�OB64��L�C��k|J�y{���~M�x{�X�ަ�%h�����/]_�Ě䎕�zi{�;V��4��3[c��r%�QMT�!k���]AX
-x(�+���U�
-�7ѷ�)��Ю����#�9��y[��C狌\-<Ҽ`��]�4Mx�Y����NGұ��U���T/�QmL�P�+��kY�����c�INWP�W^t�4��/��3����x^���̓��d�خ��ۆ4VT��,MU�T�qd\�t��$�b��L�r��Hce&�},�W�#��ؙ&��ؠ����%��qC�2��F�� ��u.�9�#�ah�����5�}z~D�a�z[b�5�X�����%:������B��M�l���%��H�y&>#� �yi^��j���t%��g��P|���p
-9x�i�/nL�n�]�K'�*��+y4TN��;h��"ڊf����l���'���*ÕHc��P;��.�3e(��)C~sMĮ��.�MK����q���rx�K$93q1����D��ۍ%�sah���1���>�,��E����"s̯Y�j'�,�C��d��,^�k"����4�m ��}0�hMB�w� C�d��P7�D��f���K���%����,[��z1���76g�<�~F���9�1��_��EF�i��C�C5�w�7�!7)O"%y��M�y���m�fh?O1���c8��ƨZ�6y�����D�r�J< 1C�F��HUp�3h�c��1�)A���� �;���r�X���]
-���U����W�#9DU4�yM�ÖO���N�1ͥб��k��,�*�FW8Fd�/M�X�7�fh���عG�6��̨��6 �&�y��P�;͆���6�X�"M��uM�1xH�:*���$�2����_m7#��~��Bu�h]�����欁Nǫ��}�#��8���vULp2:=ݮ�Ŵw�=�����R��1|&�c���P����;�<��B���{�y�0���<�����$�/sg4W#I�Fs�]1�J.gi��h�a��qd��t9;���dTP��"���{�chΌ�<���>8����>P����w�UF�س�29Osv
-��]�x�<ٍB5���ٙh_�=�Q��N8��٠A�dG�8�+ Vj4^Bk��"I�#j"Q����P뿇f�t�H G�FZ�Zh�1��vE���I�I^�ԓCvv��/���=jv}525&)���@}����h�MrgM�/�Cj��4U�T�~��@
-3l��~㗵�N��ce���=d����*�I��L�j��Yn)�{g4�P�^�f�}(�X��Č�b<3� T��<eo�(<�j�rJeQE�*Kc���T�A� 7�ȼ�y��4VQ�T1���8Y�!�L�w��M+<�ox�ߴ�z ��HY�輺k�ПQ�⣩�ӊ�%�>@_�̈́�e$g��0�o0=���/"�d4�w�4f�Fq����N/vb��>���GӘ|ͧ�ɭ��ē� �ًQ�ơ�v�8�5��R./����`���VU���1��Љ�����*�>�`����f��н1~����4i����x��Hƶ�h�̞K�4J��#�XT�Kӌ+�`��з�0����#_�-�e����0��H�79ra�@ș0c���WL]��D�G�;��@促gXV'I���d��� ���/�f¬���'�ɼ�����L��:T_ �=3Y������(��k:���L*���:vÁ��]�_��ƶ��E�+�ۘ�\
-�(S�g�}肜�md�װ�#8�wd&�I�Z�h?[���Q%�ubIʮ��5��y��������)̭Y롰k����y'��Dg�Е���y��[/#I��4>�u]&Iy����~ �rtu���(�O���dj�o��2�A�˯-�-.��+i�ߏM�qd�ȷx�C*�6�U��[HFL�f'����.��F�Q,+�`T��Ǝ�h��hW9�� њ*��
-g�ɠ��M��n�ߤo�s���z��z]
-�]��>@hD3��i���mUay�Ȥr7/F,�K-]c�5��v5f<�l�a������5Ͱܚڝ��|�;�z��bB�#�x鑾���@�r�d�gN�6��9�����Sc�/q��ϥ���Z����}PHS2�:�sIs��dƯQ4^O�l�^�X�'2�JV���p-@�6�Mz��V�Ad�����L�^�`��x��N�5{�S�:��l4��h{ L��l57X���E�Ո���84����o�Dz�w�j,�Ơ�k!�^��Jc�.���6������`Q��6��oYL�F�÷���tr&ڗj#����v:�����>���J�W����R��>��c4�ʽR@�GbM#!g�S�8��������j�_we��~ધQ9|�T��Sہ�����&\�'l�j�*3.��������P^$ZY���$�X+��7�O)/Ɩ$I76�l�_}T6��8�!h��刏�l<����ےޭB�~��Ό�X�c%ˣB���!L�I�)7bb�.4 �b_nĨy��b����
���*� �:s2��4��ߙ��JƏ5(�1UҖ?�J��rh^Na�䬀� E����* �]d���%��h�&:�u��ť%ߠYDB�H2�E�QĈ�Q�_�ȍ�����dT�N��r`l7.ƑQ����d��%�E�'� �y�מ�ٿ�O�p��ƌM��bT�J�R�Q(��(b��^�j�?3�f�X��<)�s�J?�s�2�H��1G�j��U��\����ؚUu��O��vUL�}��A�48�e�� �md^ �s�_��J�<ij H]�}�z
-�B��i��IE�<MS�=u>��eu���O�֞�a"�t���4��OlNJ� +�i2zÒ�b��Q�\)͝���jd�y^Lγk�32�2&��N�/b�ʓ-s�Ė�U\�Qn�HR�~G!r��)�yvb��h��]�#)�ƒ�))�j��x��,V��L ,��i�Ai�0���&�A��U�S�i��pɣ���F3Q���Ց?�=E3��jt�+U��Պ:k�ZC�^�NLۥ�����9�CvC�?R��H��pα�HYV��tw>��A$�s����I8�UӐ`�Z��B�4~���|��8*�co�B3�۾���m_LU�rz�o�fbc�����}�]F���X2\�l����wAe:�FG�'����gs��b�k�q�۾XV�šl
-��*�7�J<E.a¼1ڳ˥��v��l�ܘ�2�슉�X|�j��x�)�َ�����.d��Q���&���f<V:��1��_.M�A3��$��h���/`?�B��4�ǁRG6=',��?tR Z��A��xΩ�B��$�� ��b�vI�{�g졉���]����d�kgT��8j�a����%�[��q4/&�ٙ�Va�.&���}���������bLҗ������ո-�f��4��%�3x,�a|����<5GP�]�6v�6�aW#Z(��YAfaL>{�@�'