You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/02/22 16:31:34 UTC
[1/2] incubator-taverna-server git commit: Workflow.getIdentifier
Repository: incubator-taverna-server
Updated Branches:
refs/heads/master 7afe2476b -> cac9a1671
Workflow.getIdentifier
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/commit/f6eb723d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/f6eb723d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/f6eb723d
Branch: refs/heads/master
Commit: f6eb723dd5a5584fbcd378a8310e12b18ce6dce3
Parents: 7afe247
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Feb 22 14:48:16 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 22 14:48:16 2016 +0000
----------------------------------------------------------------------
.../java/org/taverna/server/master/ContentsDescriptorBuilder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/f6eb723d/taverna-server-webapp/src/main/java/org/taverna/server/master/ContentsDescriptorBuilder.java
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/ContentsDescriptorBuilder.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/ContentsDescriptorBuilder.java
index aee4425..7e35067 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/ContentsDescriptorBuilder.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/ContentsDescriptorBuilder.java
@@ -75,7 +75,7 @@ public class ContentsDescriptorBuilder {
WorkflowBundle bundle = run.getWorkflow().getScufl2Workflow();
bundle.getMainWorkflow().getInputPorts();
portDesc.fillInBaseData(bundle.getMainWorkflow()
- .getWorkflowIdentifier().toString(), run.getId(), ub.build());
+ .getIdentifier().toString(), run.getId(), ub.build());
return bundle.getMainWorkflow();
}
[2/2] incubator-taverna-server git commit: An attempt to use
taverna-commandline ZIP
Posted by st...@apache.org.
An attempt to use taverna-commandline ZIP
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/commit/cac9a167
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/cac9a167
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/cac9a167
Branch: refs/heads/master
Commit: cac9a1671b973ba977f7065cc4930f5a2381c489
Parents: f6eb723
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Feb 22 15:31:27 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 22 15:31:27 2016 +0000
----------------------------------------------------------------------
taverna-server-webapp/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/cac9a167/taverna-server-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/pom.xml b/taverna-server-webapp/pom.xml
index 806c435..eb63870 100644
--- a/taverna-server-webapp/pom.xml
+++ b/taverna-server-webapp/pom.xml
@@ -36,7 +36,8 @@ limitations under the License.
<version.jdoapi>3.0.1</version.jdoapi>
<forker.module>taverna-server-unix-forker</forker.module>
<util.dir>${project.build.directory}/${project.build.finalName}/WEB-INF/classes/util</util.dir>
- <cmdline.dir>${util.dir}/taverna-commandline-${edition.commandline}-${version.commandline}</cmdline.dir>
+ <!-- FIXME: This should not hardcode versions -->
+ <cmdline.dir>${util.dir}/taverna-command-line-3.1.0-incubating-SNAPSHOT-20160222T1521-nightly</cmdline.dir>
</properties>
<dependencies>
@@ -603,11 +604,10 @@ limitations under the License.
<artifactItems>
<artifactItem>
<groupId>org.apache.taverna.commandline</groupId>
- <artifactId>taverna-commandline</artifactId>
+ <artifactId>taverna-command-line-product</artifactId>
<version>${taverna.commandline.version}</version>
- <classifier>bin</classifier>
+ <classifier>nightly</classifier>
<type>zip</type>
- <classifier>bin</classifier>
<outputDirectory>${util.dir}</outputDirectory>
</artifactItem>
</artifactItems>