Repository: incubator-taverna-workbench Updated Branches: refs/heads/master a9a52bd52 -> bf8a7ea28
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-graph-view/src/test/resources/nested_iteration.t2flow ---------------------------------------------------------------------- diff --git a/taverna-graph-view/src/test/resources/nested_iteration.t2flow b/taverna-graph-view/src/test/resources/nested_iteration.t2flow index 9b50c7f..9b31fe9 100644 --- a/taverna-graph-view/src/test/resources/nested_iteration.t2flow +++ b/taverna-graph-view/src/test/resources/nested_iteration.t2flow @@ -1,20 +1,20 @@ -<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow";><dataflow id="23f84bb1-4a04-47fa-8150-7063310db697" role="top"><name>nested_iteration</name><inputPorts /><outputPorts><port><name>concat</name></port><port><name>list</name></port><port><name>constant</name></port></outputPorts><processors><processor><name>constant</name><inputPorts /><outputPorts><port><name>value</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2</group><artifact>stringconstant-activity</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.activities.stringconstant.StringConstantActivity</class><inputMap /><outputMap><map from="value" to="value" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.stringconstant.StringConstantConfigurationBean xmlns=""> +<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow";><dataflow id="23f84bb1-4a04-47fa-8150-7063310db697" role="top"><name>nested_iteration</name><inputPorts /><outputPorts><port><name>concat</name></port><port><name>list</name></port><port><name>constant</name></port></outputPorts><processors><processor><name>constant</name><inputPorts /><outputPorts><port><name>value</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2</group><artifact>stringconstant-activity</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.activities.stringconstant.StringConstantActivity</class><inputMap /><outputMap><map from="value" to="value" /></outputMap><configBean encoding="xstream"><org.apache.taverna.activities.stringconstant.StringConstantConfigurationBean xmlns=""> <value>constant</value> -</net.sf.taverna.t2.activities.stringconstant.StringConstantConfigurationBean></configBean></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> +</org.apache.taverna.activities.stringconstant.StringConstantConfigurationBean></configBean></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><org.apache.taverna.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryCo nfig xmlns=""> +</org.apache.taverna.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><org.apache.taverna.workflowmodel.processor.dispatch.layers.Re tryConfig xmlns=""> <backoffFactor>1.0</backoffFactor> <initialDelay>0</initialDelay> <maxDelay>0</maxDelay> <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross /></strategy></iteration></iterationStrategyStack></processor><processor><name>generate_list</name><inputPorts><port><name>prefix</name><depth>0</depth></port></inputPorts><outputPorts><port><name>list</name><depth>1</depth><granularDepth>1</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2</group><artifact>beanshell-activity</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.activities.beanshell.BeanshellActivity</class><inputMap><map from="prefix" to="prefi x" /></inputMap><outputMap><map from="list" to="list" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean xmlns=""> +</org.apache.taverna.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross /></strategy></iteration></iterationStrategyStack></processor><processor><name>generate_list</name><inputPorts><port><name>prefix</name><depth>0</depth></port></inputPorts><outputPorts><port><name>list</name><depth>1</depth><granularDepth>1</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2</group><artifact>beanshell-activity</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.activities.beanshell.BeanshellActivity</class><inputMap><map from="prefix" to="pr efix" /></inputMap><outputMap><map from="list" to="list" /></outputMap><configBean encoding="xstream"><org.apache.taverna.activities.beanshell.BeanshellActivityConfigurationBean xmlns=""> <script>list = new ArrayList(); for (int i = 0; i < 20; i++) { list.add(prefix + i); }</script> <dependencies /> <inputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> + <org.apache.taverna.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> <handledReferenceSchemes /> <translatedElementType>java.lang.String</translatedElementType> <allowsLiteralValues>true</allowsLiteralValues> @@ -23,54 +23,54 @@ for (int i = 0; i < 20; i++) { <mimeTypes> <string>'text/plain'</string> </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> + </org.apache.taverna.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> </inputs> <outputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> + <org.apache.taverna.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> <granularDepth>1</granularDepth> <name>list</name> <depth>1</depth> <mimeTypes> <string>l('text/plain')</string> </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> + </org.apache.taverna.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> </outputs> -</net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean></configBean></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> +</org.apache.taverna.activities.beanshell.BeanshellActivityConfigurationBean></configBean></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><org.apache.taverna.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryCo nfig xmlns=""> +</org.apache.taverna.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><org.apache.taverna.workflowmodel.processor.dispatch.layers.Re tryConfig xmlns=""> <backoffFactor>1.0</backoffFactor> <initialDelay>0</initialDelay> <maxDelay>0</maxDelay> <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><port name="prefix" depth="0" /></strategy></iteration></iterationStrategyStack></processor><processor><name>merge</name><inputPorts><port><name>in1</name><depth>0</depth></port><port><name>in2</name><depth>0</depth></port></inputPorts><outputPorts><port><name>out</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2</group><artifact>dataflow-activity</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.activities.dataflow.DataflowA ctivity</class><inputMap><map from="in2" to="in2" /><map from="in1" to="in1" /></inputMap><outputMap><map from="out" to="out" /></outputMap><configBean encoding="dataflow"><dataflow ref="79ad4092-abcb-42bf-ac98-d66dfac67dff" /></configBean></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> +</org.apache.taverna.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><port name="prefix" depth="0" /></strategy></iteration></iterationStrategyStack></processor><processor><name>merge</name><inputPorts><port><name>in1</name><depth>0</depth></port><port><name>in2</name><depth>0</depth></port></inputPorts><outputPorts><port><name>out</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2</group><artifact>dataflow-activity</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.activities.dataflow.Datafl owActivity</class><inputMap><map from="in2" to="in2" /><map from="in1" to="in1" /></inputMap><outputMap><map from="out" to="out" /></outputMap><configBean encoding="dataflow"><dataflow ref="79ad4092-abcb-42bf-ac98-d66dfac67dff" /></configBean></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><org.apache.taverna.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryCo nfig xmlns=""> +</org.apache.taverna.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><org.apache.taverna.workflowmodel.processor.dispatch.layers.Re tryConfig xmlns=""> <backoffFactor>1.0</backoffFactor> <initialDelay>0</initialDelay> <maxDelay>0</maxDelay> <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="in1" depth="0" /><port name="in2" depth="0" /></cross></strategy></iteration></iterationStrategyStack></processor><processor><name>generate_list_prefix_defaultValue</name><inputPorts /><outputPorts><port><name>value</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2</group><artifact>stringconstant-activity</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.activities.stringconstant.StringConstantActivity</cla ss><inputMap /><outputMap><map from="value" to="value" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.stringconstant.StringConstantConfigurationBean xmlns=""> +</org.apache.taverna.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="in1" depth="0" /><port name="in2" depth="0" /></cross></strategy></iteration></iterationStrategyStack></processor><processor><name>generate_list_prefix_defaultValue</name><inputPorts /><outputPorts><port><name>value</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2</group><artifact>stringconstant-activity</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.activities.stringconstant.StringConstantActivity</ class><inputMap /><outputMap><map from="value" to="value" /></outputMap><configBean encoding="xstream"><org.apache.taverna.activities.stringconstant.StringConstantConfigurationBean xmlns=""> <value>prefix</value> -</net.sf.taverna.t2.activities.stringconstant.StringConstantConfigurationBean></configBean></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> +</org.apache.taverna.activities.stringconstant.StringConstantConfigurationBean></configBean></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><org.apache.taverna.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryCo nfig xmlns=""> +</org.apache.taverna.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><org.apache.taverna.workflowmodel.processor.dispatch.layers.Re tryConfig xmlns=""> <backoffFactor>1.0</backoffFactor> <initialDelay>0</initialDelay> <maxDelay>0</maxDelay> <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross /></strategy></iteration></iterationStrategyStack></processor></processors><conditions><condition control="generate_list" target="constant" /></conditions><datalinks><datalink><sink type="processor"><processor>generate_list</processor><port>prefix</port></sink><source type="processor"><processor>generate_list_prefix_defaultValue</processor><port>value</port></source></datalink><datalink><sink type="processor"><processor>merge</processor><port>in1</port></sink><source type="processor"><processor>constant</processor><port>value</port></ source></datalink><datalink><sink type="merge"><processor>merge</processor><port>in2</port></sink><source type="processor"><processor>generate_list</processor><port>list</port></source></datalink><datalink><sink type="merge"><processor>merge</processor><port>in2</port></sink><source type="processor"><processor>generate_list</processor><port>list</port></source></datalink><datalink><sink type="dataflow"><port>concat</port></sink><source type="processor"><processor>merge</processor><port>out</port></source></datalink><datalink><sink type="dataflow"><port>list</port></sink><source type="processor"><processor>generate_list</processor><port>list</port></source></datalink><datalink><sink type="dataflow"><port>constant</port></sink><source type="processor"><processor>constant</processor><port>value</port></source></datalink></datalinks></dataflow><dataflow id="79ad4092-abcb-42bf-ac98-d66dfac67dff" role="nested"><name>Untitled workflow #24</name><inputPorts><port><name>in1</name><depth>0</d epth><granularDepth>0</granularDepth></port><port><name>in2</name><depth>0</depth><granularDepth>0</granularDepth></port></inputPorts><outputPorts><port><name>out</name></port></outputPorts><processors><processor><name>Nested_Workflow</name><inputPorts><port><name>in2</name><depth>0</depth></port><port><name>in1</name><depth>0</depth></port></inputPorts><outputPorts><port><name>out</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2</group><artifact>dataflow-activity</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.activities.dataflow.DataflowActivity</class><inputMap><map from="in2" to="in2" /><map from="in1" to="in1" /></inputMap><outputMap><map from="out" to="out" /></outputMap><configBean encoding="dataflow"><dataflow ref="ebd93027-c046-4a04-befa-c5715e8ba3da" /></configBean></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2</gro up><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> +</org.apache.taverna.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross /></strategy></iteration></iterationStrategyStack></processor></processors><conditions><condition control="generate_list" target="constant" /></conditions><datalinks><datalink><sink type="processor"><processor>generate_list</processor><port>prefix</port></sink><source type="processor"><processor>generate_list_prefix_defaultValue</processor><port>value</port></source></datalink><datalink><sink type="processor"><processor>merge</processor><port>in1</port></sink><source type="processor"><processor>constant</processor><port>value</port> </source></datalink><datalink><sink type="merge"><processor>merge</processor><port>in2</port></sink><source type="processor"><processor>generate_list</processor><port>list</port></source></datalink><datalink><sink type="merge"><processor>merge</processor><port>in2</port></sink><source type="processor"><processor>generate_list</processor><port>list</port></source></datalink><datalink><sink type="dataflow"><port>concat</port></sink><source type="processor"><processor>merge</processor><port>out</port></source></datalink><datalink><sink type="dataflow"><port>list</port></sink><source type="processor"><processor>generate_list</processor><port>list</port></source></datalink><datalink><sink type="dataflow"><port>constant</port></sink><source type="processor"><processor>constant</processor><port>value</port></source></datalink></datalinks></dataflow><dataflow id="79ad4092-abcb-42bf-ac98-d66dfac67dff" role="nested"><name>Untitled workflow #24</name><inputPorts><port><name>in1</name><depth>0< /depth><granularDepth>0</granularDepth></port><port><name>in2</name><depth>0</depth><granularDepth>0</granularDepth></port></inputPorts><outputPorts><port><name>out</name></port></outputPorts><processors><processor><name>Nested_Workflow</name><inputPorts><port><name>in2</name><depth>0</depth></port><port><name>in1</name><depth>0</depth></port></inputPorts><outputPorts><port><name>out</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2</group><artifact>dataflow-activity</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.activities.dataflow.DataflowActivity</class><inputMap><map from="in2" to="in2" /><map from="in1" to="in1" /></inputMap><outputMap><map from="out" to="out" /></outputMap><configBean encoding="dataflow"><dataflow ref="ebd93027-c046-4a04-befa-c5715e8ba3da" /></configBean></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2</ group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><org.apache.taverna.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryCo nfig xmlns=""> +</org.apache.taverna.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><org.apache.taverna.workflowmodel.processor.dispatch.layers.Re tryConfig xmlns=""> <backoffFactor>1.0</backoffFactor> <initialDelay>0</initialDelay> <maxDelay>0</maxDelay> <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="in1" depth="0" /><port name="in2" depth="0" /></cross></strategy></iteration></iterationStrategyStack></processor></processors><conditions /><datalinks><datalink><sink type="processor"><processor>Nested_Workflow</processor><port>in2</port></sink><source type="dataflow"><port>in2</port></source></datalink><datalink><sink type="processor"><processor>Nested_Workflow</processor><port>in1</port></sink><source type="dataflow"><port>in1</port></source></datalink><datalink><sink type="dataflow"><port>out</port></sink><source type= "processor"><processor>Nested_Workflow</processor><port>out</port></source></datalink></datalinks></dataflow><dataflow id="ebd93027-c046-4a04-befa-c5715e8ba3da" role="nested"><name>Untitled workflow #36</name><inputPorts><port><name>in1</name><depth>0</depth><granularDepth>0</granularDepth></port><port><name>in2</name><depth>0</depth><granularDepth>0</granularDepth></port></inputPorts><outputPorts><port><name>out</name></port></outputPorts><processors><processor><name>concat</name><inputPorts><port><name>in1</name><depth>0</depth></port><port><name>in2</name><depth>0</depth></port></inputPorts><outputPorts><port><name>out</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2</group><artifact>beanshell-activity</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.activities.beanshell.BeanshellActivity</class><inputMap><map from="in2" to="in2" /><map from="in1" to="in1" /></i nputMap><outputMap><map from="out" to="out" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean xmlns=""> +</org.apache.taverna.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="in1" depth="0" /><port name="in2" depth="0" /></cross></strategy></iteration></iterationStrategyStack></processor></processors><conditions /><datalinks><datalink><sink type="processor"><processor>Nested_Workflow</processor><port>in2</port></sink><source type="dataflow"><port>in2</port></source></datalink><datalink><sink type="processor"><processor>Nested_Workflow</processor><port>in1</port></sink><source type="dataflow"><port>in1</port></source></datalink><datalink><sink type="dataflow"><port>out</port></sink><source typ e="processor"><processor>Nested_Workflow</processor><port>out</port></source></datalink></datalinks></dataflow><dataflow id="ebd93027-c046-4a04-befa-c5715e8ba3da" role="nested"><name>Untitled workflow #36</name><inputPorts><port><name>in1</name><depth>0</depth><granularDepth>0</granularDepth></port><port><name>in2</name><depth>0</depth><granularDepth>0</granularDepth></port></inputPorts><outputPorts><port><name>out</name></port></outputPorts><processors><processor><name>concat</name><inputPorts><port><name>in1</name><depth>0</depth></port><port><name>in2</name><depth>0</depth></port></inputPorts><outputPorts><port><name>out</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2</group><artifact>beanshell-activity</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.activities.beanshell.BeanshellActivity</class><inputMap><map from="in2" to="in2" /><map from="in1" to="in1" /> </inputMap><outputMap><map from="out" to="out" /></outputMap><configBean encoding="xstream"><org.apache.taverna.activities.beanshell.BeanshellActivityConfigurationBean xmlns=""> <script>Thread.sleep(200); out = in1 + in2;</script> <dependencies /> <inputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> + <org.apache.taverna.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> <handledReferenceSchemes /> <translatedElementType>java.lang.String</translatedElementType> <allowsLiteralValues>true</allowsLiteralValues> @@ -79,8 +79,8 @@ out = in1 + in2;</script> <mimeTypes> <string>'text/plain'</string> </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> + </org.apache.taverna.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> + <org.apache.taverna.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> <handledReferenceSchemes /> <translatedElementType>java.lang.String</translatedElementType> <allowsLiteralValues>true</allowsLiteralValues> @@ -89,23 +89,23 @@ out = in1 + in2;</script> <mimeTypes> <string>'text/plain'</string> </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> + </org.apache.taverna.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> </inputs> <outputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> + <org.apache.taverna.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> <granularDepth>0</granularDepth> <name>out</name> <depth>0</depth> <mimeTypes> <string>'text/plain'</string> </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> + </org.apache.taverna.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> </outputs> -</net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean></configBean></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> +</org.apache.taverna.activities.beanshell.BeanshellActivityConfigurationBean></configBean></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><org.apache.taverna.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryCo nfig xmlns=""> +</org.apache.taverna.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><org.apache.taverna.workflowmodel.processor.dispatch.layers.Re tryConfig xmlns=""> <backoffFactor>1.0</backoffFactor> <initialDelay>0</initialDelay> <maxDelay>0</maxDelay> <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="in1" depth="0" /><port name="in2" depth="0" /></cross></strategy></iteration></iterationStrategyStack></processor></processors><conditions /><datalinks><datalink><sink type="processor"><processor>concat</processor><port>in1</port></sink><source type="dataflow"><port>in1</port></source></datalink><datalink><sink type="processor"><processor>concat</processor><port>in2</port></sink><source type="dataflow"><port>in2</port></source></datalink><datalink><sink type="dataflow"><port>out</port></sink><source type="processor"><proce ssor>concat</processor><port>out</port></source></datalink></datalinks></dataflow></workflow> \ No newline at end of file +</org.apache.taverna.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="in1" depth="0" /><port name="in2" depth="0" /></cross></strategy></iteration></iterationStrategyStack></processor></processors><conditions /><datalinks><datalink><sink type="processor"><processor>concat</processor><port>in1</port></sink><source type="dataflow"><port>in1</port></source></datalink><datalink><sink type="processor"><processor>concat</processor><port>in2</port></sink><source type="dataflow"><port>in2</port></source></datalink><datalink><sink type="dataflow"><port>out</port></sink><source type="processor"><pro cessor>concat</processor><port>out</port></source></datalink></datalinks></dataflow></workflow> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-httpproxy-config/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-httpproxy-config/pom.xml b/taverna-httpproxy-config/pom.xml index 25e0eda..895b6b2 100644 --- a/taverna-httpproxy-config/pom.xml +++ b/taverna-httpproxy-config/pom.xml @@ -28,13 +28,14 @@ <name>Apache Taverna HTTP Proxy configuration</name> <dependencies> <dependency> - <groupId>${project.parent.groupId}</groupId> - <artifactId>taverna-ui</artifactId> - <version>${project.parent.version}</version> + <groupId>org.apache.taverna.osgi</groupId> + <artifactId>taverna-configuration-api</artifactId> + <version>${taverna.osgi.version}</version> </dependency> + <dependency> - <groupId>org.apache.taverna.osgi</groupId> - <artifactId>taverna-osgi-api</artifactId> + <groupId>${project.parent.groupId}</groupId> + <artifactId>taverna-ui</artifactId> <version>${project.parent.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-httpproxy-config/src/main/java/org/apache/taverna/workbench/httpproxy/config/HttpProxyConfigurationPanel.java ---------------------------------------------------------------------- diff --git a/taverna-httpproxy-config/src/main/java/org/apache/taverna/workbench/httpproxy/config/HttpProxyConfigurationPanel.java b/taverna-httpproxy-config/src/main/java/org/apache/taverna/workbench/httpproxy/config/HttpProxyConfigurationPanel.java index 4c57cb2..1d32108 100644 --- a/taverna-httpproxy-config/src/main/java/org/apache/taverna/workbench/httpproxy/config/HttpProxyConfigurationPanel.java +++ b/taverna-httpproxy-config/src/main/java/org/apache/taverna/workbench/httpproxy/config/HttpProxyConfigurationPanel.java @@ -62,7 +62,7 @@ import javax.swing.JTextField; import javax.swing.border.EmptyBorder; import org.apache.taverna.lang.ui.DialogTextArea; -import org..taverna.configuration.proxy.HttpProxyConfiguration; +import uk.org.taverna.configuration.proxy.HttpProxyConfiguration; /** * The HttpProxyConfigurationPanel provides the user interface to a http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-httpproxy-config/src/main/java/org/apache/taverna/workbench/httpproxy/config/HttpProxyConfigurationUIFactory.java ---------------------------------------------------------------------- diff --git a/taverna-httpproxy-config/src/main/java/org/apache/taverna/workbench/httpproxy/config/HttpProxyConfigurationUIFactory.java b/taverna-httpproxy-config/src/main/java/org/apache/taverna/workbench/httpproxy/config/HttpProxyConfigurationUIFactory.java index dabe6a8..71a0133 100644 --- a/taverna-httpproxy-config/src/main/java/org/apache/taverna/workbench/httpproxy/config/HttpProxyConfigurationUIFactory.java +++ b/taverna-httpproxy-config/src/main/java/org/apache/taverna/workbench/httpproxy/config/HttpProxyConfigurationUIFactory.java @@ -22,7 +22,7 @@ package org.apache.taverna.workbench.httpproxy.config; import javax.swing.JPanel; -import org.apache.taverna.configuration.Configurable; +import uk.org.taverna.configuration.Configurable; import uk.org.taverna.configuration.ConfigurationUIFactory; import uk.org.taverna.configuration.proxy.HttpProxyConfiguration; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-loop-ui/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-loop-ui/pom.xml b/taverna-loop-ui/pom.xml index bbe1af8..97be01c 100644 --- a/taverna-loop-ui/pom.xml +++ b/taverna-loop-ui/pom.xml @@ -27,7 +27,12 @@ <packaging>bundle</packaging> <name>Apache Taverna Loop layer contextual view</name> <dependencies> - + <dependency> + <groupId>org.apache.taverna.engine</groupId> + <artifactId>taverna-workflowmodel-extensions</artifactId> + <version>${taverna.engine.version}</version> + </dependency> + <dependency> <groupId>org.apache.taverna.osgi</groupId> <artifactId>taverna-app-configuration-api</artifactId> @@ -103,6 +108,5 @@ <version>${project.parent.version}</version> <scope>test</scope> </dependency> - </dependencies> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigurationPanel.java ---------------------------------------------------------------------- diff --git a/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigurationPanel.java b/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigurationPanel.java index f9d768a..28fd47e 100644 --- a/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigurationPanel.java +++ b/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigurationPanel.java @@ -30,9 +30,7 @@ import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import java.util.Properties; import javax.swing.AbstractAction; import javax.swing.Box; @@ -46,7 +44,6 @@ import javax.swing.JTextField; import javax.swing.SwingConstants; import javax.swing.border.EmptyBorder; -import net.sf.taverna.t2.activities.beanshell.views.BeanshellConfigurationPanel; import org.apache.taverna.workbench.helper.HelpEnabledDialog; import org.apache.taverna.workbench.loop.comparisons.Comparison; import org.apache.taverna.workbench.ui.Utils; @@ -61,6 +58,7 @@ import org.apache.taverna.scufl2.api.core.Processor; import org.apache.taverna.scufl2.api.profiles.Profile; import com.fasterxml.jackson.databind.node.ObjectNode; +import net.sf.taverna.t2.activities.beanshell.views.BeanshellConfigurationPanel; /** * UI for {@link LoopConfiguration} http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigureAction.java ---------------------------------------------------------------------- diff --git a/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigureAction.java b/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigureAction.java index 05b8a43..d324c95 100644 --- a/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigureAction.java +++ b/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigureAction.java @@ -30,6 +30,8 @@ import org.apache.taverna.scufl2.api.profiles.Profile; import org.apache.taverna.workbench.edits.EditManager; import org.apache.taverna.workbench.file.FileManager; import org.apache.taverna.workbench.helper.HelpEnabledDialog; +import org.apache.taverna.workflowmodel.Edit; +import org.apache.taverna.workflowmodel.processor.dispatch.layers.LoopConfiguration; /** * @author Alan R Williams http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigureMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigureMenuAction.java b/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigureMenuAction.java index 061c225..dafb348 100644 --- a/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigureMenuAction.java +++ b/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigureMenuAction.java @@ -33,6 +33,7 @@ import org.apache.taverna.scufl2.api.core.Processor; import org.apache.taverna.ui.menu.AbstractContextualMenuAction; import org.apache.taverna.workbench.edits.EditManager; import org.apache.taverna.workbench.file.FileManager; +import org.apache.taverna.workflowmodel.processor.dispatch.DispatchLayer; public class LoopConfigureMenuAction extends AbstractContextualMenuAction { http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopRemoveMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopRemoveMenuAction.java b/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopRemoveMenuAction.java index 0d8fb3c..f68ba05 100644 --- a/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopRemoveMenuAction.java +++ b/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopRemoveMenuAction.java @@ -33,6 +33,7 @@ import org.apache.taverna.workbench.file.FileManager; import org.apache.log4j.Logger; import org.apache.taverna.scufl2.api.core.Processor; +import org.apache.taverna.workflowmodel.processor.dispatch.layers.Loop; public class LoopRemoveMenuAction extends AbstractContextualMenuAction { http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-loop-ui/src/test/java/org/apache/taverna/workbench/loop/ShowContextualView.java ---------------------------------------------------------------------- diff --git a/taverna-loop-ui/src/test/java/org/apache/taverna/workbench/loop/ShowContextualView.java b/taverna-loop-ui/src/test/java/org/apache/taverna/workbench/loop/ShowContextualView.java index 2fe8351..7d2da10 100644 --- a/taverna-loop-ui/src/test/java/org/apache/taverna/workbench/loop/ShowContextualView.java +++ b/taverna-loop-ui/src/test/java/org/apache/taverna/workbench/loop/ShowContextualView.java @@ -38,7 +38,7 @@ import org.apache.taverna.scufl2.api.core.Processor; import org.apache.taverna.workbench.edits.EditManager; import org.apache.taverna.workbench.edits.impl.EditManagerImpl; import org.apache.taverna.workbench.file.FileManager; -import net.sf.taverna.t2.workbench.file.impl.FileManagerImpl; +import org.apache.taverna.workbench.file.impl.FileManagerImpl; import org.apache.taverna.workbench.selection.SelectionManager; import org.apache.taverna.workbench.selection.impl.SelectionManagerImpl; import org.apache.taverna.workbench.ui.views.contextualviews.impl.ContextualViewComponent; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-menu-items/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-menu-items/pom.xml b/taverna-menu-items/pom.xml index 2ff102f..81a550a 100644 --- a/taverna-menu-items/pom.xml +++ b/taverna-menu-items/pom.xml @@ -27,12 +27,13 @@ <packaging>bundle</packaging> <name>Apache Taverna menu items</name> <dependencies> +<!-- <dependency> <groupId>org.apache.taverna.osgi</groupId> <artifactId>taverna-services-api</artifactId> <version>${taverna.osgi.version}</version> </dependency> - +--> <dependency> <groupId>${project.parent.groupId}</groupId> <artifactId>taverna-contextual-views-impl</artifactId> @@ -83,12 +84,17 @@ <artifactId>stringconstant-activity-ui</artifactId> <version>${project.parent.version}</version> </dependency> - <!-- TODO remove dependencies on implementations --> - <dependency> - <groupId>${project.parent.groupId}</groupId> - <artifactId>taverna-contextual-views-impl</artifactId> - <version>${project.parent.version}</version> - </dependency> - + <dependency> + <groupId>org.apache.taverna.workbench</groupId> + <artifactId>taverna-stringconstant-activity-ui</artifactId> + <version>3.1.0-incubating-SNAPSHOT</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.apache.taverna.workbench</groupId> + <artifactId>taverna-contextual-views-impl</artifactId> + <version>3.1.0-incubating-SNAPSHOT</version> + <type>jar</type> + </dependency> </dependencies> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/activityport/AddInputPortDefaultValueAction.java ---------------------------------------------------------------------- diff --git a/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/activityport/AddInputPortDefaultValueAction.java b/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/activityport/AddInputPortDefaultValueAction.java index 8c4e6f5..74dfefb 100644 --- a/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/activityport/AddInputPortDefaultValueAction.java +++ b/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/activityport/AddInputPortDefaultValueAction.java @@ -28,7 +28,7 @@ import java.util.List; import javax.swing.JOptionPane; -import net.sf.taverna.t2.activities.stringconstant.views.StringConstantConfigView; +import org.apache.taverna.activities.stringconstant.views.StringConstantConfigView; import org.apache.taverna.workbench.design.actions.DataflowEditAction; import org.apache.taverna.workbench.edits.CompoundEdit; import org.apache.taverna.workbench.edits.Edit; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-monitor-view/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-monitor-view/pom.xml b/taverna-monitor-view/pom.xml index 739306e..74a1b82 100644 --- a/taverna-monitor-view/pom.xml +++ b/taverna-monitor-view/pom.xml @@ -28,6 +28,12 @@ <name>Apache Taverna Monitor View</name> <dependencies> <dependency> + <groupId>org.apache.taverna.engine</groupId> + <artifactId>taverna-run-api</artifactId> + <version>${taverna.engine.version}</version> + </dependency> + + <dependency> <groupId>${project.parent.groupId}</groupId> <artifactId>taverna-workbench-api</artifactId> <version>${project.parent.version}</version> @@ -63,12 +69,6 @@ <version>${taverna.engine.version}</version> </dependency> <dependency> - <groupId>org.apache.taverna.engine</groupId> - <artifactId>taverna-run-api</artifactId> - <version>${taverna.engine.version}</version> - </dependency> - - <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> <version>${commons.beanutils.version}</version> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-monitor-view/src/main/java/org/apache/taverna/workbench/views/monitor/graph/MonitorGraphComponent.java ---------------------------------------------------------------------- diff --git a/taverna-monitor-view/src/main/java/org/apache/taverna/workbench/views/monitor/graph/MonitorGraphComponent.java b/taverna-monitor-view/src/main/java/org/apache/taverna/workbench/views/monitor/graph/MonitorGraphComponent.java index 87cab4e..37a1bc6 100644 --- a/taverna-monitor-view/src/main/java/org/apache/taverna/workbench/views/monitor/graph/MonitorGraphComponent.java +++ b/taverna-monitor-view/src/main/java/org/apache/taverna/workbench/views/monitor/graph/MonitorGraphComponent.java @@ -52,10 +52,10 @@ import org.apache.taverna.workbench.models.graph.svg.SVGGraphController; import org.apache.taverna.workbench.selection.DataflowSelectionModel; import org.apache.taverna.workbench.selection.SelectionManager; import org.apache.taverna.workbench.ui.Updatable; -import net.sf.taverna.t2.workbench.views.graph.AutoScrollInteractor; -import net.sf.taverna.t2.workbench.views.graph.menu.ResetDiagramAction; -import net.sf.taverna.t2.workbench.views.graph.menu.ZoomInAction; -import net.sf.taverna.t2.workbench.views.graph.menu.ZoomOutAction; +import org.apache.taverna.workbench.views.graph.AutoScrollInteractor; +import org.apache.taverna.workbench.views.graph.menu.ResetDiagramAction; +import org.apache.taverna.workbench.views.graph.menu.ZoomInAction; +import org.apache.taverna.workbench.views.graph.menu.ZoomOutAction; import org.apache.batik.swing.JSVGCanvas; import org.apache.batik.swing.JSVGScrollPane; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-monitor-view/src/main/java/org/apache/taverna/workbench/views/monitor/progressreport/WorkflowRunProgressTreeTable.java ---------------------------------------------------------------------- diff --git a/taverna-monitor-view/src/main/java/org/apache/taverna/workbench/views/monitor/progressreport/WorkflowRunProgressTreeTable.java b/taverna-monitor-view/src/main/java/org/apache/taverna/workbench/views/monitor/progressreport/WorkflowRunProgressTreeTable.java index 0836b23..9d1b564 100644 --- a/taverna-monitor-view/src/main/java/org/apache/taverna/workbench/views/monitor/progressreport/WorkflowRunProgressTreeTable.java +++ b/taverna-monitor-view/src/main/java/org/apache/taverna/workbench/views/monitor/progressreport/WorkflowRunProgressTreeTable.java @@ -9,7 +9,7 @@ import javax.swing.tree.TreePath; import org.apache.taverna.lang.observer.Observable; import org.apache.taverna.lang.observer.SwingAwareObserver; -import net.sf.taverna.lang.ui.treetable.JTreeTable; +import org.apache.taverna.lang.ui.treetable.JTreeTable; import org.apache.taverna.workbench.activityicons.ActivityIconManager; import org.apache.taverna.workbench.selection.DataflowSelectionModel; import org.apache.taverna.workbench.selection.events.DataflowSelectionMessage; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-perspective-design/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-perspective-design/pom.xml b/taverna-perspective-design/pom.xml index e3f59b2..22c3887 100644 --- a/taverna-perspective-design/pom.xml +++ b/taverna-perspective-design/pom.xml @@ -64,11 +64,6 @@ </dependency> <dependency> <groupId>${project.parent.groupId}</groupId> - <artifactId>taverna-graph-view</artifactId> - <version>${project.parent.version}</version> - </dependency> - <dependency> - <groupId>${project.parent.groupId}</groupId> <artifactId>taverna-workflow-explorer</artifactId> <version>${project.parent.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/MainComponent.java ---------------------------------------------------------------------- diff --git a/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/MainComponent.java b/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/MainComponent.java index 50d88cd..41acdbc 100644 --- a/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/MainComponent.java +++ b/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/MainComponent.java @@ -40,7 +40,7 @@ import javax.swing.text.html.HTMLEditorKit; import javax.swing.text.html.StyleSheet; import org.apache.taverna.lang.ui.ShadedLabel; -import net.sf.taverna.t2.ui.perspectives.PerspectiveRegistry; +import org.apache.taverna.ui.perspectives.PerspectiveRegistry; import org.apache.taverna.ui.perspectives.myexperiment.model.MyExperimentClient; import org.apache.taverna.ui.perspectives.myexperiment.model.Resource; import org.apache.taverna.ui.perspectives.myexperiment.model.Util; @@ -54,7 +54,7 @@ import org.apache.taverna.workbench.icons.WorkbenchIcons; import org.apache.taverna.workbench.ui.zaria.PerspectiveSPI; import org.apache.taverna.workbench.ui.zaria.UIComponentSPI; import org.apache.taverna.workflowmodel.Dataflow; -import net.sf.taverna.t2.workflowmodel.serialization.xml.impl.XMLSerializationConstants; +import org.apache.taverna.workflowmodel.serialization.xml.impl.XMLSerializationConstants; import org.apache.log4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/MainComponentShutdownHook.java ---------------------------------------------------------------------- diff --git a/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/MainComponentShutdownHook.java b/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/MainComponentShutdownHook.java index 77a6ca0..83a4431 100644 --- a/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/MainComponentShutdownHook.java +++ b/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/MainComponentShutdownHook.java @@ -20,7 +20,7 @@ ******************************************************************************/ package org.apache.taverna.ui.perspectives.myexperiment; -import net.sf.taverna.t2.ui.perspectives.PerspectiveRegistry; +import org.apache.taverna.ui.perspectives.PerspectiveRegistry; import org.apache.taverna.ui.perspectives.myexperiment.model.MyExperimentClient; import org.apache.taverna.workbench.ShutdownSPI; import org.apache.taverna.workbench.ui.zaria.PerspectiveSPI; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/Base64$InputStream.class ---------------------------------------------------------------------- diff --git a/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/Base64$InputStream.class b/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/Base64$InputStream.class deleted file mode 100644 index a1a5f82..0000000 Binary files a/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/Base64$InputStream.class and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/Base64$OutputStream.class ---------------------------------------------------------------------- diff --git a/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/Base64$OutputStream.class b/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/Base64$OutputStream.class deleted file mode 100644 index e754656..0000000 Binary files a/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/Base64$OutputStream.class and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/Base64.class ---------------------------------------------------------------------- diff --git a/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/Base64.class b/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/Base64.class deleted file mode 100644 index 84fcee9..0000000 Binary files a/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/Base64.class and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/Base64.java ---------------------------------------------------------------------- diff --git a/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/Base64.java b/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/Base64.java index 3afcdae..729eed2 100644 --- a/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/Base64.java +++ b/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/Base64.java @@ -1,6 +1,6 @@ package org.apache.taverna.ui.perspectives.myexperiment.model; -import net.sf.taverna.t2.activities.dataflow.views.DataflowActivityConfigView; +//import org.apache.taverna.activities.dataflow.views.DataflowActivityConfigView; import org.apache.log4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/MyExperimentClient.class ---------------------------------------------------------------------- diff --git a/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/MyExperimentClient.class b/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/MyExperimentClient.class deleted file mode 100644 index 0f243ee..0000000 Binary files a/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/model/MyExperimentClient.class and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/ResultsPerspectiveComponent.java ---------------------------------------------------------------------- diff --git a/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/ResultsPerspectiveComponent.java b/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/ResultsPerspectiveComponent.java index 049b8d2..c55ee61 100644 --- a/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/ResultsPerspectiveComponent.java +++ b/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/ResultsPerspectiveComponent.java @@ -50,10 +50,10 @@ import org.apache.taverna.workbench.selection.events.SelectionManagerEvent; import org.apache.taverna.workbench.selection.events.WorkflowRunSelectionEvent; import org.apache.taverna.workbench.ui.Updatable; import net.sf.taverna.t2.workbench.views.monitor.graph.MonitorGraphComponent; -import net.sf.taverna.t2.workbench.views.monitor.progressreport.TableMonitorComponent; -import net.sf.taverna.t2.workbench.views.results.ResultsComponent; -import net.sf.taverna.t2.workbench.views.results.saveactions.SaveAllResultsSPI; -import net.sf.taverna.t2.workbench.views.results.saveactions.SaveIndividualResultSPI; +import org.apache.taverna.workbench.views.monitor.progressreport.TableMonitorComponent; +import org.apache.taverna.workbench.views.results.ResultsComponent; +import org.apache.taverna.workbench.views.results.saveactions.SaveAllResultsSPI; +import org.apache.taverna.workbench.views.results.saveactions.SaveIndividualResultSPI; import org.apache.log4j.Logger; import org.osgi.service.event.Event; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-renderers-exts/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-renderers-exts/pom.xml b/taverna-renderers-exts/pom.xml index d0d07ac..88fe060 100644 --- a/taverna-renderers-exts/pom.xml +++ b/taverna-renderers-exts/pom.xml @@ -31,16 +31,21 @@ <artifactId>taverna-renderers-api</artifactId> <version>${project.parent.version}</version> </dependency> +<!-- <dependency> <groupId>${project.parent.groupId}</groupId> <artifactId>taverna-workbench-impl</artifactId> <version>${project.parent.version}</version> </dependency> +--> +<!-- <dependency> <groupId>org.apache.taverna.language</groupId> <artifactId>databundle</artifactId> <version>${taverna.language.version}</version> </dependency> +--> + <!-- <dependency> <groupId>uk.org.mygrid.resources</groupId> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-renderers-exts/src/main/java/org/apache/taverna/renderers/PDFRenderer.java ---------------------------------------------------------------------- diff --git a/taverna-renderers-exts/src/main/java/org/apache/taverna/renderers/PDFRenderer.java b/taverna-renderers-exts/src/main/java/org/apache/taverna/renderers/PDFRenderer.java index 7e788ea..f89a9de 100644 --- a/taverna-renderers-exts/src/main/java/org/apache/taverna/renderers/PDFRenderer.java +++ b/taverna-renderers-exts/src/main/java/org/apache/taverna/renderers/PDFRenderer.java @@ -21,9 +21,6 @@ package org.apache.taverna.renderers; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 ******************************************************************************/ -import org.apache.taverna.renderers.Renderer; -import org.apache.taverna.renderers.RendererUtils; -import org.apache.taverna.renderers.RendererException; import java.io.InputStream; import java.nio.file.Path; import java.util.regex.Pattern; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-renderers-exts/src/main/java/org/apache/taverna/renderers/SeqVistaRenderer.java ---------------------------------------------------------------------- diff --git a/taverna-renderers-exts/src/main/java/org/apache/taverna/renderers/SeqVistaRenderer.java b/taverna-renderers-exts/src/main/java/org/apache/taverna/renderers/SeqVistaRenderer.java index b94b247..9927a11 100644 --- a/taverna-renderers-exts/src/main/java/org/apache/taverna/renderers/SeqVistaRenderer.java +++ b/taverna-renderers-exts/src/main/java/org/apache/taverna/renderers/SeqVistaRenderer.java @@ -20,9 +20,6 @@ ******************************************************************************/ package org.apache.taverna.renderers; -import org.apache.taverna.renderers.Renderer; -import org.apache.taverna.renderers.RendererUtils; -import org.apache.taverna.renderers.RendererException; import java.nio.file.Path; import javax.swing.JComponent; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-report-explainer/src/main/java/org/apache/taverna/workbench/report/explainer/BasicExplainer.java ---------------------------------------------------------------------- diff --git a/taverna-report-explainer/src/main/java/org/apache/taverna/workbench/report/explainer/BasicExplainer.java b/taverna-report-explainer/src/main/java/org/apache/taverna/workbench/report/explainer/BasicExplainer.java index a3519bf..242c4f6 100644 --- a/taverna-report-explainer/src/main/java/org/apache/taverna/workbench/report/explainer/BasicExplainer.java +++ b/taverna-report-explainer/src/main/java/org/apache/taverna/workbench/report/explainer/BasicExplainer.java @@ -42,23 +42,23 @@ import javax.swing.JPanel; import org.apache.taverna.activities.dataflow.DataflowActivity; import org.apache.taverna.activities.dataflow.actions.EditNestedDataflowAction; import org.apache.taverna.activities.disabled.actions.DisabledActivityConfigurationAction; -import net.sf.taverna.t2.activities.wsdl.InputPortTypeDescriptorActivity; -import net.sf.taverna.t2.activities.wsdl.xmlsplitter.AddXMLSplitterEdit; +import org.apache.taverna.activities.wsdl.InputPortTypeDescriptorActivity; +import org.apache.taverna.activities.wsdl.xmlsplitter.AddXMLSplitterEdit; import org.apache.taverna.lang.ui.ReadOnlyTextArea; import org.apache.taverna.visit.DataflowCollation; import org.apache.taverna.visit.VisitKind; import org.apache.taverna.visit.VisitReport; -import org.sf.taverna.t2.visit.fragility.FragilityCheck; +import org.apache.taverna.visit.fragility.FragilityCheck; import org.apache.taverna.workbench.activityicons.ActivityIconManager; import org.apache.taverna.workbench.design.actions.AddDataflowOutputAction; import org.apache.taverna.workbench.edits.EditManager; import org.apache.taverna.workbench.file.FileManager; -import net.sf.taverna.t2.workbench.report.FailedEntityKind; -import net.sf.taverna.t2.workbench.report.IncompleteDataflowKind; -import net.sf.taverna.t2.workbench.report.InvalidDataflowKind; +import org.apache.taverna.workbench.report.FailedEntityKind; +import org.apache.taverna.workbench.report.IncompleteDataflowKind; +import org.apache.taverna.workbench.report.InvalidDataflowKind; import org.apache.taverna.workbench.report.ReportManager; -import net.sf.taverna.t2.workbench.report.UnresolvedOutputKind; -import net.sf.taverna.t2.workbench.report.UnsatisfiedEntityKind; +import org.apache.taverna.workbench.report.UnresolvedOutputKind; +import org.apache.taverna.workbench.report.UnsatisfiedEntityKind; import org.apache.taverna.workbench.report.view.ReportViewConfigureAction; import org.apache.taverna.workbench.retry.RetryConfigureAction; import org.apache.taverna.workbench.selection.SelectionManager; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-report-impl/src/main/java/org/apache/taverna/workbench/report/impl/ReportManagerImpl.java ---------------------------------------------------------------------- diff --git a/taverna-report-impl/src/main/java/org/apache/taverna/workbench/report/impl/ReportManagerImpl.java b/taverna-report-impl/src/main/java/org/apache/taverna/workbench/report/impl/ReportManagerImpl.java index fbea4b6..d0a6649 100644 --- a/taverna-report-impl/src/main/java/org/apache/taverna/workbench/report/impl/ReportManagerImpl.java +++ b/taverna-report-impl/src/main/java/org/apache/taverna/workbench/report/impl/ReportManagerImpl.java @@ -27,14 +27,14 @@ import org.apache.taverna.workbench.file.FileManager; import org.apache.taverna.workbench.file.events.ClosedDataflowEvent; import org.apache.taverna.workbench.file.events.FileManagerEvent; import org.apache.taverna.workbench.file.events.SetCurrentDataflowEvent; -import net.sf.taverna.t2.workbench.report.DataflowReportEvent; -import net.sf.taverna.t2.workbench.report.FailedEntityKind; -import net.sf.taverna.t2.workbench.report.IncompleteDataflowKind; -import net.sf.taverna.t2.workbench.report.InvalidDataflowKind; +import org.apache.taverna.workbench.report.DataflowReportEvent; +import org.apache.taverna.workbench.report.FailedEntityKind; +import org.apache.taverna.workbench.report.IncompleteDataflowKind; +import org.apache.taverna.workbench.report.InvalidDataflowKind; import org.apache.taverna.workbench.report.ReportManager; import org.apache.taverna.workbench.report.ReportManagerEvent; -import net.sf.taverna.t2.workbench.report.UnresolvedOutputKind; -import net.sf.taverna.t2.workbench.report.UnsatisfiedEntityKind; +import org.apache.taverna.workbench.report.UnresolvedOutputKind; +import org.apache.taverna.workbench.report.UnsatisfiedEntityKind; import org.apache.taverna.workbench.report.config.ReportManagerConfiguration; import org.apache.taverna.workflowmodel.Dataflow; import org.apache.taverna.workflowmodel.DataflowValidationReport; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-workbench-impl/src/main/java/org/apache/taverna/workbench/ui/impl/WorkbenchImpl.java ---------------------------------------------------------------------- diff --git a/taverna-workbench-impl/src/main/java/org/apache/taverna/workbench/ui/impl/WorkbenchImpl.java b/taverna-workbench-impl/src/main/java/org/apache/taverna/workbench/ui/impl/WorkbenchImpl.java index 4c5fdaa..48252d1 100644 --- a/taverna-workbench-impl/src/main/java/org/apache/taverna/workbench/ui/impl/WorkbenchImpl.java +++ b/taverna-workbench-impl/src/main/java/org/apache/taverna/workbench/ui/impl/WorkbenchImpl.java @@ -63,18 +63,18 @@ import javax.swing.UIManager; import org.apache.taverna.lang.observer.Observable; import org.apache.taverna.lang.observer.SwingAwareObserver; -import net.sf.taverna.t2.ui.menu.MenuManager; -import net.sf.taverna.t2.ui.menu.MenuManager.MenuManagerEvent; -import net.sf.taverna.t2.ui.menu.MenuManager.UpdatedMenuManagerEvent; +import org.apache.taverna.ui.menu.MenuManager; +import org.apache.taverna.ui.menu.MenuManager.MenuManagerEvent; +import org.apache.taverna.ui.menu.MenuManager.UpdatedMenuManagerEvent; import org.apache.taverna.workbench.ShutdownSPI; import org.apache.taverna.workbench.StartupSPI; -import net.sf.taverna.t2.workbench.configuration.workbench.WorkbenchConfiguration; -import net.sf.taverna.t2.workbench.configuration.workbench.ui.T2ConfigurationFrame; -import net.sf.taverna.t2.workbench.edits.EditManager; -import net.sf.taverna.t2.workbench.file.FileManager; -import net.sf.taverna.t2.workbench.file.exceptions.OpenException; -import net.sf.taverna.t2.workbench.helper.Helper; -import net.sf.taverna.t2.workbench.selection.SelectionManager; +import org.apache.taverna.workbench.configuration.workbench.WorkbenchConfiguration; +import org.apache.taverna.workbench.configuration.workbench.ui.T2ConfigurationFrame; +import org.apache.taverna.workbench.edits.EditManager; +import org.apache.taverna.workbench.file.FileManager; +import org.apache.taverna.workbench.file.exceptions.OpenException; +import org.apache.taverna.workbench.helper.Helper; +import org.apache.taverna.workbench.selection.SelectionManager; import org.apache.taverna.workbench.ui.Workbench; import org.apache.taverna.workbench.ui.zaria.PerspectiveSPI; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-workflow-explorer/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-workflow-explorer/pom.xml b/taverna-workflow-explorer/pom.xml index f6b913f..8f93fba 100644 --- a/taverna-workflow-explorer/pom.xml +++ b/taverna-workflow-explorer/pom.xml @@ -23,10 +23,10 @@ <artifactId>taverna-workbench</artifactId> <version>3.1.0-incubating-SNAPSHOT</version> </parent> - <artifactId>workflow-explorer</artifactId> + <artifactId>taverna-workflow-explorer</artifactId> <packaging>bundle</packaging> - <name>Workflow Explorer</name> - <description>Workflow Explorer</description> + <name>Apache Taverna Workflow Explorer</name> + <description>Apache taverna Workflow Explorer</description> <dependencies> <dependency> <groupId>org.apache.taverna.engine</groupId>
