You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@taverna.apache.org by menaka121 <gi...@git.apache.org> on 2015/06/16 23:25:34 UTC
[GitHub] incubator-taverna-language pull request: Iwir json
GitHub user menaka121 opened a pull request:
https://github.com/apache/incubator-taverna-language/pull/2
Iwir json
Added the support to convert scufl workflows into .iwir and .json formats.
Please review and merge.
Thank you
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/menaka121/incubator-taverna-language iwir_json
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-taverna-language/pull/2.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #2
----
commit 6f11622606076179c3f7b6130a376ab538c87da7
Author: Menaka <me...@gmail.com>
Date: 2015-05-29T19:40:55Z
JCommander dependancy added
commit 18a3c12f9bd593c4e49929b6d9d5ed99d974c24c
Author: Menaka <me...@gmail.com>
Date: 2015-06-07T16:13:41Z
pom updated
commit 0d8202bf328f00c86b9e4f3dd1ccf0ffb4a09378
Author: Menaka <me...@gmail.com>
Date: 2015-06-07T16:22:31Z
Basic Commands
commit e3aea177629942277d29c1e64a59bdf4d0f1fc62
Author: Menaka <me...@gmail.com>
Date: 2015-06-07T16:31:55Z
Test
commit 1c723309c8a355904e64cb1b60cecb5154d027b1
Author: Menaka <me...@gmail.com>
Date: 2015-06-07T17:10:12Z
Test
commit 130978f028aafaaed3384d760bd5124ccc412a7e
Author: Menaka <me...@gmail.com>
Date: 2015-06-07T17:51:33Z
Minor edits
commit 91d2401d1585ec91c9ef4ef7bfd6ef77efa34355
Author: Menaka <me...@gmail.com>
Date: 2015-06-07T18:12:43Z
Final
commit 7f518d0b89b8885f12cea193a945dde2daf370a0
Author: Menaka Jayawardena <me...@gmail.com>
Date: 2015-06-07T18:15:55Z
Update pom.xml
commit 1968113d8f5c686a33fe9e7432c0bfccb0a60520
Author: Menaka <me...@gmail.com>
Date: 2015-06-08T08:42:20Z
Finished commands
commit 7ca3186b3cb6725502d47dcc37355930a1343491
Author: Menaka <me...@gmail.com>
Date: 2015-06-08T14:18:36Z
Package name changed/ license header added
commit e0f3c852c38a6f17dcb95ea46a7e5d6f158d0749
Author: Menaka Jayawardena <me...@gmail.com>
Date: 2015-06-08T19:31:59Z
Update pom.xml
main class changed
commit dd20013fa0aa50ad2de34dd27463b2594e78bcc1
Author: Menaka Jayawardena <me...@gmail.com>
Date: 2015-06-08T19:33:20Z
Update pom.xml
commit 39d1652148d9772f9032dde9bed74339f3888cc0
Author: menaka121 <me...@gmail.com>
Date: 2015-06-08T20:17:53Z
Pom -> dependencies added
commit 60b6c3309639c669a92a856f4e62d61f07ca91a1
Author: menaka121 <me...@gmail.com>
Date: 2015-06-08T22:36:29Z
ToWfbundle converter
commit 533c4145fafde8aca1e136354c034a53177e5b60
Author: menaka121 <me...@gmail.com>
Date: 2015-06-09T18:40:33Z
Conversion tool for basic types
commit 5cc255f567e04b9175de6e917f40112fa2181552
Author: menaka121 <me...@gmail.com>
Date: 2015-06-09T20:22:01Z
Refined methods
commit 650ebc7473b6bfad84b4d5e390ea5ff98eb712f3
Author: menaka121 <me...@gmail.com>
Date: 2015-06-09T22:16:30Z
processornames and servicetypes
commit 648444638037d88275980a9250ecf1caa80387ca
Author: menaka121 <me...@gmail.com>
Date: 2015-06-09T22:52:20Z
Final
commit b5f44ff8556c24111bf34214f42c16b03b51b5a7
Author: menaka121 <me...@gmail.com>
Date: 2015-06-09T22:53:38Z
conversion tools
commit 72a7e0da4a4073eff8547fb05332523b61cd07d8
Author: menaka121 <me...@gmail.com>
Date: 2015-06-11T10:36:49Z
Changed the class name
commit ea77fa18259582b6b3eb5fb5ec107b517123bbd5
Author: menaka121 <me...@gmail.com>
Date: 2015-06-11T10:46:23Z
Changed class
commit 72eb458c3f50b399da06ed107aa28cd149e33f9d
Author: menaka121 <me...@gmail.com>
Date: 2015-06-11T13:09:41Z
Tools
commit 5a653a1365878f3ef4ca2b6b077f353c57a069ff
Author: menaka121 <me...@gmail.com>
Date: 2015-06-11T13:27:43Z
Changed
commit b2976c0fec65caa1cefb2bc48aa8c4a751f74b3f
Author: menaka121 <me...@gmail.com>
Date: 2015-06-11T13:31:29Z
Test files added
commit 5cf7ddebb080131e0190d72c4b47c2315a395226
Author: menaka121 <me...@gmail.com>
Date: 2015-06-11T14:34:49Z
Readme.md updated - usage
commit dbc01be29f376cb7bec193faf237100502b6b567
Author: menaka121 <me...@gmail.com>
Date: 2015-06-11T15:32:31Z
minor update
commit b421243a99c74fe8e156d5192baf21f2e12dd015
Author: Menaka Madushanka <me...@gmail.com>
Date: 2015-06-11T15:41:11Z
Package updated
commit 15679e7703e467b0862d15dc56290d424a4dd858
Author: menaka121 <me...@gmail.com>
Date: 2015-06-11T15:48:55Z
changed - to --
commit c44618fd40a6591bd8b94e96c9751c90ccc0d0ed
Author: Menaka Madushanka <me...@gmail.com>
Date: 2015-06-12T21:29:48Z
Added the ServicesResourceTransformer
commit 4d5548e6a9cbf4d056ec2bd775c09702bdeb9f66
Author: Menaka Madushanka <me...@gmail.com>
Date: 2015-06-16T17:38:46Z
Nicer Code
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-taverna-language pull request: Iwir json
Posted by menaka121 <gi...@git.apache.org>.
Github user menaka121 closed the pull request at:
https://github.com/apache/incubator-taverna-language/pull/2
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-taverna-language pull request: Iwir json
Posted by stain <gi...@git.apache.org>.
Github user stain commented on the pull request:
https://github.com/apache/incubator-taverna-language/pull/2#issuecomment-112598857
Could you resolve the merge conflict first? You will need to do something like:
```
git remote add upstream https://github.com/apache/incubator-taverna-language.git
git fetch upstream
git merge upstream/master
# vim whatever-is-in-conflict
git commit
mvn clean install # does it still build?
git push
```
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---