[2/6] git commit: Added parse and toJSON methods to read and write xwf file with JSON

2014-10-28 Thread shameera
Added parse and toJSON methods to read and write xwf file with JSON Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6e42be78 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6e42be78 Diff:

[3/6] git commit: renamed .xwf file prefix to .awf and fixed issue with QName type

2014-10-28 Thread shameera
renamed .xwf file prefix to .awf and fixed issue with QName type Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/723b2e94 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/723b2e94 Diff:

[4/6] Merged ReplaceXMLWithJSON branch and resolve merge conflicts

2014-10-28 Thread shameera
http://git-wip-us.apache.org/repos/asf/airavata/blob/6e0ea935/pom.xml -- diff --cc pom.xml index e1e70bf,4b844e1..4e68213 --- a/pom.xml +++ b/pom.xml @@@ -1,718 -1,839 +1,724 @@@ ?xml version=1.0 encoding=UTF-8? -!--Licensed

[1/6] Added parse and toJSON methods to read and write xwf file with JSON

2014-10-28 Thread shameera
Repository: airavata Updated Branches: refs/heads/master 47e821489 - 3b330c0d3 http://git-wip-us.apache.org/repos/asf/airavata/blob/6e42be78/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/WorkflowFiler.java

[5/6] git commit: Merged ReplaceXMLWithJSON branch and resolve merge conflicts

2014-10-28 Thread shameera
Merged ReplaceXMLWithJSON branch and resolve merge conflicts Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6e0ea935 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6e0ea935 Diff: