You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by re...@apache.org on 2015/03/24 19:48:34 UTC
[6/6] incubator-taverna-workbench git commit: not yet there...
not yet there...
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/599e56c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/599e56c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/599e56c6
Branch: refs/heads/master
Commit: 599e56c60393c5303db73c8e429d427f49f0513b
Parents: 6af0f54
Author: Dmitry Repchevsky <re...@list.ru>
Authored: Tue Mar 24 19:46:53 2015 +0100
Committer: Dmitry Repchevsky <re...@list.ru>
Committed: Tue Mar 24 19:46:53 2015 +0100
----------------------------------------------------------------------
pom.xml | 154 ++++++++++---------
.../activityicons/ActivityIconManager.java | 2 +-
.../impl/ActivityIconManagerImpl.java | 2 +-
taverna-activity-palette-api/pom.xml | 8 +
.../AbstractConfigurableServiceProvider.java | 2 +-
.../AbstractTemplateService.java | 2 +-
.../ConfigurableServiceProvider.java | 4 +-
.../CustomizedConfigurePanelProvider.java | 2 +-
.../servicedescriptions/ServiceDescription.java | 8 +-
.../ServiceDescriptionRegistry.java | 2 +-
.../impl/ServiceDescriptionDeserializer.java | 2 +-
.../impl/ServiceDescriptionRegistryImpl.java | 4 +-
taverna-activity-palette-ui/pom.xml | 1 +
.../workbench/ui/servicepanel/ServicePanel.java | 6 +-
.../ServicePanelComponentFactory.java | 2 +-
.../servicepanel/ServiceTreeClickListener.java | 2 +-
.../ui/servicepanel/ServiceTreePanel.java | 2 +-
.../actions/AddServiceProviderAction.java | 6 +-
.../AbstractConfigureActivityMenuAction.java | 10 +-
taverna-beaninfo/pom.xml | 7 +-
.../activity/ActivityConfigurationAction.java | 18 +--
.../activity/ActivityContextualView.java | 6 +-
.../HTMLBasedActivityContextualView.java | 2 +-
taverna-contextual-views-impl/pom.xml | 7 +-
.../annotated/AnnotatedContextualView.java | 6 +-
.../condition/ConditionContextualView.java | 2 +-
.../ConditionContextualViewFactory.java | 2 +-
.../dataflow/DataflowContextualView.java | 6 +-
.../dataflow/DataflowContextualViewFactory.java | 2 +-
.../DataflowInputPortContextualView.java | 2 +-
.../DataflowInputPortContextualViewFactory.java | 2 +-
.../DataflowOutputPortContextualView.java | 2 +-
...DataflowOutputPortContextualViewFactory.java | 2 +-
.../datalink/DatalinkContextualView.java | 2 +-
.../datalink/DatalinkContextualViewFactory.java | 2 +-
.../impl/ContextualViewComponent.java | 8 +-
.../inputport/InputPortContextualView.java | 2 +-
.../InputPortContextualViewFactory.java | 2 +-
.../merge/MergeConfigurationAction.java | 4 +-
.../merge/MergeConfigurationView.java | 2 +-
.../merge/MergeContextualView.java | 6 +-
.../merge/MergeContextualViewFactory.java | 2 +-
.../outputport/OutputPortContextualView.java | 2 +-
.../OutputPortContextualViewFactory.java | 2 +-
taverna-contextual-views/pom.xml | 3 +-
.../ProcessorActivitiesContextualView.java | 8 +-
...rocessorActivitiesContextualViewFactory.java | 8 +-
...rPredictedBehaviorContextualViewFactory.java | 12 +-
.../ChangeMasterPasswordDialog.java | 2 +-
.../ConfirmTrustedCertificateDialog.java | 6 +-
.../ConfirmTrustedCertificateUI.java | 4 +-
.../credentialmanager/CredentialManagerUI.java | 14 +-
.../credentialmanager/KeyPairsTableModel.java | 12 +-
.../NewEditPasswordEntryDialog.java | 4 +-
.../NewKeyPairEntryDialog.java | 4 +-
.../credentialmanager/NewTrustCertsDialog.java | 4 +-
.../credentialmanager/PasswordsTableModel.java | 14 +-
.../TrustedCertsTableModel.java | 12 +-
.../ViewCertDetailsDialog.java | 6 +-
.../WarnUserAboutJCEPolicyDialog.java | 2 +-
.../action/CredentialManagerAction.java | 4 +-
.../menu/CredentialManagerMenu.java | 6 +-
.../AskUserJavaTruststorePasswordProvider.java | 2 +-
.../password/AskUserMasterPasswordProvider.java | 2 +-
...kUserServiceUsernameAndPasswordProvider.java | 4 +-
.../AskUserTrustConfirmationProvider.java | 2 +-
.../password/SimpleMasterPasswordProvider.java | 2 +-
.../password/UIMasterPasswordProvider.java | 6 +-
.../password/UIUsernamePasswordProvider.java | 6 +-
.../startup/InitialiseSSLStartupHook.java | 4 +-
.../SetCredManAuthenticatorStartupHook.java | 2 +-
taverna-data-management-config-ui/pom.xml | 1 +
.../DataManagementConfigurationPanel.java | 4 +-
.../DataManagementConfigurationUIFactory.java | 4 +-
taverna-dataflow-activity-ui/pom.xml | 2 +-
.../actions/EditNestedDataflowAction.java | 11 +-
.../DataflowTemplateService.java | 2 +-
.../views/DataflowActivityContextualView.java | 2 +-
.../views/DataflowActivityViewFactory.java | 2 +-
.../file/importworkflow/DataflowMerger.java | 16 +-
.../actions/ReplaceNestedWorkflowAction.java | 6 +-
.../gui/ImportWorkflowWizard.java | 34 ++--
.../menu/ImportWorkflowMenuAction.java | 2 +-
.../file/importworkflow/AbstractTestHelper.java | 26 ++--
.../file/importworkflow/TestPortMerge.java | 6 +-
.../file/importworkflow/TestRename.java | 2 +-
.../file/importworkflow/TestSimpleMerge.java | 12 +-
.../design/actions/AddConditionAction.java | 10 +-
.../design/actions/AddDataflowInputAction.java | 4 +-
.../design/actions/AddDataflowOutputAction.java | 4 +-
.../design/actions/DataflowEditAction.java | 4 +-
.../actions/EditDataflowInputPortAction.java | 4 +-
.../actions/EditDataflowOutputPortAction.java | 4 +-
.../design/actions/RemoveConditionAction.java | 4 +-
.../actions/RemoveDataflowInputPortAction.java | 6 +-
.../actions/RemoveDataflowOutputPortAction.java | 6 +-
.../design/actions/RemoveDatalinkAction.java | 4 +-
.../design/actions/RemoveProcessorAction.java | 24 +--
.../design/actions/RenameProcessorAction.java | 4 +-
.../views/DisabledActivityViewFactory.java | 2 +-
.../disabled/views/DisabledConfigView.java | 2 +-
.../disabled/views/DisabledContextualView.java | 6 +-
.../t2/workbench/edits/CompoundEdit.java | 2 +-
.../net/sf/taverna/t2/workbench/edits/Edit.java | 2 +-
.../taverna/t2/workbench/edits/EditManager.java | 6 +-
.../taverna/t2/workflow/edits/AbstractEdit.java | 4 +-
.../t2/workflow/edits/AddActivityEdit.java | 6 +-
.../edits/AddActivityInputPortMappingEdit.java | 10 +-
.../edits/AddActivityOutputPortMappingEdit.java | 10 +-
.../taverna/t2/workflow/edits/AddChildEdit.java | 4 +-
.../t2/workflow/edits/AddDataLinkEdit.java | 18 +--
.../edits/AddIterationStrategyEdit.java | 4 +-
.../AddIterationStrategyInputPortEdit.java | 4 +-
.../t2/workflow/edits/AddProcessorEdit.java | 4 +-
.../edits/AddProcessorInputPortEdit.java | 4 +-
.../edits/AddProcessorOutputPortEdit.java | 4 +-
.../edits/AddWorkflowInputPortEdit.java | 24 +--
.../edits/AddWorkflowOutputPortEdit.java | 24 +--
.../t2/workflow/edits/ChangeDepthEdit.java | 24 +--
.../workflow/edits/ChangeGranularDepthEdit.java | 2 +-
.../t2/workflow/edits/ChangeJsonEdit.java | 2 +-
.../edits/ClearIterationStrategyStackEdit.java | 2 +-
.../t2/workflow/edits/ConfigureEdit.java | 4 +-
.../t2/workflow/edits/RemoveActivityEdit.java | 6 +-
.../RemoveActivityInputPortMappingEdit.java | 8 +-
.../RemoveActivityOutputPortMappingEdit.java | 8 +-
.../t2/workflow/edits/RemoveChildEdit.java | 4 +-
.../t2/workflow/edits/RemoveDataLinkEdit.java | 16 +-
.../edits/RemoveProcessorInputPortEdit.java | 4 +-
.../edits/RemoveProcessorOutputPortEdit.java | 4 +-
.../edits/RemoveWorkflowInputPortEdit.java | 24 +--
.../edits/RemoveWorkflowOutputPortEdit.java | 22 +--
.../taverna/t2/workflow/edits/RenameEdit.java | 28 ++--
.../edits/ReorderMergePositionsEdit.java | 4 +-
.../edits/SetIterationStrategyStackEdit.java | 4 +-
.../UpdateDataflowInternalIdentifierEdit.java | 2 +-
taverna-edits-impl/pom.xml | 1 +
.../workbench/edits/impl/EditManagerImpl.java | 6 +-
.../edits/impl/menu/AbstractUndoAction.java | 8 +-
.../edits/impl/menu/RedoMenuAction.java | 2 +-
.../edits/impl/menu/UndoMenuAction.java | 2 +-
.../edits/impl/TestEditManagerImpl.java | 10 +-
taverna-file-api/pom.xml | 5 +-
.../AbstractDataflowPersistenceHandler.java | 2 +-
.../taverna/t2/workbench/file/DataflowInfo.java | 2 +-
.../file/DataflowPersistenceHandler.java | 2 +-
.../taverna/t2/workbench/file/FileManager.java | 6 +-
.../file/events/AbstractDataflowEvent.java | 2 +-
.../file/events/ClosedDataflowEvent.java | 2 +-
.../file/events/ClosingDataflowEvent.java | 2 +-
.../workbench/file/events/FileManagerEvent.java | 2 +-
.../file/events/OpenedDataflowEvent.java | 2 +-
.../file/events/SavedDataflowEvent.java | 2 +-
.../file/events/SetCurrentDataflowEvent.java | 2 +-
.../file/exceptions/UnsavedException.java | 2 +-
.../DataflowFromDataflowPersistenceHandler.java | 4 +-
.../workbench/file/impl/FileDataflowInfo.java | 2 +-
.../t2/workbench/file/impl/FileManagerImpl.java | 14 +-
.../file/impl/OpenDataflowRunnable.java | 2 +-
.../file/impl/OpenDataflowSwingWorker.java | 2 +-
.../workbench/file/impl/T2DataflowOpener.java | 6 +-
.../file/impl/WorkflowBundleOpener.java | 6 +-
.../file/impl/WorkflowBundleSaver.java | 4 +-
.../impl/actions/CloseAllWorkflowsAction.java | 2 +-
.../file/impl/actions/CloseWorkflowAction.java | 2 +-
.../impl/actions/OpenNestedWorkflowAction.java | 2 +-
.../file/impl/actions/OpenWorkflowAction.java | 2 +-
.../impl/actions/OpenWorkflowFromURLAction.java | 2 +-
.../impl/actions/SaveAllWorkflowsAction.java | 6 +-
.../file/impl/actions/SaveWorkflowAction.java | 6 +-
.../file/impl/actions/SaveWorkflowAsAction.java | 8 +-
.../impl/menu/FileOpenRecentMenuAction.java | 6 +-
.../workbench/file/impl/menu/WorkflowsMenu.java | 6 +-
.../t2/workbench/file/impl/FileManagerTest.java | 4 +-
taverna-graph-model/pom.xml | 14 +-
.../models/graph/DefaultGraphEventManager.java | 8 +-
.../models/graph/GraphColorManager.java | 2 +-
.../workbench/models/graph/GraphController.java | 52 +++----
.../t2/workbench/models/graph/GraphElement.java | 2 +-
.../models/graph/svg/SVGGraphController.java | 7 +-
.../models/graph/GraphControllerTest.java | 2 +-
taverna-graph-view/pom.xml | 8 +-
.../views/graph/GraphViewComponent.java | 10 +-
.../views/graph/GraphViewComponentFactory.java | 2 +-
.../views/graph/actions/AddWFInputAction.java | 2 +-
.../views/graph/actions/AddWFOutputAction.java | 2 +-
.../actions/DeleteGraphComponentAction.java | 18 +--
.../RenameWFInputOutputProcessorAction.java | 14 +-
.../views/graph/menu/SaveGraphImageSubMenu.java | 6 +-
taverna-httpproxy-config/pom.xml | 6 +-
.../config/HttpProxyConfigurationPanel.java | 2 +-
.../config/HttpProxyConfigurationUIFactory.java | 2 +-
.../IterationStrategyContextualView.java | 10 +-
.../IterationStrategyContextualViewFactory.java | 2 +-
.../editor/IterationStrategyCellRenderer.java | 6 +-
.../editor/IterationStrategyEditor.java | 8 +-
.../editor/IterationStrategyEditorControl.java | 10 +-
.../editor/IterationStrategyTree.java | 2 +-
.../IterationStrategyConfigureMenuAction.java | 2 +-
.../editor/RunIterationStrategyEditor.java | 4 +-
.../t2/workbench/loop/ActivityGenerator.java | 17 +-
.../t2/workbench/loop/AddLoopFactory.java | 6 +-
.../t2/workbench/loop/LoopAddMenuAction.java | 2 +-
.../workbench/loop/LoopConfigurationPanel.java | 10 +-
.../t2/workbench/loop/LoopConfigureAction.java | 4 +-
.../workbench/loop/LoopConfigureMenuAction.java | 2 +-
.../t2/workbench/loop/LoopContextualView.java | 2 +-
.../loop/LoopContextualViewFactory.java | 2 +-
.../t2/workbench/loop/LoopRemoveMenuAction.java | 2 +-
.../t2/workbench/loop/ShowContextualView.java | 4 +-
taverna-menu-api/pom.xml | 5 +
.../taverna/t2/ui/menu/ContextualSelection.java | 2 +-
.../net/sf/taverna/t2/ui/menu/MenuManager.java | 6 +-
.../t2/ui/menu/impl/MenuManagerImpl.java | 8 +-
.../AbstractConnectPortMenuActions.java | 31 ++--
.../activityport/ActivityInputPortSection.java | 2 +-
.../activityport/ActivityOutputPortSection.java | 2 +-
.../AddInputPortDefaultValueAction.java | 24 +--
.../ConnectInputPortMenuActions.java | 4 +-
.../ConnectOutputPortMenuActions.java | 4 +-
.../items/activityport/ConnectPortsAction.java | 8 +-
.../CreateAndConnectDataflowPortAction.java | 20 +--
.../SetConstantInputPortValueMenuAction.java | 4 +-
.../SetDefaultInputPortValueAction.java | 12 +-
.../annotated/AnnotatedConfigureMenuAction.java | 4 +-
.../items/contextualviews/InsertSection.java | 2 +-
.../items/contextualviews/PasteMenuAction.java | 2 +-
.../ShowConfigureMenuAction.java | 12 +-
.../ShowReportsContextualMenuAction.java | 6 +-
.../items/controllink/ConditionSection.java | 3 +-
.../t2/ui/menu/items/datalink/LinkSection.java | 2 +-
.../items/datalink/RemoveLinkMenuAction.java | 4 +-
.../ConnectDataflowInputPortMenuActions.java | 4 +-
.../ConnectDataflowOutputPortMenuActions.java | 4 +-
.../ports/EditDataflowInputPortMenuAction.java | 4 +-
.../ports/EditDataflowOutputPortMenuAction.java | 4 +-
.../RemoveDataflowInputPortMenuAction.java | 4 +-
.../RemoveDataflowOutputPortMenuAction.java | 4 +-
.../items/ports/WorkflowInputPortSection.java | 2 +-
.../items/ports/WorkflowOutputPortSection.java | 2 +-
.../items/processor/ConditionMenuActions.java | 6 +-
.../menu/items/processor/ProcessorSection.java | 2 +-
.../processor/RemoveProcessorMenuAction.java | 4 +-
.../processor/RenameProcessorMenuAction.java | 4 +-
.../items/workflow/CreateInputMenuAction.java | 2 +-
.../items/workflow/CreateOutputMenuAction.java | 2 +-
.../WorkflowServiceTemplatesSection.java | 2 +-
.../views/monitor/graph/GraphMonitor.java | 8 +-
.../views/monitor/graph/GraphMonitorNode.java | 2 +-
.../monitor/graph/MonitorGraphComponent.java | 12 +-
.../progressreport/TableMonitorComponent.java | 6 +-
.../WorkflowRunProgressTreeCellRenderer.java | 6 +-
.../WorkflowRunProgressTreeTable.java | 14 +-
.../WorkflowRunProgressTreeTableModel.java | 12 +-
taverna-parallelize-ui/pom.xml | 2 +-
.../ParallelizeConfigurationPanel.java | 2 +-
.../parallelize/ParallelizeConfigureAction.java | 8 +-
.../ParallelizeConfigureMenuAction.java | 2 +-
.../parallelize/ParallelizeContextualView.java | 6 +-
.../ParallelizeContextualViewFactory.java | 2 +-
taverna-perspective-biocatalogue/pom.xml | 8 +-
.../design/WorkflowBundleSelectorComponent.java | 6 +-
.../design/WorkflowSelectorComponent.java | 22 +--
.../t2/ui/perspectives/design/WorkflowTab.java | 6 +-
taverna-perspective-myexperiment/pom.xml | 10 ++
.../myexperiment/MainComponent.java | 2 +-
.../myexperiment/UploadWorkflowDialog.java | 2 +-
.../myexperiment/model/MyExperimentClient.java | 14 +-
taverna-perspective-results/pom.xml | 6 +-
.../results/ResultsPerspective.java | 2 +-
.../results/ResultsPerspectiveComponent.java | 8 +-
.../t2/ui/perspectives/results/RunMonitor.java | 10 +-
.../results/RunSelectorComponent.java | 6 +-
.../t2/ui/perspectives/results/RunTab.java | 10 +-
.../results/WorkflowRunListCellRenderer.java | 6 +-
.../results/WorkflowRunListModel.java | 2 +-
taverna-renderers-impl/pom.xml | 6 +-
taverna-report-explainer/pom.xml | 4 +-
.../report/explainer/BasicExplainer.java | 40 ++---
taverna-results-view/pom.xml | 25 +--
.../views/results/InvocationTreeModel.java | 4 +-
.../views/results/InvocationTreeNode.java | 2 +-
.../workbench/views/results/InvocationView.java | 8 +-
.../t2/workbench/views/results/ReportView.java | 8 +-
.../views/results/ResultsComponent.java | 14 +-
.../FilteredProcessorValueTreeModel.java | 2 +-
.../processor/ProcessorResultCellRenderer.java | 2 +-
.../processor/ProcessorResultsComponent.java | 12 +-
.../processor/ProcessorResultsTreeModel.java | 2 +-
.../RenderedProcessorResultComponent.java | 6 +-
.../saveactions/SaveIndividualResult.java | 2 +-
.../results/workflow/DataBundleTreeModel.java | 2 +-
.../workflow/FilteredDataBundleTreeModel.java | 2 +-
.../FilteredWorkflowResultTreeModel.java | 2 +-
.../workflow/PortResultCellRenderer.java | 2 +-
.../results/workflow/PortResultsViewTab.java | 4 +-
.../workflow/RenderedResultComponent.java | 6 +-
.../workflow/WorkflowResultTreeModel.java | 6 +-
.../workflow/WorkflowResultsComponent.java | 12 +-
taverna-retry-ui/pom.xml | 2 +-
taverna-run-ui/pom.xml | 8 +-
taverna-selection-api/pom.xml | 3 +-
.../selection/DataflowSelectionModel.java | 4 +-
.../workbench/selection/SelectionManager.java | 9 +-
.../events/DataflowSelectionMessage.java | 2 +-
.../selection/events/ProfileSelectionEvent.java | 2 +-
.../selection/events/SelectionManagerEvent.java | 2 +-
.../events/WorkflowBundleSelectionEvent.java | 2 +-
.../events/WorkflowSelectionEvent.java | 2 +-
taverna-selection-impl/pom.xml | 17 ++
.../impl/DataflowSelectionModelImpl.java | 4 +-
.../selection/impl/SelectionManagerImpl.java | 18 +--
taverna-stringconstant-activity-ui/pom.xml | 2 +-
...ringConstantActivityConfigurationAction.java | 4 +-
.../menu/AddStringConstantTemplateAction.java | 2 +-
.../StringConstantTemplateService.java | 2 +-
.../StringConstantActivityContextualView.java | 2 +-
.../StringConstantActivityViewFactory.java | 2 +-
.../views/StringConstantConfigView.java | 4 +-
.../views/TestStringConstantContextualView.java | 2 +-
taverna-uibuilder/pom.xml | 6 +-
.../views/UnrecognizedActivityViewFactory.java | 2 +-
.../views/UnrecognizedContextualView.java | 6 +-
taverna-update-manager/pom.xml | 19 +++
taverna-workbench-impl/pom.xml | 26 ++--
.../ui/impl/DataflowEditsListener.java | 8 +-
.../t2/workbench/ui/impl/WorkbenchImpl.java | 4 +-
.../ui/impl/WorkbenchPerspectives.java | 4 +-
taverna-workflow-explorer/pom.xml | 4 +-
.../ui/workflowexplorer/WorkflowExplorer.java | 12 +-
.../WorkflowExplorerFactory.java | 2 +-
.../WorkflowExplorerTreeCellRenderer.java | 30 ++--
taverna-workflow-view/pom.xml | 21 ++-
.../ui/actions/CopyGraphComponentAction.java | 10 +-
.../ui/actions/CopyProcessorAction.java | 2 +-
.../ui/actions/CutGraphComponentAction.java | 10 +-
.../ui/actions/CutProcessorAction.java | 4 +-
.../ui/actions/PasteGraphComponentAction.java | 2 +-
.../ui/dndhandler/ServiceTransferHandler.java | 2 +-
.../ui/menu/CopyProcessorMenuAction.java | 4 +-
.../ui/menu/CutProcessorMenuAction.java | 4 +-
.../ui/menu/PasteGraphComponentMenuAction.java | 2 +-
.../ui/toolbar/PasteToolbarAction.java | 2 +-
.../workbench/ui/workflowview/WorkflowView.java | 36 ++---
344 files changed, 1212 insertions(+), 1093 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c4f10e9..953af80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,87 +23,103 @@
<artifactId>taverna-parent</artifactId>
<version>1-incubating-SNAPSHOT</version>
</parent>
+
<groupId>org.apache.taverna.workbench</groupId>
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Taverna Workbench</name>
- <description>Graphical workbench for editing and running Apache Taverna workflows</description>
- <properties>
- <taverna.language.version>0.15.0-incubating-SNAPSHOT</taverna.language.version>
- <taverna.osgi.version>0.2.0-incubating-SNAPSHOT</taverna.osgi.version>
- <taverna.engine.version>3.1.0-incubating-SNAPSHOT</taverna.engine.version>
- <taverna.commonactivities.version>2.1.0-incubating-SNAPSHOT</taverna.commonactivities.version>
- </properties>
+ <description>Graphical workbench for editing and running Apache Taverna workflows</description>
+ <properties>
+ <taverna.language.version>0.15.0-incubating-SNAPSHOT</taverna.language.version>
+ <taverna.osgi.version>0.2.0-incubating-SNAPSHOT</taverna.osgi.version>
+ <taverna.engine.version>3.1.0-incubating-SNAPSHOT</taverna.engine.version>
+ <taverna.commonactivities.version>2.1.0-incubating-SNAPSHOT</taverna.commonactivities.version>
+ <batik.version>1.7.0</batik.version>
+ </properties>
+
<modules>
- <module>taverna-dataflow-activity-ui</module>
- <module>taverna-disabled-activity-ui</module>
- <module>taverna-stringconstant-activity-ui</module>
- <module>taverna-unrecognized-activity-ui</module>
- <module>taverna-activity-icons-api</module>
- <module>taverna-activity-palette-api</module>
- <module>taverna-activity-palette-impl</module>
- <module>taverna-activity-palette-ui</module>
- <module>taverna-activity-tools</module>
- <module>taverna-configuration-api</module>
- <module>taverna-configuration-impl</module>
- <module>taverna-contextual-views</module>
- <module>taverna-contextual-views-api</module>
- <module>taverna-contextual-views-impl</module>
- <module>taverna-credential-manager-ui</module>
- <module>taverna-data-management-config-ui</module>
- <module>taverna-design-ui</module>
- <module>taverna-edits-api</module>
- <module>taverna-edits-impl</module>
- <module>taverna-file-api</module>
- <module>taverna-file-impl</module>
- <module>taverna-graph-model</module>
- <module>taverna-graph-view</module>
- <module>taverna-helper-api</module>
- <module>taverna-httpproxy-config</module>
- <module>taverna-iteration-strategy-ui</module>
- <module>taverna-loop-ui</module>
- <module>taverna-menu-api</module>
- <module>taverna-menu-impl</module>
- <module>taverna-menu-items</module>
- <module>taverna-monitor-view</module>
- <module>taverna-parallelize-ui</module>
- <module>taverna-perspective-biocatalogue</module>
- <module>taverna-perspective-design</module>
- <module>taverna-perspective-myexperiment</module>
- <module>taverna-perspective-results</module>
- <module>taverna-plugin-manager</module>
- <module>taverna-plugins-gui</module>
- <module>taverna-reference-ui</module>
- <module>taverna-renderers-api</module>
- <module>taverna-renderers-exts</module>
- <module>taverna-renderers-impl</module>
- <module>taverna-report-api</module>
- <module>taverna-report-explainer</module>
- <module>taverna-report-impl</module>
- <module>taverna-report-view</module>
- <module>taverna-results-view</module>
- <module>taverna-retry-ui</module>
- <module>taverna-run-ui</module>
- <module>taverna-selection-api</module>
- <module>taverna-selection-impl</module>
- <module>taverna-update-manager</module>
- <module>taverna-workbench-api</module>
- <module>taverna-workbench-impl</module>
- <module>taverna-workflow-explorer</module>
- <module>taverna-workflow-view</module>
- <module>taverna-beaninfo</module>
- <module>taverna-io</module>
- <module>taverna-ui</module>
- <module>taverna-uibuilder</module>
- </modules>
+ <module>taverna-dataflow-activity-ui</module>
+ <module>taverna-disabled-activity-ui</module>
+ <module>taverna-stringconstant-activity-ui</module>
+ <module>taverna-unrecognized-activity-ui</module>
+ <module>taverna-activity-icons-api</module>
+ <module>taverna-activity-palette-api</module>
+ <module>taverna-activity-palette-impl</module>
+ <module>taverna-activity-palette-ui</module>
+ <module>taverna-activity-tools</module>
+ <module>taverna-configuration-api</module>
+ <module>taverna-configuration-impl</module>
+ <module>taverna-contextual-views</module>
+ <module>taverna-contextual-views-api</module>
+ <module>taverna-contextual-views-impl</module>
+ <module>taverna-credential-manager-ui</module>
+ <module>taverna-data-management-config-ui</module>
+ <module>taverna-design-ui</module>
+ <module>taverna-edits-api</module>
+ <module>taverna-edits-impl</module>
+ <module>taverna-file-api</module>
+ <module>taverna-file-impl</module>
+ <module>taverna-graph-model</module>
+ <module>taverna-graph-view</module>
+ <module>taverna-helper-api</module>
+ <module>taverna-httpproxy-config</module>
+ <module>taverna-iteration-strategy-ui</module>
+ <module>taverna-loop-ui</module>
+ <module>taverna-menu-api</module>
+ <module>taverna-menu-impl</module>
+ <module>taverna-menu-items</module>
+ <module>taverna-monitor-view</module>
+ <module>taverna-parallelize-ui</module>
+ <module>taverna-perspective-biocatalogue</module>
+ <module>taverna-perspective-design</module>
+ <module>taverna-perspective-myexperiment</module>
+ <module>taverna-perspective-results</module>
+ <module>taverna-plugin-manager</module>
+ <module>taverna-plugins-gui</module>
+ <module>taverna-reference-ui</module>
+ <module>taverna-renderers-api</module>
+ <module>taverna-renderers-exts</module>
+ <module>taverna-renderers-impl</module>
+ <module>taverna-report-api</module>
+ <module>taverna-report-explainer</module>
+ <module>taverna-report-impl</module>
+ <module>taverna-report-view</module>
+ <module>taverna-results-view</module>
+ <module>taverna-retry-ui</module>
+ <module>taverna-run-ui</module>
+ <module>taverna-selection-api</module>
+ <module>taverna-selection-impl</module>
+ <module>taverna-update-manager</module>
+ <module>taverna-workbench-api</module>
+ <module>taverna-workbench-impl</module>
+ <module>taverna-workflow-explorer</module>
+ <module>taverna-workflow-view</module>
+ <module>taverna-beaninfo</module>
+ <module>taverna-io</module>
+ <module>taverna-ui</module>
+ <module>taverna-uibuilder</module>
+ </modules>
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench.git</developerConnection>
<url>https://github.com/apache/incubator-taverna-workbench</url>
<tag>HEAD</tag>
</scm>
- <repositories>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
<repository>
<id>apache.snapshots</id>
<name>Apache Snapshot Repository</name>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-activity-icons-api/src/main/java/net/sf/taverna/t2/workbench/activityicons/ActivityIconManager.java
----------------------------------------------------------------------
diff --git a/taverna-activity-icons-api/src/main/java/net/sf/taverna/t2/workbench/activityicons/ActivityIconManager.java b/taverna-activity-icons-api/src/main/java/net/sf/taverna/t2/workbench/activityicons/ActivityIconManager.java
index d2c8fff..c92c4e8 100644
--- a/taverna-activity-icons-api/src/main/java/net/sf/taverna/t2/workbench/activityicons/ActivityIconManager.java
+++ b/taverna-activity-icons-api/src/main/java/net/sf/taverna/t2/workbench/activityicons/ActivityIconManager.java
@@ -24,7 +24,7 @@ import java.net.URI;
import javax.swing.Icon;
-import uk.org.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.activity.Activity;
/**
* Manager for activities' icons.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-activity-icons-api/src/main/java/net/sf/taverna/t2/workbench/activityicons/impl/ActivityIconManagerImpl.java
----------------------------------------------------------------------
diff --git a/taverna-activity-icons-api/src/main/java/net/sf/taverna/t2/workbench/activityicons/impl/ActivityIconManagerImpl.java b/taverna-activity-icons-api/src/main/java/net/sf/taverna/t2/workbench/activityicons/impl/ActivityIconManagerImpl.java
index f8294fc..762de69 100644
--- a/taverna-activity-icons-api/src/main/java/net/sf/taverna/t2/workbench/activityicons/impl/ActivityIconManagerImpl.java
+++ b/taverna-activity-icons-api/src/main/java/net/sf/taverna/t2/workbench/activityicons/impl/ActivityIconManagerImpl.java
@@ -28,7 +28,7 @@ import java.util.WeakHashMap;
import javax.swing.Icon;
-import uk.org.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.activity.Activity;
import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
import net.sf.taverna.t2.workbench.activityicons.ActivityIconSPI;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-activity-palette-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-palette-api/pom.xml b/taverna-activity-palette-api/pom.xml
index eb21d63..9b5b185 100644
--- a/taverna-activity-palette-api/pom.xml
+++ b/taverna-activity-palette-api/pom.xml
@@ -37,11 +37,13 @@
<artifactId>taverna-edits-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
+<!--
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-beans</artifactId>
<version>${project.parent.version}</version>
</dependency>
+-->
<dependency>
<groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-configuration-api</artifactId>
@@ -53,6 +55,12 @@
<version>${taverna.language.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-beaninfo</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/AbstractConfigurableServiceProvider.java
----------------------------------------------------------------------
diff --git a/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/AbstractConfigurableServiceProvider.java b/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/AbstractConfigurableServiceProvider.java
index 18cb176..e3c4c54 100644
--- a/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/AbstractConfigurableServiceProvider.java
+++ b/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/AbstractConfigurableServiceProvider.java
@@ -1,6 +1,6 @@
package net.sf.taverna.t2.servicedescriptions;
-import uk.org.taverna.scufl2.api.configurations.Configuration;
+import org.apache.taverna.scufl2.api.configurations.Configuration;
public abstract class AbstractConfigurableServiceProvider extends
IdentifiedObject implements ConfigurableServiceProvider {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/AbstractTemplateService.java
----------------------------------------------------------------------
diff --git a/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/AbstractTemplateService.java b/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/AbstractTemplateService.java
index d4909b1..b5b2a7c 100644
--- a/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/AbstractTemplateService.java
+++ b/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/AbstractTemplateService.java
@@ -8,7 +8,7 @@ import java.util.List;
import javax.swing.Icon;
-import uk.org.taverna.scufl2.api.configurations.Configuration;
+import org.apache.taverna.scufl2.api.configurations.Configuration;
public abstract class AbstractTemplateService implements
ServiceDescriptionProvider {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/ConfigurableServiceProvider.java
----------------------------------------------------------------------
diff --git a/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/ConfigurableServiceProvider.java b/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/ConfigurableServiceProvider.java
index 0bf01bd..d16afaa 100644
--- a/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/ConfigurableServiceProvider.java
+++ b/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/ConfigurableServiceProvider.java
@@ -1,7 +1,7 @@
package net.sf.taverna.t2.servicedescriptions;
-import uk.org.taverna.scufl2.api.common.Configurable;
-import uk.org.taverna.scufl2.api.configurations.Configuration;
+import org.apache.taverna.scufl2.api.common.Configurable;
+import org.apache.taverna.scufl2.api.configurations.Configuration;
public interface ConfigurableServiceProvider extends
ServiceDescriptionProvider, Configurable, Cloneable {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/CustomizedConfigurePanelProvider.java
----------------------------------------------------------------------
diff --git a/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/CustomizedConfigurePanelProvider.java b/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/CustomizedConfigurePanelProvider.java
index 8bb5331..f6bdd4a 100644
--- a/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/CustomizedConfigurePanelProvider.java
+++ b/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/CustomizedConfigurePanelProvider.java
@@ -20,7 +20,7 @@
******************************************************************************/
package net.sf.taverna.t2.servicedescriptions;
-import uk.org.taverna.scufl2.api.configurations.Configuration;
+import org.apache.taverna.scufl2.api.configurations.Configuration;
public interface CustomizedConfigurePanelProvider extends
ConfigurableServiceProvider {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/ServiceDescription.java
----------------------------------------------------------------------
diff --git a/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/ServiceDescription.java b/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/ServiceDescription.java
index 8551934..72e1b2e 100644
--- a/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/ServiceDescription.java
+++ b/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/ServiceDescription.java
@@ -7,10 +7,10 @@ import javax.swing.Icon;
import net.sf.taverna.t2.lang.beans.PropertyAnnotation;
import net.sf.taverna.t2.workbench.edits.Edit;
-import uk.org.taverna.scufl2.api.activity.Activity;
-import uk.org.taverna.scufl2.api.configurations.Configuration;
-import uk.org.taverna.scufl2.api.core.Processor;
-import uk.org.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.configurations.Configuration;
+import org.apache.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.core.Workflow;
public abstract class ServiceDescription extends IdentifiedObject {
public static final String SERVICE_TEMPLATES = "Service templates";
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/ServiceDescriptionRegistry.java
----------------------------------------------------------------------
diff --git a/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/ServiceDescriptionRegistry.java b/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/ServiceDescriptionRegistry.java
index e9b6c04..c44b541 100644
--- a/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/ServiceDescriptionRegistry.java
+++ b/taverna-activity-palette-api/src/main/java/net/sf/taverna/t2/servicedescriptions/ServiceDescriptionRegistry.java
@@ -6,7 +6,7 @@ import java.net.URL;
import java.util.List;
import java.util.Set;
-import net.sf.taverna.t2.lang.observer.Observable;
+import org.apache.taverna.lang.observer.Observable;
import net.sf.taverna.t2.servicedescriptions.events.ServiceDescriptionRegistryEvent;
public interface ServiceDescriptionRegistry extends
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionDeserializer.java
----------------------------------------------------------------------
diff --git a/taverna-activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionDeserializer.java b/taverna-activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionDeserializer.java
index 0a40bda..379888a 100644
--- a/taverna-activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionDeserializer.java
+++ b/taverna-activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionDeserializer.java
@@ -17,7 +17,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import uk.org.taverna.scufl2.api.configurations.Configuration;
+import org.apache.taverna.scufl2.api.configurations.Configuration;
import net.sf.taverna.t2.servicedescriptions.ConfigurableServiceProvider;
import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionProvider;
import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionRegistryImpl.java
----------------------------------------------------------------------
diff --git a/taverna-activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionRegistryImpl.java b/taverna-activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionRegistryImpl.java
index 9dc3f00..d481727 100644
--- a/taverna-activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionRegistryImpl.java
+++ b/taverna-activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionRegistryImpl.java
@@ -38,8 +38,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import net.sf.taverna.t2.lang.observer.MultiCaster;
-import net.sf.taverna.t2.lang.observer.Observer;
+import org.apache.taverna.lang.observer.MultiCaster;
+import org.apache.taverna.lang.observer.Observer;
import net.sf.taverna.t2.servicedescriptions.ConfigurableServiceProvider;
import net.sf.taverna.t2.servicedescriptions.ServiceDescription;
import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionProvider;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-activity-palette-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-palette-ui/pom.xml b/taverna-activity-palette-ui/pom.xml
index 84d8d66..dc6c665 100644
--- a/taverna-activity-palette-ui/pom.xml
+++ b/taverna-activity-palette-ui/pom.xml
@@ -82,6 +82,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServicePanel.java
----------------------------------------------------------------------
diff --git a/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServicePanel.java b/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServicePanel.java
index 0b01fe2..616b574 100644
--- a/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServicePanel.java
+++ b/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServicePanel.java
@@ -41,8 +41,8 @@ import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import net.sf.taverna.t2.lang.observer.Observable;
-import net.sf.taverna.t2.lang.observer.Observer;
+import org.apache.taverna.lang.observer.Observable;
+import org.apache.taverna.lang.observer.Observer;
import net.sf.taverna.t2.servicedescriptions.ServiceDescription;
import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionProvider;
import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
@@ -62,7 +62,7 @@ import net.sf.taverna.t2.workbench.ui.zaria.UIComponentSPI;
import org.apache.log4j.Logger;
-import uk.org.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.commons.services.ServiceRegistry;
/**
* A panel of available services
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServicePanelComponentFactory.java
----------------------------------------------------------------------
diff --git a/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServicePanelComponentFactory.java b/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServicePanelComponentFactory.java
index 2eb97ef..f720a16 100644
--- a/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServicePanelComponentFactory.java
+++ b/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServicePanelComponentFactory.java
@@ -22,7 +22,7 @@ package net.sf.taverna.t2.workbench.ui.servicepanel;
import javax.swing.ImageIcon;
-import uk.org.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.commons.services.ServiceRegistry;
import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
import net.sf.taverna.t2.ui.menu.MenuManager;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServiceTreeClickListener.java
----------------------------------------------------------------------
diff --git a/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServiceTreeClickListener.java b/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServiceTreeClickListener.java
index a76dcc9..7350fa5 100644
--- a/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServiceTreeClickListener.java
+++ b/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServiceTreeClickListener.java
@@ -64,7 +64,7 @@ import net.sf.taverna.t2.workbench.ui.servicepanel.tree.TreePanel;
import org.apache.log4j.Logger;
-import uk.org.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.commons.services.ServiceRegistry;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServiceTreePanel.java
----------------------------------------------------------------------
diff --git a/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServiceTreePanel.java b/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServiceTreePanel.java
index ce3e336..35c143b 100644
--- a/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServiceTreePanel.java
+++ b/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServiceTreePanel.java
@@ -35,7 +35,7 @@ import net.sf.taverna.t2.workbench.ui.servicepanel.tree.TreePanel;
import org.apache.log4j.Logger;
-import uk.org.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.commons.services.ServiceRegistry;
public class ServiceTreePanel extends TreePanel {
private static final long serialVersionUID = 6611462684296693909L;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/actions/AddServiceProviderAction.java
----------------------------------------------------------------------
diff --git a/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/actions/AddServiceProviderAction.java b/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/actions/AddServiceProviderAction.java
index c8f2bfa..4568327 100644
--- a/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/actions/AddServiceProviderAction.java
+++ b/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/actions/AddServiceProviderAction.java
@@ -46,8 +46,8 @@ import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import net.sf.taverna.t2.lang.observer.Observable;
-import net.sf.taverna.t2.lang.observer.Observer;
+import org.apache.taverna.lang.observer.Observable;
+import org.apache.taverna.lang.observer.Observer;
import net.sf.taverna.t2.lang.uibuilder.UIBuilder;
import net.sf.taverna.t2.servicedescriptions.ConfigurableServiceProvider;
import net.sf.taverna.t2.servicedescriptions.CustomizedConfigurePanelProvider;
@@ -60,7 +60,7 @@ import net.sf.taverna.t2.workbench.helper.HelpEnabledDialog;
import org.apache.log4j.Logger;
-import uk.org.taverna.scufl2.api.configurations.Configuration;
+import org.apache.taverna.scufl2.api.configurations.Configuration;
/**
* Action for adding a service provider
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-activity-tools/src/main/java/net/sf/taverna/t2/workbench/activitytools/AbstractConfigureActivityMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-activity-tools/src/main/java/net/sf/taverna/t2/workbench/activitytools/AbstractConfigureActivityMenuAction.java b/taverna-activity-tools/src/main/java/net/sf/taverna/t2/workbench/activitytools/AbstractConfigureActivityMenuAction.java
index 4744774..8ca91e8 100644
--- a/taverna-activity-tools/src/main/java/net/sf/taverna/t2/workbench/activitytools/AbstractConfigureActivityMenuAction.java
+++ b/taverna-activity-tools/src/main/java/net/sf/taverna/t2/workbench/activitytools/AbstractConfigureActivityMenuAction.java
@@ -7,11 +7,11 @@ import java.net.URI;
import javax.swing.Action;
-import uk.org.taverna.scufl2.api.activity.Activity;
-import uk.org.taverna.scufl2.api.common.Scufl2Tools;
-import uk.org.taverna.scufl2.api.core.Processor;
-import uk.org.taverna.scufl2.api.profiles.ProcessorBinding;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.common.Scufl2Tools;
+import org.apache.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.profiles.ProcessorBinding;
+import org.apache.taverna.scufl2.api.profiles.Profile;
import net.sf.taverna.t2.ui.menu.AbstractContextualMenuAction;
import net.sf.taverna.t2.workbench.ui.Utils;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-beaninfo/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-beaninfo/pom.xml b/taverna-beaninfo/pom.xml
index d09598f..14a048f 100644
--- a/taverna-beaninfo/pom.xml
+++ b/taverna-beaninfo/pom.xml
@@ -3,11 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.sf.taverna.t2</groupId>
- <artifactId>lang</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <groupId>org.apache.taverna.workbench</groupId>
+ <artifactId>taverna-workbench</artifactId>
+ <version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <groupId>net.sf.taverna.t2.lang</groupId>
<artifactId>taverna-beaninfo</artifactId>
<packaging>bundle</packaging>
<name>Apache Taverna BeanInfo extensions</name>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/actions/activity/ActivityConfigurationAction.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/actions/activity/ActivityConfigurationAction.java b/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/actions/activity/ActivityConfigurationAction.java
index 4d2fcff..a6da26d 100644
--- a/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/actions/activity/ActivityConfigurationAction.java
+++ b/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/actions/activity/ActivityConfigurationAction.java
@@ -26,8 +26,8 @@ import java.util.WeakHashMap;
import javax.swing.AbstractAction;
import javax.swing.JDialog;
-import net.sf.taverna.t2.lang.observer.Observable;
-import net.sf.taverna.t2.lang.observer.Observer;
+import org.apache.taverna.lang.observer.Observable;
+import org.apache.taverna.lang.observer.Observer;
import net.sf.taverna.t2.servicedescriptions.ServiceDescription;
import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
@@ -35,13 +35,13 @@ import net.sf.taverna.t2.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.file.events.ClosingDataflowEvent;
import net.sf.taverna.t2.workbench.file.events.FileManagerEvent;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ActivityConfigurationDialog;
-import uk.org.taverna.scufl2.api.activity.Activity;
-import uk.org.taverna.scufl2.api.common.Scufl2Tools;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Processor;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.profiles.ProcessorBinding;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.common.Scufl2Tools;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.profiles.ProcessorBinding;
+import org.apache.taverna.scufl2.api.profiles.Profile;
@SuppressWarnings("serial")
public abstract class ActivityConfigurationAction extends AbstractAction {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/actions/activity/ActivityContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/actions/activity/ActivityContextualView.java b/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/actions/activity/ActivityContextualView.java
index f063c02..85ddfd9 100644
--- a/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/actions/activity/ActivityContextualView.java
+++ b/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/actions/activity/ActivityContextualView.java
@@ -21,9 +21,9 @@
package net.sf.taverna.t2.workbench.ui.actions.activity;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
-import uk.org.taverna.scufl2.api.activity.Activity;
-import uk.org.taverna.scufl2.api.common.Scufl2Tools;
-import uk.org.taverna.scufl2.api.configurations.Configuration;
+import org.apache.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.common.Scufl2Tools;
+import org.apache.taverna.scufl2.api.configurations.Configuration;
/**
* A contextual view specific to an Activity. Concrete subclasses must
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/actions/activity/HTMLBasedActivityContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/actions/activity/HTMLBasedActivityContextualView.java b/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/actions/activity/HTMLBasedActivityContextualView.java
index de3df33..b9385cb 100644
--- a/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/actions/activity/HTMLBasedActivityContextualView.java
+++ b/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/actions/activity/HTMLBasedActivityContextualView.java
@@ -29,7 +29,7 @@ import javax.swing.JComponent;
import javax.swing.JEditorPane;
import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
-import uk.org.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.activity.Activity;
@SuppressWarnings("serial")
public abstract class HTMLBasedActivityContextualView extends ActivityContextualView {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/pom.xml b/taverna-contextual-views-impl/pom.xml
index c0398e9..825a6ac 100644
--- a/taverna-contextual-views-impl/pom.xml
+++ b/taverna-contextual-views-impl/pom.xml
@@ -28,6 +28,12 @@
<name>Apache Taverna Contextual Views Impl</name>
<description>Contextual views for the activities</description>
<dependencies>
+ <dependency>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-workflowmodel-api</artifactId>
+ <version>${taverna.engine.version}</version>
+ </dependency>
+
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-contextual-views-api</artifactId>
@@ -49,6 +55,5 @@
<artifactId>javahelp</artifactId>
<version>${javahelp.version}</version>
</dependency>
-
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/annotated/AnnotatedContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/annotated/AnnotatedContextualView.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/annotated/AnnotatedContextualView.java
index 018a121..5dd5a81 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/annotated/AnnotatedContextualView.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/annotated/AnnotatedContextualView.java
@@ -39,8 +39,8 @@ import javax.swing.JScrollPane;
import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
-import net.sf.taverna.t2.annotation.Annotated;
-import net.sf.taverna.t2.annotation.AnnotationBeanSPI;
+import org.apache.taverna.annotation.Annotated;
+import org.apache.taverna.annotation.AnnotationBeanSPI;
import net.sf.taverna.t2.lang.ui.DialogTextArea;
import net.sf.taverna.t2.workbench.edits.CompoundEdit;
import net.sf.taverna.t2.workbench.edits.Edit;
@@ -52,7 +52,7 @@ import net.sf.taverna.t2.workbench.ui.views.contextualviews.impl.ContextualViewC
import org.apache.log4j.Logger;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
/**
* This is a ContextualView that should be able to display and allow editing of
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/condition/ConditionContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/condition/ConditionContextualView.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/condition/ConditionContextualView.java
index f9308b5..de39835 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/condition/ConditionContextualView.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/condition/ConditionContextualView.java
@@ -28,7 +28,7 @@ import javax.swing.JPanel;
import javax.swing.border.EmptyBorder;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
-import uk.org.taverna.scufl2.api.core.BlockingControlLink;
+import org.apache.taverna.scufl2.api.core.BlockingControlLink;
/**
* Contextual view for dataflow's control (condition) links.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/condition/ConditionContextualViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/condition/ConditionContextualViewFactory.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/condition/ConditionContextualViewFactory.java
index ea69f1a..d9856e1 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/condition/ConditionContextualViewFactory.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/condition/ConditionContextualViewFactory.java
@@ -27,7 +27,7 @@ import java.util.List;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
import net.sf.taverna.t2.workflowmodel.Condition;
-import uk.org.taverna.scufl2.api.core.BlockingControlLink;
+import org.apache.taverna.scufl2.api.core.BlockingControlLink;
/**
* A factory of contextual views for dataflow's condition links.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflow/DataflowContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflow/DataflowContextualView.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflow/DataflowContextualView.java
index 4a63868..877693f 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflow/DataflowContextualView.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflow/DataflowContextualView.java
@@ -15,9 +15,9 @@ import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
import net.sf.taverna.t2.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
import net.sf.taverna.t2.workflowmodel.Dataflow;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.port.InputWorkflowPort;
-import uk.org.taverna.scufl2.api.port.OutputWorkflowPort;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.port.InputWorkflowPort;
+import org.apache.taverna.scufl2.api.port.OutputWorkflowPort;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflow/DataflowContextualViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflow/DataflowContextualViewFactory.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflow/DataflowContextualViewFactory.java
index 0d7f3c0..d2ea6d7 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflow/DataflowContextualViewFactory.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflow/DataflowContextualViewFactory.java
@@ -10,7 +10,7 @@ import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
import net.sf.taverna.t2.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
-import uk.org.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.core.Workflow;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowinputport/DataflowInputPortContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowinputport/DataflowInputPortContextualView.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowinputport/DataflowInputPortContextualView.java
index 3f17a65..644804d 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowinputport/DataflowInputPortContextualView.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowinputport/DataflowInputPortContextualView.java
@@ -33,7 +33,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.EmptyBorder;
-import uk.org.taverna.scufl2.api.port.InputWorkflowPort;
+import org.apache.taverna.scufl2.api.port.InputWorkflowPort;
import net.sf.taverna.t2.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowinputport/DataflowInputPortContextualViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowinputport/DataflowInputPortContextualViewFactory.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowinputport/DataflowInputPortContextualViewFactory.java
index 5dc5434..bc07803 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowinputport/DataflowInputPortContextualViewFactory.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowinputport/DataflowInputPortContextualViewFactory.java
@@ -26,7 +26,7 @@ import java.util.List;
import net.sf.taverna.t2.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
-import uk.org.taverna.scufl2.api.port.InputWorkflowPort;
+import org.apache.taverna.scufl2.api.port.InputWorkflowPort;
/**
* A factory of contextual views for dataflow's input ports.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowoutputport/DataflowOutputPortContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowoutputport/DataflowOutputPortContextualView.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowoutputport/DataflowOutputPortContextualView.java
index 9ba55fe..d203be4 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowoutputport/DataflowOutputPortContextualView.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowoutputport/DataflowOutputPortContextualView.java
@@ -33,7 +33,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.EmptyBorder;
-import uk.org.taverna.scufl2.api.port.OutputWorkflowPort;
+import org.apache.taverna.scufl2.api.port.OutputWorkflowPort;
import net.sf.taverna.t2.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowoutputport/DataflowOutputPortContextualViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowoutputport/DataflowOutputPortContextualViewFactory.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowoutputport/DataflowOutputPortContextualViewFactory.java
index 20ac960..9b06e66 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowoutputport/DataflowOutputPortContextualViewFactory.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowoutputport/DataflowOutputPortContextualViewFactory.java
@@ -27,7 +27,7 @@ import net.sf.taverna.t2.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
import net.sf.taverna.t2.workflowmodel.DataflowOutputPort;
-import uk.org.taverna.scufl2.api.port.OutputWorkflowPort;
+import org.apache.taverna.scufl2.api.port.OutputWorkflowPort;
/**
* A factory of contextual views for dataflow's output ports.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/datalink/DatalinkContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/datalink/DatalinkContextualView.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/datalink/DatalinkContextualView.java
index daa3414..0abbd48 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/datalink/DatalinkContextualView.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/datalink/DatalinkContextualView.java
@@ -33,7 +33,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.EmptyBorder;
-import uk.org.taverna.scufl2.api.core.DataLink;
+import org.apache.taverna.scufl2.api.core.DataLink;
import net.sf.taverna.t2.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/datalink/DatalinkContextualViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/datalink/DatalinkContextualViewFactory.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/datalink/DatalinkContextualViewFactory.java
index fa8bf96..0acc82f 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/datalink/DatalinkContextualViewFactory.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/datalink/DatalinkContextualViewFactory.java
@@ -27,7 +27,7 @@ import net.sf.taverna.t2.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
import net.sf.taverna.t2.workflowmodel.Datalink;
-import uk.org.taverna.scufl2.api.core.DataLink;
+import org.apache.taverna.scufl2.api.core.DataLink;
/**
* A factory of contextual views for dataflow's datalinks.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/impl/ContextualViewComponent.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/impl/ContextualViewComponent.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/impl/ContextualViewComponent.java
index 11306d0..b4bec76 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/impl/ContextualViewComponent.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/impl/ContextualViewComponent.java
@@ -37,9 +37,9 @@ import javax.swing.JScrollPane;
import javax.swing.SwingUtilities;
import javax.swing.Timer;
-import net.sf.taverna.t2.lang.observer.Observable;
-import net.sf.taverna.t2.lang.observer.Observer;
-import net.sf.taverna.t2.lang.observer.SwingAwareObserver;
+import org.apache.taverna.lang.observer.Observable;
+import org.apache.taverna.lang.observer.Observer;
+import org.apache.taverna.lang.observer.SwingAwareObserver;
import net.sf.taverna.t2.lang.ui.ShadedLabel;
import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.edits.EditManager.EditManagerEvent;
@@ -53,7 +53,7 @@ import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactoryRegistry;
import net.sf.taverna.t2.workbench.ui.zaria.UIComponentSPI;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
@SuppressWarnings("serial")
public class ContextualViewComponent extends JScrollPane implements UIComponentSPI {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/inputport/InputPortContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/inputport/InputPortContextualView.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/inputport/InputPortContextualView.java
index c1b3d06..452f7b3 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/inputport/InputPortContextualView.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/inputport/InputPortContextualView.java
@@ -29,7 +29,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.EmptyBorder;
-import uk.org.taverna.scufl2.api.port.InputActivityPort;
+import org.apache.taverna.scufl2.api.port.InputActivityPort;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/inputport/InputPortContextualViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/inputport/InputPortContextualViewFactory.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/inputport/InputPortContextualViewFactory.java
index 490e5b7..bf35c17 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/inputport/InputPortContextualViewFactory.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/inputport/InputPortContextualViewFactory.java
@@ -25,7 +25,7 @@ import java.util.List;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
-import uk.org.taverna.scufl2.api.port.InputActivityPort;
+import org.apache.taverna.scufl2.api.port.InputActivityPort;
/**
* A factory of contextual views for dataflow proessor's (i.e. its associated
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeConfigurationAction.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeConfigurationAction.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeConfigurationAction.java
index 567cc4b..ad06636 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeConfigurationAction.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeConfigurationAction.java
@@ -32,8 +32,8 @@ import net.sf.taverna.t2.workflow.edits.ReorderMergePositionsEdit;
import org.apache.log4j.Logger;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.DataLink;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.DataLink;
/**
* Configuration action for a Merge. This action changes the order of
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeConfigurationView.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeConfigurationView.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeConfigurationView.java
index 66eeb3e..8f07c58 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeConfigurationView.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeConfigurationView.java
@@ -40,7 +40,7 @@ import javax.swing.event.ListSelectionListener;
import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.helper.HelpEnabledDialog;
import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import uk.org.taverna.scufl2.api.core.DataLink;
+import org.apache.taverna.scufl2.api.core.DataLink;
@SuppressWarnings("serial")
public class MergeConfigurationView extends HelpEnabledDialog {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeContextualView.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeContextualView.java
index deb09fb..7326fcc 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeContextualView.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeContextualView.java
@@ -43,9 +43,9 @@ import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.selection.SelectionManager;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
import net.sf.taverna.t2.workflowmodel.Merge;
-import uk.org.taverna.scufl2.api.common.Scufl2Tools;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.DataLink;
+import org.apache.taverna.scufl2.api.common.Scufl2Tools;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.DataLink;
/**
* Contextual view for a {@link Merge}.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeContextualViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeContextualViewFactory.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeContextualViewFactory.java
index 712b183..8e4a93a 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeContextualViewFactory.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeContextualViewFactory.java
@@ -28,7 +28,7 @@ import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.selection.SelectionManager;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
-import uk.org.taverna.scufl2.api.core.DataLink;
+import org.apache.taverna.scufl2.api.core.DataLink;
/**
* A factory of contextual views for dataflow's merges.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/outputport/OutputPortContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/outputport/OutputPortContextualView.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/outputport/OutputPortContextualView.java
index f2c7861..d997637 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/outputport/OutputPortContextualView.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/outputport/OutputPortContextualView.java
@@ -30,7 +30,7 @@ import javax.swing.JPanel;
import javax.swing.border.EmptyBorder;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort;
/**
* Contextual view for dataflow procerssor's output ports.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/outputport/OutputPortContextualViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/outputport/OutputPortContextualViewFactory.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/outputport/OutputPortContextualViewFactory.java
index 71e2cd4..a01a259 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/outputport/OutputPortContextualViewFactory.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/outputport/OutputPortContextualViewFactory.java
@@ -25,7 +25,7 @@ import java.util.List;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort;
/**
* A factory of contextual views for dataflow proessor's (i.e. its associated
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-contextual-views/pom.xml b/taverna-contextual-views/pom.xml
index 13a8746..02d9385 100644
--- a/taverna-contextual-views/pom.xml
+++ b/taverna-contextual-views/pom.xml
@@ -44,13 +44,14 @@
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna=selection-api</artifactId>
+ <artifactId>taverna-selection-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/599e56c6/taverna-contextual-views/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/processor/ProcessorActivitiesContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/processor/ProcessorActivitiesContextualView.java b/taverna-contextual-views/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/processor/ProcessorActivitiesContextualView.java
index 61f6dd6..f11b0b0 100644
--- a/taverna-contextual-views/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/processor/ProcessorActivitiesContextualView.java
+++ b/taverna-contextual-views/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/processor/ProcessorActivitiesContextualView.java
@@ -42,10 +42,10 @@ import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactoryRegistry;
-import uk.org.taverna.scufl2.api.activity.Activity;
-import uk.org.taverna.scufl2.api.common.Scufl2Tools;
-import uk.org.taverna.scufl2.api.core.Processor;
-import uk.org.taverna.scufl2.api.profiles.ProcessorBinding;
+import org.apache.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.common.Scufl2Tools;
+import org.apache.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.profiles.ProcessorBinding;
/**
* View of a processor, including it's iteration stack, activities, etc.