You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by ch...@apache.org on 2015/09/10 00:13:03 UTC
[32/50] incubator-apex-core git commit: Merge branch
'SPOI-5338-3.1.0' of https://github.com/ishark/Apex into
ishark-SPOI-5338-3.1.0
Merge branch 'SPOI-5338-3.1.0' of https://github.com/ishark/Apex into ishark-SPOI-5338-3.1.0
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/9d08532a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/9d08532a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/9d08532a
Branch: refs/heads/master
Commit: 9d08532a7127bf57d8d0ace45c0a165581d17daf
Parents: 86c86c6 ba46e71
Author: thomas <th...@datatorrent.com>
Authored: Thu Aug 13 21:26:30 2015 -0700
Committer: thomas <th...@datatorrent.com>
Committed: Thu Aug 13 21:26:30 2015 -0700
----------------------------------------------------------------------
.../java/com/datatorrent/stram/cli/DTCli.java | 18 +-
.../stram/webapp/OperatorDiscoverer.java | 204 +++++++++----------
.../stram/webapp/StramWebServices.java | 8 +-
.../com/datatorrent/stram/webapp/TypeGraph.java | 86 ++++++--
.../stram/webapp/OperatorDiscoveryTest.java | 9 +-
5 files changed, 175 insertions(+), 150 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/9d08532a/engine/src/main/java/com/datatorrent/stram/cli/DTCli.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/9d08532a/engine/src/main/java/com/datatorrent/stram/webapp/TypeGraph.java
----------------------------------------------------------------------
diff --cc engine/src/main/java/com/datatorrent/stram/webapp/TypeGraph.java
index 8d7e346,d0b34c2..fc175af
--- a/engine/src/main/java/com/datatorrent/stram/webapp/TypeGraph.java
+++ b/engine/src/main/java/com/datatorrent/stram/webapp/TypeGraph.java
@@@ -37,9 -37,8 +37,10 @@@ import org.slf4j.Logger
import org.slf4j.LoggerFactory;
import com.datatorrent.api.Component;
+ import com.datatorrent.api.InputOperator;
import com.datatorrent.api.Operator;
+
+import com.datatorrent.common.util.BaseOperator;
import com.datatorrent.netlet.util.DTThrowable;
import com.datatorrent.stram.webapp.asm.ClassNodeType;
import com.datatorrent.stram.webapp.asm.ClassSignatureVisitor;
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/9d08532a/engine/src/test/java/com/datatorrent/stram/webapp/OperatorDiscoveryTest.java
----------------------------------------------------------------------