dependency confilcts resolved . pay attention to cwlDesc getActivity class
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/80b439e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/80b439e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/80b439e8 Branch: refs/heads/cwl-browse Commit: 80b439e8d75a3dea8ee677032feaf96383bd8935 Parents: aa016ca Author: ThilinaManamgoda <maanafun...@gmail.com> Authored: Sun Jul 3 16:19:05 2016 +0530 Committer: ThilinaManamgoda <maanafun...@gmail.com> Committed: Sun Jul 3 16:19:05 2016 +0530 ---------------------------------------------------------------------- pom.xml | 1 - taverna-cwl-activity-ui/pom.xml | 40 ++++++++++++++------ .../cwl/ui/serviceprovider/CwlServiceDesc.java | 11 ++++-- .../cwl/CwlActivityConfigurationBean.java | 3 +- 4 files changed, 38 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/80b439e8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ccbefd2..d240c4e 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,6 @@ <module>taverna-wsdl-generic</module> <module>taverna-xpath-activity</module> <module>taverna-cwl-activity-ui</module> - <module>taverna-cwl-utilities</module> </modules> http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/80b439e8/taverna-cwl-activity-ui/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-cwl-activity-ui/pom.xml b/taverna-cwl-activity-ui/pom.xml index e674f1a..33cb06c 100644 --- a/taverna-cwl-activity-ui/pom.xml +++ b/taverna-cwl-activity-ui/pom.xml @@ -65,22 +65,45 @@ <artifactId>snakeyaml</artifactId> <version>1.17</version> </dependency> + <dependency> - <groupId>net.sf.taverna.t2.ui-api</groupId> - <artifactId>activity-palette-api</artifactId> - <version>${t2.ui.api.version}</version> + <groupId>org.apache.taverna.commonactivities</groupId> + <artifactId>taverna-cwl-utilities</artifactId> + <version>2.1.0-incubating-SNAPSHOT</version> + <type>bundle</type> </dependency> - <dependency> <artifactId>taverna-cwl-activity</artifactId> <groupId>${project.groupId}</groupId> <version>${project.version}</version> </dependency> + + <dependency> + <groupId>net.sf.taverna.t2.ui-api</groupId> + <artifactId>activity-palette-api</artifactId> + <version>${t2.ui.api.version}</version> + </dependency> + <dependency> + <groupId>net.sf.taverna.t2.ui-api</groupId> + <artifactId>menu-api</artifactId> + <version>${t2.ui.api.version}</version> + </dependency> + <dependency> + <groupId>net.sf.taverna.t2.ui-api</groupId> + <artifactId>contextual-views-api</artifactId> + <version>${t2.ui.api.version}</version> + </dependency> + <dependency> + <groupId>net.sf.taverna.t2.ui-impl</groupId> + <artifactId>activity-tools</artifactId> + <version>${t2.ui.impl.version}</version> + </dependency> + <dependency> <groupId>net.sf.taverna.t2.taverna-workbench</groupId> <artifactId>workbench-dev</artifactId> <version>${t2.workbench.version}</version> - <scope>test</scope> + <exclusions> @@ -169,16 +192,11 @@ </dependency> <!-- ==================================================================================================== --> - <dependency> - <groupId>org.apache.taverna.commonactivities</groupId> - <artifactId>taverna-cwl-utilities</artifactId> - <version>2.1.0-incubating-SNAPSHOT</version> - <type>bundle</type> - </dependency> </dependencies> <!-- Added these properties to configure new dependencies --> <properties> + <t2.ui.impl.version>1.5</t2.ui.impl.version> <t2.ui.api.version>1.5</t2.ui.api.version> <t2.workbench.version>2.5.0</t2.workbench.version> </properties> http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/80b439e8/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceDesc.java ---------------------------------------------------------------------- diff --git a/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceDesc.java b/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceDesc.java index 54934f1..88c5580 100644 --- a/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceDesc.java +++ b/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceDesc.java @@ -45,10 +45,7 @@ public class CwlServiceDesc extends ServiceDescription<CwlActivityConfigurationB private Map cwlConfiguration; private String toolName; - @Override - public Class<? extends Activity<CwlActivityConfigurationBean>> getActivityClass() { - return (Class<? extends Activity<CwlActivityConfigurationBean>>) CwlDumyActivity.class; - } + @Override public CwlActivityConfigurationBean getActivityConfiguration() { @@ -95,4 +92,10 @@ public class CwlServiceDesc extends ServiceDescription<CwlActivityConfigurationB this.toolName = toolName; } + @Override + public Class<? extends Activity<CwlActivityConfigurationBean>> getActivityClass() { + // TODO Auto-generated method stub + return null; + } + } http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/80b439e8/taverna-cwl-activity/src/main/java/org/apache/taverna/cwl/CwlActivityConfigurationBean.java ---------------------------------------------------------------------- diff --git a/taverna-cwl-activity/src/main/java/org/apache/taverna/cwl/CwlActivityConfigurationBean.java b/taverna-cwl-activity/src/main/java/org/apache/taverna/cwl/CwlActivityConfigurationBean.java index 718f3e8..5c0fb28 100644 --- a/taverna-cwl-activity/src/main/java/org/apache/taverna/cwl/CwlActivityConfigurationBean.java +++ b/taverna-cwl-activity/src/main/java/org/apache/taverna/cwl/CwlActivityConfigurationBean.java @@ -16,9 +16,10 @@ *******************************************************************************/ package org.apache.taverna.cwl; +import java.io.Serializable; import java.util.Map; -public class CwlActivityConfigurationBean { +public class CwlActivityConfigurationBean implements Serializable { //This class holds the object which is produced by the ServiceProvider and contains the configurations that are need for the CWLActivity private Map cwlConfigurations;
