You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2015/09/11 02:37:27 UTC
[1/2] incubator-streams git commit: resolves STREAMS-364
Repository: incubator-streams
Updated Branches:
refs/heads/master 498c6cc9f -> 1470b9227
resolves STREAMS-364
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/3bb99da0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/3bb99da0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/3bb99da0
Branch: refs/heads/master
Commit: 3bb99da0201d3fd7e2f7038217f04a334fcee327
Parents: 092021c
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Tue Sep 8 12:22:50 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Tue Sep 8 12:22:50 2015 -0500
----------------------------------------------------------------------
.../org/apache/streams/config/StreamsConfigurator.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3bb99da0/streams-config/src/main/java/org/apache/streams/config/StreamsConfigurator.java
----------------------------------------------------------------------
diff --git a/streams-config/src/main/java/org/apache/streams/config/StreamsConfigurator.java b/streams-config/src/main/java/org/apache/streams/config/StreamsConfigurator.java
index 95b0b04..9fa20b6 100644
--- a/streams-config/src/main/java/org/apache/streams/config/StreamsConfigurator.java
+++ b/streams-config/src/main/java/org/apache/streams/config/StreamsConfigurator.java
@@ -27,6 +27,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.Serializable;
+import java.net.MalformedURLException;
+import java.net.URL;
/**
* StreamsConfigurator supplies the entire typesafe tree to runtimes and modules.
@@ -49,6 +51,16 @@ public class StreamsConfigurator {
return config;
}
+ public static Config resolveConfig(String configUrl) throws MalformedURLException {
+ URL url = new URL(configUrl);
+ Config urlConfig = ConfigFactory.parseURL(url);
+ urlConfig.resolve();
+ config = urlConfig;
+ return config;
+ }
+
+
+
public static StreamsConfiguration detectConfiguration() {
return detectConfiguration(config);
}
[2/2] incubator-streams git commit: Merge branch 'STREAMS-364'
Posted by sb...@apache.org.
Merge branch 'STREAMS-364'
* STREAMS-364:
resolves STREAMS-364
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/1470b922
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/1470b922
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/1470b922
Branch: refs/heads/master
Commit: 1470b92272bc0be22870dfe6574b89b8ceb6a04b
Parents: 498c6cc 3bb99da
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Thu Sep 10 19:16:04 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Thu Sep 10 19:16:04 2015 -0500
----------------------------------------------------------------------
.../org/apache/streams/config/StreamsConfigurator.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------