taverna-ui-impl/
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/72850d5a Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/72850d5a Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/72850d5a Branch: refs/heads/master Commit: 72850d5aee6bef019a52e39f415d288806da3af3 Parents: 626259a Author: Stian Soiland-Reyes <soiland-re...@cs.manchester.ac.uk> Authored: Thu Feb 5 09:06:19 2015 +0000 Committer: Stian Soiland-Reyes <soiland-re...@cs.manchester.ac.uk> Committed: Thu Feb 5 09:06:19 2015 +0000 ---------------------------------------------------------------------- .gitignore | 24 - .travis.yml | 1 - README.md | 3 - activity-palette-impl/pom.xml | 80 -- .../impl/ServiceDescriptionConstants.java | 10 - .../impl/ServiceDescriptionDeserializer.java | 167 ---- .../impl/ServiceDescriptionRegistryImpl.java | 652 ------------ .../impl/ServiceDescriptionSerializer.java | 102 -- .../impl/ServiceDescriptionXMLConstants.java | 15 - .../ServiceDescriptionsConfigurationImpl.java | 92 -- .../ActivityPaletteConfiguration.java | 81 -- .../ActivityPaletteConfigurationPanel.java | 284 ------ .../ActivityPaletteConfigurationUIFactory.java | 52 - ...rkbench.configuration.ConfigurationUIFactory | 1 - .../activity-palette-impl-context-osgi.xml | 17 - .../spring/activity-palette-impl-context.xml | 23 - .../ActivityPaletteConfigurationTest.java | 97 -- ...averna.t2.partition.PartitionAlgorithmSetSPI | 1 - ...sf.taverna.t2.partition.PropertyExtractorSPI | 3 - .../net.sf.taverna.t2.partition.QueryFactory | 2 - configuration-impl/pom.xml | 61 -- .../WorkbenchConfigurationImpl.java | 210 ---- .../WorkbenchConfigurationPanel.java | 266 ----- .../WorkbenchConfigurationUIFactory.java | 52 - .../configuration/colour/ColourManagerImpl.java | 178 ---- .../mimetype/MimeTypeManagerImpl.java | 82 -- .../ui/T2ConfigurationFrameImpl.java | 205 ---- .../ui/WorkbenchConfigurationMenu.java | 61 -- .../ui/WorkbenchPreferencesSection.java | 36 - .../net.sf.taverna.t2.ui.menu.MenuComponent | 2 - ...rkbench.configuration.ConfigurationUIFactory | 1 - .../spring/configuration-impl-context-osgi.xml | 27 - .../spring/configuration-impl-context.xml | 34 - .../configuration/ConfigurationManagerTest.java | 109 -- .../configuration/colour/ColourManagerTest.java | 90 -- contextual-views-impl/pom.xml | 43 - .../impl/ContextualViewFactoryRegistryImpl.java | 75 -- .../annotated/AnnotatedContextualView.java | 263 ----- .../AnnotatedContextualViewFactory.java | 43 - .../condition/ConditionContextualView.java | 74 -- .../ConditionContextualViewFactory.java | 51 - .../dataflow/DataflowContextualView.java | 108 -- .../dataflow/DataflowContextualViewFactory.java | 41 - .../DataflowInputPortContextualView.java | 96 -- .../DataflowInputPortContextualViewFactory.java | 54 - .../DataflowOutputPortContextualView.java | 106 -- ...DataflowOutputPortContextualViewFactory.java | 55 - .../datalink/DatalinkContextualView.java | 106 -- .../datalink/DatalinkContextualViewFactory.java | 55 - .../impl/ContextualViewComponent.java | 389 -------- .../impl/ContextualViewComponentFactory.java | 64 -- .../inputport/InputPortContextualView.java | 76 -- .../InputPortContextualViewFactory.java | 48 - .../merge/MergeConfigurationAction.java | 79 -- .../merge/MergeConfigurationView.java | 233 ----- .../merge/MergeContextualView.java | 150 --- .../merge/MergeContextualViewFactory.java | 66 -- .../outputport/OutputPortContextualView.java | 76 -- .../OutputPortContextualViewFactory.java | 48 - ...ntextualviews.activity.ContextualViewFactory | 9 - ....t2.workbench.ui.zaria.UIComponentFactorySPI | 1 - .../contextual-views-impl-context-osgi.xml | 31 - .../spring/contextual-views-impl-context.xml | 43 - .../annotatedcontextualview.properties | 4 - edits-impl/pom.xml | 49 - .../workbench/edits/impl/EditManagerImpl.java | 285 ------ .../edits/impl/menu/AbstractUndoAction.java | 166 ---- .../edits/impl/menu/RedoMenuAction.java | 86 -- .../edits/impl/menu/UndoMenuAction.java | 86 -- .../edits/impl/menu/UndoMenuSection.java | 42 - .../edits/impl/toolbar/EditToolbarSection.java | 36 - .../edits/impl/toolbar/RedoToolbarAction.java | 46 - .../edits/impl/toolbar/UndoToolbarAction.java | 46 - .../net.sf.taverna.t2.ui.menu.MenuComponent | 6 - ...et.sf.taverna.t2.workbench.edits.EditManager | 1 - .../META-INF/spring/edits-impl-context-osgi.xml | 20 - .../META-INF/spring/edits-impl-context.xml | 33 - .../edits/impl/TestEditManagerImpl.java | 258 ----- file-impl/pom.xml | 104 -- .../DataflowFromDataflowPersistenceHandler.java | 49 - .../DataflowPersistenceHandlerRegistry.java | 238 ----- .../workbench/file/impl/FileDataflowInfo.java | 67 -- .../t2/workbench/file/impl/FileManagerImpl.java | 601 ----------- .../workbench/file/impl/FileTypeFileFilter.java | 55 - .../workbench/file/impl/MultipleFileTypes.java | 58 -- .../file/impl/OpenDataflowInProgressDialog.java | 88 -- .../workbench/file/impl/OpenDataflowInfo.java | 93 -- .../file/impl/OpenDataflowRunnable.java | 71 -- .../file/impl/OpenDataflowSwingWorker.java | 67 -- .../workbench/file/impl/T2DataflowOpener.java | 144 --- .../t2/workbench/file/impl/T2FileFilter.java | 40 - .../t2/workbench/file/impl/T2FlowFileType.java | 42 - .../file/impl/WorkflowBundleFileFilter.java | 40 - .../file/impl/WorkflowBundleFileType.java | 42 - .../file/impl/WorkflowBundleOpener.java | 143 --- .../file/impl/WorkflowBundleSaver.java | 145 --- .../impl/actions/CloseAllWorkflowsAction.java | 85 -- .../file/impl/actions/CloseWorkflowAction.java | 107 -- .../file/impl/actions/NewWorkflowAction.java | 58 -- .../impl/actions/OpenNestedWorkflowAction.java | 76 -- .../file/impl/actions/OpenWorkflowAction.java | 395 -------- .../impl/actions/OpenWorkflowFromURLAction.java | 139 --- .../file/impl/actions/PasswordInput.java | 221 ---- .../impl/actions/SaveAllWorkflowsAction.java | 104 -- .../file/impl/actions/SaveWorkflowAction.java | 175 ---- .../file/impl/actions/SaveWorkflowAsAction.java | 219 ---- .../impl/hooks/CloseWorkflowsOnShutdown.java | 56 -- .../file/impl/menu/FileCloseAllMenuAction.java | 51 - .../file/impl/menu/FileCloseMenuAction.java | 50 - .../file/impl/menu/FileNewMenuAction.java | 47 - .../impl/menu/FileOpenFromURLMenuAction.java | 48 - .../file/impl/menu/FileOpenMenuAction.java | 47 - .../file/impl/menu/FileOpenMenuSection.java | 36 - .../impl/menu/FileOpenRecentMenuAction.java | 418 -------- .../file/impl/menu/FileSaveAllMenuAction.java | 47 - .../file/impl/menu/FileSaveAsMenuAction.java | 43 - .../file/impl/menu/FileSaveMenuAction.java | 46 - .../file/impl/menu/FileSaveMenuSection.java | 36 - .../workbench/file/impl/menu/WorkflowsMenu.java | 163 --- .../file/impl/toolbar/CloseToolbarAction.java | 55 - .../impl/toolbar/FileToolbarMenuSection.java | 36 - .../file/impl/toolbar/NewToolbarAction.java | 47 - .../file/impl/toolbar/OpenToolbarAction.java | 47 - .../OpenWorkflowFromURLToolbarAction.java | 47 - .../file/impl/toolbar/SaveToolbarAction.java | 50 - .../net.sf.taverna.t2.ui.menu.MenuComponent | 20 - .../net.sf.taverna.t2.workbench.ShutdownSPI | 1 - ...t2.workbench.file.DataflowPersistenceHandler | 2 - ...net.sf.taverna.t2.workbench.file.FileManager | 1 - .../META-INF/spring/file-impl-context-osgi.xml | 100 -- .../META-INF/spring/file-impl-context.xml | 123 --- .../t2/workbench/file/impl/FileManagerTest.java | 385 ------- .../workbench/file/impl/dummy-workflow.t2flow | 157 --- helper/pom.xml | 19 - httpproxy-config/pom.xml | 30 - .../config/HttpProxyConfigurationPanel.java | 582 ----------- .../config/HttpProxyConfigurationUIFactory.java | 56 -- ...rkbench.configuration.ConfigurationUIFactory | 1 - .../spring/httpproxy-config-context-osgi.xml | 13 - .../spring/httpproxy-config-context.xml | 10 - menu-impl/pom.xml | 66 -- .../t2/ui/menu/impl/MenuManagerImpl.java | 880 ---------------- .../t2/workbench/ui/impl/menu/AdvancedMenu.java | 44 - .../t2/workbench/ui/impl/menu/EditMenu.java | 43 - .../ui/impl/menu/FeedbackMenuAction.java | 75 -- .../t2/workbench/ui/impl/menu/FileMenu.java | 48 - .../t2/workbench/ui/impl/menu/HelpMenu.java | 44 - .../ui/impl/menu/OnlineHelpMenuAction.java | 68 -- .../ui/impl/menu/ShowLogsAndDataMenuAction.java | 89 -- .../ui/impl/menu/ViewShowMenuSection.java | 40 - .../net.sf.taverna.t2.ui.menu.MenuManager | 1 - .../META-INF/spring/menu-impl-context-osgi.xml | 26 - .../META-INF/spring/menu-impl-context.xml | 25 - plugin-manager/pom.xml | 49 - .../plugin/impl/AvailablePluginPanel.java | 72 -- .../plugin/impl/InstalledPluginPanel.java | 66 -- .../plugin/impl/PluginManagerPanel.java | 210 ---- .../plugin/impl/PluginManagerView.java | 71 -- .../t2/workbench/plugin/impl/PluginPanel.java | 166 ---- .../plugin/impl/UpdatePluginPanel.java | 72 -- .../plugin/impl/menu/PluginMenuAction.java | 56 -- .../spring/plugin-manager-context-osgi.xml | 20 - .../META-INF/spring/plugin-manager-context.xml | 15 - plugins-gui/pom.xml | 46 - .../raven/plugins/ui/AddPluginSiteFrame.java | 273 ----- .../plugins/ui/CheckForNoticeStartupHook.java | 143 --- .../raven/plugins/ui/CheckForUpdatesDialog.java | 122 --- .../plugins/ui/CheckForUpdatesStartupHook.java | 94 -- .../plugins/ui/PluginListCellRenderer.java | 214 ---- .../raven/plugins/ui/PluginListModel.java | 108 -- .../raven/plugins/ui/PluginManagerFrame.java | 516 ---------- .../plugins/ui/PluginRepositoryListener.java | 148 --- .../raven/plugins/ui/PluginSiteFrame.java | 542 ---------- .../raven/plugins/ui/UpdatesAvailableIcon.java | 205 ---- .../profile/ui/ProfileVersionCellRenderer.java | 177 ---- .../profile/ui/ProfileVersionListFrame.java | 260 ----- .../profile/ui/ProfileVersionListModel.java | 101 -- .../net.sf.taverna.t2.workbench.StartupSPI | 2 - .../spring/plugins-gui-context-osgi.xml | 11 - .../META-INF/spring/plugins-gui-context.xml | 8 - .../net/sf/taverna/raven/plugins/ui/update.png | Bin 689 -> 0 bytes .../raven/plugins/ui/updateRecommended.png | Bin 731 -> 0 bytes pom.xml | 117 --- renderers-impl/pom.xml | 65 -- .../t2/renderers/impl/AbstractRenderer.java | 124 --- .../renderers/impl/AdvancedImageRenderer.java | 94 -- .../t2/renderers/impl/ExtensionFileFilter.java | 77 -- .../t2/renderers/impl/HexBinaryRenderer.java | 77 -- .../t2/renderers/impl/RendererConstants.java | 13 - .../t2/renderers/impl/RendererRegistryImpl.java | 54 - .../taverna/t2/renderers/impl/TextRenderer.java | 137 --- .../t2/renderers/impl/TextRtfRenderer.java | 85 -- .../t2/renderers/impl/TextXMLRenderer.java | 86 -- .../sf/taverna/t2/renderers/impl/XMLTree.java | 329 ------ .../net.sf.taverna.t2.renderers.Renderer | 7 - .../spring/renderers-impl-context-osgi.xml | 19 - .../META-INF/spring/renderers-impl-context.xml | 17 - .../taverna/t2/renderers/TestRendererSPI.java | 154 --- report-impl/.classpath | 8 - report-impl/.project | 24 - .../.settings/org.eclipse.core.resources.prefs | 4 - .../.settings/org.eclipse.jdt.core.prefs | 5 - .../.settings/org.eclipse.m2e.core.prefs | 4 - report-impl/pom.xml | 40 - .../impl/ReportManagerConfigurationImpl.java | 71 -- .../report/impl/ReportManagerImpl.java | 564 ----------- .../spring/report-impl-context-osgi.xml | 23 - .../META-INF/spring/report-impl-context.xml | 21 - selection-impl/pom.xml | 35 - .../impl/DataflowSelectionModelImpl.java | 116 --- .../selection/impl/SelectionManagerImpl.java | 367 ------- .../spring/selection-impl-context-osgi.xml | 17 - .../META-INF/spring/selection-impl-context.xml | 12 - taverna-workbench-activity-palette-impl/pom.xml | 80 ++ .../impl/ServiceDescriptionConstants.java | 10 + .../impl/ServiceDescriptionDeserializer.java | 167 ++++ .../impl/ServiceDescriptionRegistryImpl.java | 652 ++++++++++++ .../impl/ServiceDescriptionSerializer.java | 102 ++ .../impl/ServiceDescriptionXMLConstants.java | 15 + .../ServiceDescriptionsConfigurationImpl.java | 92 ++ .../ActivityPaletteConfiguration.java | 81 ++ .../ActivityPaletteConfigurationPanel.java | 284 ++++++ .../ActivityPaletteConfigurationUIFactory.java | 52 + ...rkbench.configuration.ConfigurationUIFactory | 1 + .../activity-palette-impl-context-osgi.xml | 17 + .../spring/activity-palette-impl-context.xml | 23 + .../ActivityPaletteConfigurationTest.java | 97 ++ ...averna.t2.partition.PartitionAlgorithmSetSPI | 1 + ...sf.taverna.t2.partition.PropertyExtractorSPI | 3 + .../net.sf.taverna.t2.partition.QueryFactory | 2 + taverna-workbench-configuration-impl/pom.xml | 61 ++ .../WorkbenchConfigurationImpl.java | 210 ++++ .../WorkbenchConfigurationPanel.java | 266 +++++ .../WorkbenchConfigurationUIFactory.java | 52 + .../configuration/colour/ColourManagerImpl.java | 178 ++++ .../mimetype/MimeTypeManagerImpl.java | 82 ++ .../ui/T2ConfigurationFrameImpl.java | 205 ++++ .../ui/WorkbenchConfigurationMenu.java | 61 ++ .../ui/WorkbenchPreferencesSection.java | 36 + .../net.sf.taverna.t2.ui.menu.MenuComponent | 2 + ...rkbench.configuration.ConfigurationUIFactory | 1 + .../spring/configuration-impl-context-osgi.xml | 27 + .../spring/configuration-impl-context.xml | 34 + .../configuration/ConfigurationManagerTest.java | 109 ++ .../configuration/colour/ColourManagerTest.java | 90 ++ taverna-workbench-contextual-views-impl/pom.xml | 43 + .../impl/ContextualViewFactoryRegistryImpl.java | 75 ++ .../annotated/AnnotatedContextualView.java | 263 +++++ .../AnnotatedContextualViewFactory.java | 43 + .../condition/ConditionContextualView.java | 74 ++ .../ConditionContextualViewFactory.java | 51 + .../dataflow/DataflowContextualView.java | 108 ++ .../dataflow/DataflowContextualViewFactory.java | 41 + .../DataflowInputPortContextualView.java | 96 ++ .../DataflowInputPortContextualViewFactory.java | 54 + .../DataflowOutputPortContextualView.java | 106 ++ ...DataflowOutputPortContextualViewFactory.java | 55 + .../datalink/DatalinkContextualView.java | 106 ++ .../datalink/DatalinkContextualViewFactory.java | 55 + .../impl/ContextualViewComponent.java | 389 ++++++++ .../impl/ContextualViewComponentFactory.java | 64 ++ .../inputport/InputPortContextualView.java | 76 ++ .../InputPortContextualViewFactory.java | 48 + .../merge/MergeConfigurationAction.java | 79 ++ .../merge/MergeConfigurationView.java | 233 +++++ .../merge/MergeContextualView.java | 150 +++ .../merge/MergeContextualViewFactory.java | 66 ++ .../outputport/OutputPortContextualView.java | 76 ++ .../OutputPortContextualViewFactory.java | 48 + ...ntextualviews.activity.ContextualViewFactory | 9 + ....t2.workbench.ui.zaria.UIComponentFactorySPI | 1 + .../contextual-views-impl-context-osgi.xml | 31 + .../spring/contextual-views-impl-context.xml | 43 + .../annotatedcontextualview.properties | 4 + taverna-workbench-edits-impl/pom.xml | 49 + .../workbench/edits/impl/EditManagerImpl.java | 285 ++++++ .../edits/impl/menu/AbstractUndoAction.java | 166 ++++ .../edits/impl/menu/RedoMenuAction.java | 86 ++ .../edits/impl/menu/UndoMenuAction.java | 86 ++ .../edits/impl/menu/UndoMenuSection.java | 42 + .../edits/impl/toolbar/EditToolbarSection.java | 36 + .../edits/impl/toolbar/RedoToolbarAction.java | 46 + .../edits/impl/toolbar/UndoToolbarAction.java | 46 + .../net.sf.taverna.t2.ui.menu.MenuComponent | 6 + ...et.sf.taverna.t2.workbench.edits.EditManager | 1 + .../META-INF/spring/edits-impl-context-osgi.xml | 20 + .../META-INF/spring/edits-impl-context.xml | 33 + .../edits/impl/TestEditManagerImpl.java | 258 +++++ taverna-workbench-file-impl/pom.xml | 104 ++ .../DataflowFromDataflowPersistenceHandler.java | 49 + .../DataflowPersistenceHandlerRegistry.java | 238 +++++ .../workbench/file/impl/FileDataflowInfo.java | 67 ++ .../t2/workbench/file/impl/FileManagerImpl.java | 601 +++++++++++ .../workbench/file/impl/FileTypeFileFilter.java | 55 + .../workbench/file/impl/MultipleFileTypes.java | 58 ++ .../file/impl/OpenDataflowInProgressDialog.java | 88 ++ .../workbench/file/impl/OpenDataflowInfo.java | 93 ++ .../file/impl/OpenDataflowRunnable.java | 71 ++ .../file/impl/OpenDataflowSwingWorker.java | 67 ++ .../workbench/file/impl/T2DataflowOpener.java | 144 +++ .../t2/workbench/file/impl/T2FileFilter.java | 40 + .../t2/workbench/file/impl/T2FlowFileType.java | 42 + .../file/impl/WorkflowBundleFileFilter.java | 40 + .../file/impl/WorkflowBundleFileType.java | 42 + .../file/impl/WorkflowBundleOpener.java | 143 +++ .../file/impl/WorkflowBundleSaver.java | 145 +++ .../impl/actions/CloseAllWorkflowsAction.java | 85 ++ .../file/impl/actions/CloseWorkflowAction.java | 107 ++ .../file/impl/actions/NewWorkflowAction.java | 58 ++ .../impl/actions/OpenNestedWorkflowAction.java | 76 ++ .../file/impl/actions/OpenWorkflowAction.java | 395 ++++++++ .../impl/actions/OpenWorkflowFromURLAction.java | 139 +++ .../file/impl/actions/PasswordInput.java | 221 ++++ .../impl/actions/SaveAllWorkflowsAction.java | 104 ++ .../file/impl/actions/SaveWorkflowAction.java | 175 ++++ .../file/impl/actions/SaveWorkflowAsAction.java | 219 ++++ .../impl/hooks/CloseWorkflowsOnShutdown.java | 56 ++ .../file/impl/menu/FileCloseAllMenuAction.java | 51 + .../file/impl/menu/FileCloseMenuAction.java | 50 + .../file/impl/menu/FileNewMenuAction.java | 47 + .../impl/menu/FileOpenFromURLMenuAction.java | 48 + .../file/impl/menu/FileOpenMenuAction.java | 47 + .../file/impl/menu/FileOpenMenuSection.java | 36 + .../impl/menu/FileOpenRecentMenuAction.java | 418 ++++++++ .../file/impl/menu/FileSaveAllMenuAction.java | 47 + .../file/impl/menu/FileSaveAsMenuAction.java | 43 + .../file/impl/menu/FileSaveMenuAction.java | 46 + .../file/impl/menu/FileSaveMenuSection.java | 36 + .../workbench/file/impl/menu/WorkflowsMenu.java | 163 +++ .../file/impl/toolbar/CloseToolbarAction.java | 55 + .../impl/toolbar/FileToolbarMenuSection.java | 36 + .../file/impl/toolbar/NewToolbarAction.java | 47 + .../file/impl/toolbar/OpenToolbarAction.java | 47 + .../OpenWorkflowFromURLToolbarAction.java | 47 + .../file/impl/toolbar/SaveToolbarAction.java | 50 + .../net.sf.taverna.t2.ui.menu.MenuComponent | 20 + .../net.sf.taverna.t2.workbench.ShutdownSPI | 1 + ...t2.workbench.file.DataflowPersistenceHandler | 2 + ...net.sf.taverna.t2.workbench.file.FileManager | 1 + .../META-INF/spring/file-impl-context-osgi.xml | 100 ++ .../META-INF/spring/file-impl-context.xml | 123 +++ .../t2/workbench/file/impl/FileManagerTest.java | 385 +++++++ .../workbench/file/impl/dummy-workflow.t2flow | 157 +++ taverna-workbench-helper/pom.xml | 19 + taverna-workbench-httpproxy-config/pom.xml | 30 + .../config/HttpProxyConfigurationPanel.java | 582 +++++++++++ .../config/HttpProxyConfigurationUIFactory.java | 56 ++ ...rkbench.configuration.ConfigurationUIFactory | 1 + .../spring/httpproxy-config-context-osgi.xml | 13 + .../spring/httpproxy-config-context.xml | 10 + taverna-workbench-menu-impl/pom.xml | 66 ++ .../t2/ui/menu/impl/MenuManagerImpl.java | 880 ++++++++++++++++ .../t2/workbench/ui/impl/menu/AdvancedMenu.java | 44 + .../t2/workbench/ui/impl/menu/EditMenu.java | 43 + .../ui/impl/menu/FeedbackMenuAction.java | 75 ++ .../t2/workbench/ui/impl/menu/FileMenu.java | 48 + .../t2/workbench/ui/impl/menu/HelpMenu.java | 44 + .../ui/impl/menu/OnlineHelpMenuAction.java | 68 ++ .../ui/impl/menu/ShowLogsAndDataMenuAction.java | 89 ++ .../ui/impl/menu/ViewShowMenuSection.java | 40 + .../net.sf.taverna.t2.ui.menu.MenuManager | 1 + .../META-INF/spring/menu-impl-context-osgi.xml | 26 + .../META-INF/spring/menu-impl-context.xml | 25 + taverna-workbench-plugin-manager/pom.xml | 49 + .../plugin/impl/AvailablePluginPanel.java | 72 ++ .../plugin/impl/InstalledPluginPanel.java | 66 ++ .../plugin/impl/PluginManagerPanel.java | 210 ++++ .../plugin/impl/PluginManagerView.java | 71 ++ .../t2/workbench/plugin/impl/PluginPanel.java | 166 ++++ .../plugin/impl/UpdatePluginPanel.java | 72 ++ .../plugin/impl/menu/PluginMenuAction.java | 56 ++ .../spring/plugin-manager-context-osgi.xml | 20 + .../META-INF/spring/plugin-manager-context.xml | 15 + taverna-workbench-plugins-gui/pom.xml | 46 + .../raven/plugins/ui/AddPluginSiteFrame.java | 273 +++++ .../plugins/ui/CheckForNoticeStartupHook.java | 143 +++ .../raven/plugins/ui/CheckForUpdatesDialog.java | 122 +++ .../plugins/ui/CheckForUpdatesStartupHook.java | 94 ++ .../plugins/ui/PluginListCellRenderer.java | 214 ++++ .../raven/plugins/ui/PluginListModel.java | 108 ++ .../raven/plugins/ui/PluginManagerFrame.java | 516 ++++++++++ .../plugins/ui/PluginRepositoryListener.java | 148 +++ .../raven/plugins/ui/PluginSiteFrame.java | 542 ++++++++++ .../raven/plugins/ui/UpdatesAvailableIcon.java | 205 ++++ .../profile/ui/ProfileVersionCellRenderer.java | 177 ++++ .../profile/ui/ProfileVersionListFrame.java | 260 +++++ .../profile/ui/ProfileVersionListModel.java | 101 ++ .../net.sf.taverna.t2.workbench.StartupSPI | 2 + .../spring/plugins-gui-context-osgi.xml | 11 + .../META-INF/spring/plugins-gui-context.xml | 8 + .../net/sf/taverna/raven/plugins/ui/update.png | Bin 0 -> 689 bytes .../raven/plugins/ui/updateRecommended.png | Bin 0 -> 731 bytes taverna-workbench-renderers-impl/pom.xml | 65 ++ .../t2/renderers/impl/AbstractRenderer.java | 124 +++ .../renderers/impl/AdvancedImageRenderer.java | 94 ++ .../t2/renderers/impl/ExtensionFileFilter.java | 77 ++ .../t2/renderers/impl/HexBinaryRenderer.java | 77 ++ .../t2/renderers/impl/RendererConstants.java | 13 + .../t2/renderers/impl/RendererRegistryImpl.java | 54 + .../taverna/t2/renderers/impl/TextRenderer.java | 137 +++ .../t2/renderers/impl/TextRtfRenderer.java | 85 ++ .../t2/renderers/impl/TextXMLRenderer.java | 86 ++ .../sf/taverna/t2/renderers/impl/XMLTree.java | 329 ++++++ .../net.sf.taverna.t2.renderers.Renderer | 7 + .../spring/renderers-impl-context-osgi.xml | 19 + .../META-INF/spring/renderers-impl-context.xml | 17 + .../taverna/t2/renderers/TestRendererSPI.java | 154 +++ taverna-workbench-report-impl/pom.xml | 40 + .../impl/ReportManagerConfigurationImpl.java | 71 ++ .../report/impl/ReportManagerImpl.java | 564 +++++++++++ .../spring/report-impl-context-osgi.xml | 23 + .../META-INF/spring/report-impl-context.xml | 21 + taverna-workbench-selection-impl/pom.xml | 35 + .../impl/DataflowSelectionModelImpl.java | 116 +++ .../selection/impl/SelectionManagerImpl.java | 367 +++++++ .../spring/selection-impl-context-osgi.xml | 17 + .../META-INF/spring/selection-impl-context.xml | 12 + taverna-workbench-update-manager/pom.xml | 26 + .../update/impl/UpdateManagerView.java | 45 + .../update/impl/menu/UpdateMenuAction.java | 92 ++ .../updatemanager/PluginMenuAction.java | 52 + .../UpdatesAvailableMenuAction.java | 19 + .../updatemanager/UpdatesToolbarSection.java | 16 + .../spring/update-manager-context-osgi.xml | 13 + .../META-INF/spring/update-manager-context.xml | 12 + taverna-workbench-workbench-impl/pom.xml | 116 +++ .../ui/impl/DataflowEditsListener.java | 93 ++ .../t2/workbench/ui/impl/LoggerStream.java | 136 +++ .../ui/impl/SetConsoleLoggerStartup.java | 62 ++ .../ui/impl/StoreWindowStateOnShutdown.java | 58 ++ .../workbench/ui/impl/UserRegistrationData.java | 105 ++ .../workbench/ui/impl/UserRegistrationForm.java | 995 +++++++++++++++++++ .../workbench/ui/impl/UserRegistrationHook.java | 163 +++ .../t2/workbench/ui/impl/WorkbenchImpl.java | 538 ++++++++++ .../ui/impl/WorkbenchPerspectives.java | 229 +++++ .../t2/workbench/ui/impl/menu/ExitAction.java | 66 ++ .../net.sf.taverna.raven.launcher.Launchable | 1 + .../net.sf.taverna.t2.ui.menu.MenuComponent | 18 + .../net.sf.taverna.t2.workbench.ShutdownSPI | 1 + .../net.sf.taverna.t2.workbench.StartupSPI | 2 + .../spring/workbench-impl-context-osgi.xml | 38 + .../META-INF/spring/workbench-impl-context.xml | 43 + .../src/main/resources/Map.jhm | 28 + .../resources/example-registration-form.xml | 12 + .../src/main/resources/registration-form.xsd | 27 + .../src/main/resources/registration.php | 137 +++ .../src/main/resources/sample.hs | 64 ++ .../workbench/ui/impl/UserRegistrationTest.java | 190 ++++ .../src/test/resources/log4j.properties | 10 + update-manager/pom.xml | 26 - .../update/impl/UpdateManagerView.java | 45 - .../update/impl/menu/UpdateMenuAction.java | 92 -- .../updatemanager/PluginMenuAction.java | 52 - .../UpdatesAvailableMenuAction.java | 19 - .../updatemanager/UpdatesToolbarSection.java | 16 - .../spring/update-manager-context-osgi.xml | 13 - .../META-INF/spring/update-manager-context.xml | 12 - workbench-impl/pom.xml | 116 --- .../ui/impl/DataflowEditsListener.java | 93 -- .../t2/workbench/ui/impl/LoggerStream.java | 136 --- .../ui/impl/SetConsoleLoggerStartup.java | 62 -- .../ui/impl/StoreWindowStateOnShutdown.java | 58 -- .../workbench/ui/impl/UserRegistrationData.java | 105 -- .../workbench/ui/impl/UserRegistrationForm.java | 995 ------------------- .../workbench/ui/impl/UserRegistrationHook.java | 163 --- .../t2/workbench/ui/impl/WorkbenchImpl.java | 538 ---------- .../ui/impl/WorkbenchPerspectives.java | 229 ----- .../t2/workbench/ui/impl/menu/ExitAction.java | 66 -- .../net.sf.taverna.raven.launcher.Launchable | 1 - .../net.sf.taverna.t2.ui.menu.MenuComponent | 18 - .../net.sf.taverna.t2.workbench.ShutdownSPI | 1 - .../net.sf.taverna.t2.workbench.StartupSPI | 2 - .../spring/workbench-impl-context-osgi.xml | 38 - .../META-INF/spring/workbench-impl-context.xml | 43 - workbench-impl/src/main/resources/Map.jhm | 28 - .../resources/example-registration-form.xml | 12 - .../src/main/resources/registration-form.xsd | 27 - .../src/main/resources/registration.php | 137 --- workbench-impl/src/main/resources/sample.hs | 64 -- .../workbench/ui/impl/UserRegistrationTest.java | 190 ---- .../src/test/resources/log4j.properties | 10 - 481 files changed, 24503 insertions(+), 24693 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/72850d5a/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index aac2abc..0000000 --- a/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -# ignore project files # -.classpath -.project -.settings/ -catalog-v001.xml - -# ignore target files # -target/ -bin/ -build/ -dist/ -apidoc/ -*.swp - -# ignore svn files if there -.svn - -# ignore log files # -*.log -/logs/* -*/logs/* - - - http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/72850d5a/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index dff5f3a..0000000 --- a/.travis.yml +++ /dev/null @@ -1 +0,0 @@ -language: java http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/72850d5a/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md deleted file mode 100644 index 745c341..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -Taverna Workflow system Workbench User Interface components - -This code was previously hosted at hhttp://taverna.googlecode.com/svn/taverna/ui/net.sf.taverna.t2.ui-impl/ \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/72850d5a/activity-palette-impl/pom.xml ---------------------------------------------------------------------- diff --git a/activity-palette-impl/pom.xml b/activity-palette-impl/pom.xml deleted file mode 100644 index 4926a94..0000000 --- a/activity-palette-impl/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - 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>ui-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </parent> - <groupId>net.sf.taverna.t2.ui-impl</groupId> - <artifactId>activity-palette-impl</artifactId> - <packaging>bundle</packaging> - <name>Activity Palette Impl</name> - <description>Activity Palette Implementation</description> - <dependencies> - <dependency> - <groupId>net.sf.taverna.t2.ui-api</groupId> - <artifactId>activity-palette-api</artifactId> - <version>${t2.ui.api.version}</version> - </dependency> - <dependency> - <groupId>net.sf.taverna.t2.core</groupId> - <artifactId>workflowmodel-api</artifactId> - <version>${t2.core.version}</version> - </dependency> - <dependency> - <groupId>net.sf.taverna.t2.lang</groupId> - <artifactId>observer</artifactId> - <version>${t2.lang.version}</version> - </dependency> - <dependency> - <groupId>uk.org.taverna.configuration</groupId> - <artifactId>taverna-configuration-api</artifactId> - <version>${taverna.configuration.version}</version> - </dependency> - <dependency> - <groupId>uk.org.taverna.configuration</groupId> - <artifactId>taverna-app-configuration-api</artifactId> - <version>${taverna.configuration.version}</version> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>com.springsource.org.jdom</artifactId> - </dependency> - - <!-- TODO Remove non-test impl dependency --> - <dependency> - <groupId>net.sf.taverna.t2.core</groupId> - <artifactId>workflowmodel-impl</artifactId> - <version>${t2.core.version}</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>uk.org.taverna.configuration</groupId> - <artifactId>taverna-configuration-impl</artifactId> - <version>${taverna.configuration.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>uk.org.taverna.configuration</groupId> - <artifactId>taverna-app-configuration-impl</artifactId> - <version>${taverna.configuration.version}</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/72850d5a/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionConstants.java ---------------------------------------------------------------------- diff --git a/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionConstants.java b/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionConstants.java deleted file mode 100644 index c5221be..0000000 --- a/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionConstants.java +++ /dev/null @@ -1,10 +0,0 @@ -package net.sf.taverna.t2.servicedescriptions.impl; - -public interface ServiceDescriptionConstants { - String SERVICE_PANEL_CONFIGURATION = "servicePanelConfiguration"; - String PROVIDERS = "providers"; - String IGNORED = "ignored"; - String PROVIDER_ID = "providerID"; - String CONFIGURATION = "configuration"; - String TYPE = "type"; -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/72850d5a/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionDeserializer.java ---------------------------------------------------------------------- diff --git a/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionDeserializer.java b/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionDeserializer.java deleted file mode 100644 index 0a40bda..0000000 --- a/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionDeserializer.java +++ /dev/null @@ -1,167 +0,0 @@ -package net.sf.taverna.t2.servicedescriptions.impl; - -import static net.sf.taverna.t2.servicedescriptions.impl.ServiceDescriptionConstants.CONFIGURATION; -import static net.sf.taverna.t2.servicedescriptions.impl.ServiceDescriptionConstants.IGNORED; -import static net.sf.taverna.t2.servicedescriptions.impl.ServiceDescriptionConstants.PROVIDERS; -import static net.sf.taverna.t2.servicedescriptions.impl.ServiceDescriptionConstants.PROVIDER_ID; -import static net.sf.taverna.t2.servicedescriptions.impl.ServiceDescriptionConstants.TYPE; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import uk.org.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; - -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; - -class ServiceDescriptionDeserializer { - private List<ServiceDescriptionProvider> serviceDescriptionProviders; - - ServiceDescriptionDeserializer( - List<ServiceDescriptionProvider> serviceDescriptionProviders) { - this.serviceDescriptionProviders = serviceDescriptionProviders; - } - - public void deserialize(ServiceDescriptionRegistry registry, - File serviceDescriptionsFile) throws DeserializationException { - try (FileInputStream serviceDescriptionFileStream = new FileInputStream( - serviceDescriptionsFile)) { - deserialize(registry, serviceDescriptionFileStream); - } catch (FileNotFoundException ex) { - throw new DeserializationException("Could not locate file " - + serviceDescriptionsFile.getAbsolutePath() - + " containing service descriptions."); - } catch (IOException ex) { - throw new DeserializationException( - "Could not read stream containing service descriptions from " - + serviceDescriptionsFile.getAbsolutePath(), ex); - } - } - - public void deserialize(ServiceDescriptionRegistry registry, - URL serviceDescriptionsURL) throws DeserializationException { - try (InputStream serviceDescriptionInputStream = serviceDescriptionsURL - .openStream()) { - deserialize(registry, serviceDescriptionInputStream); - } catch (FileNotFoundException ex) { - throw new DeserializationException("Could not open URL " - + serviceDescriptionsURL - + " containing service descriptions."); - } catch (IOException ex) { - throw new DeserializationException( - "Could not read stream containing service descriptions from " - + serviceDescriptionsURL, ex); - } - } - - private static final JsonFactory factory = new JsonFactory(); - - private void deserialize(ServiceDescriptionRegistry registry, - InputStream serviceDescriptionsInputStream) throws IOException, - DeserializationException { - ObjectNode node = (ObjectNode) new ObjectMapper(factory) - .readTree(serviceDescriptionsInputStream); - List<ServiceDescriptionProvider> providers = deserializeProviders(node, - true); - for (ServiceDescriptionProvider provider : providers) - registry.addServiceDescriptionProvider(provider); - } - - public Collection<? extends ServiceDescriptionProvider> deserializeDefaults( - ServiceDescriptionRegistry registry, - File defaultConfigurableServiceProvidersFile) - throws DeserializationException { - ObjectNode node; - try (FileInputStream serviceDescriptionStream = new FileInputStream( - defaultConfigurableServiceProvidersFile)) { - node = (ObjectNode) new ObjectMapper(factory) - .readTree(serviceDescriptionStream); - } catch (IOException e) { - throw new DeserializationException("Can't read " - + defaultConfigurableServiceProvidersFile); - } - return deserializeProviders(node, false); - } - - private List<ServiceDescriptionProvider> deserializeProviders( - ObjectNode rootNode, boolean obeyIgnored) - throws DeserializationException { - List<ServiceDescriptionProvider> providers = new ArrayList<>(); - - ArrayNode providersNode = (ArrayNode) rootNode.get(PROVIDERS); - if (providersNode != null) - for (JsonNode provider : providersNode) - providers.add(deserializeProvider((ObjectNode) provider)); - - if (obeyIgnored) { - ArrayNode ignoredNode = (ArrayNode) rootNode.get(IGNORED); - if (ignoredNode != null) - for (JsonNode provider : ignoredNode) - providers - .remove(deserializeProvider((ObjectNode) provider)); - } - - return providers; - } - - private ServiceDescriptionProvider deserializeProvider( - ObjectNode providerNode) throws DeserializationException { - String providerId = providerNode.get(PROVIDER_ID).asText().trim(); - ServiceDescriptionProvider provider = null; - for (ServiceDescriptionProvider serviceProvider : serviceDescriptionProviders) - if (serviceProvider.getId().equals(providerId)) { - provider = serviceProvider; - break; - } - if (provider == null) - throw new DeserializationException( - "Could not find provider with id " + providerId); - - /* - * So we know the service provider now, but we need a separate instance - * of that provider for each providerElem. E.g. we can have 2 or more - * WSDL provider elements and need to return a separate provider - * instance for each as they will have different configurations. - */ - ServiceDescriptionProvider instance = provider.newInstance(); - - if (instance instanceof ConfigurableServiceProvider) - try { - Configuration config = new Configuration(); - config.setType(URI.create(providerNode.get(TYPE).textValue())); - config.setJson(providerNode.get(CONFIGURATION)); - if (config != null) - ((ConfigurableServiceProvider) instance).configure(config); - } catch (Exception e) { - throw new DeserializationException( - "Could not configure provider " + providerId - + " using bean " + providerNode, e); - } - return instance; - } - - @SuppressWarnings("serial") - static class DeserializationException extends Exception { - public DeserializationException(String string) { - super(string); - } - - public DeserializationException(String string, Exception ex) { - super(string, ex); - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/72850d5a/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionRegistryImpl.java ---------------------------------------------------------------------- diff --git a/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionRegistryImpl.java b/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionRegistryImpl.java deleted file mode 100644 index 9dc3f00..0000000 --- a/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionRegistryImpl.java +++ /dev/null @@ -1,652 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2007 The University of Manchester - * - * Modifications to the initial code base are copyright of their - * respective authors, or their employers as appropriate. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - ******************************************************************************/ -package net.sf.taverna.t2.servicedescriptions.impl; - -import static java.lang.System.currentTimeMillis; -import static java.lang.Thread.MIN_PRIORITY; -import static java.lang.Thread.currentThread; - -import java.io.File; -import java.io.IOException; -import java.lang.Thread.UncaughtExceptionHandler; -import java.lang.reflect.InvocationTargetException; -import java.net.URI; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -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 net.sf.taverna.t2.servicedescriptions.ConfigurableServiceProvider; -import net.sf.taverna.t2.servicedescriptions.ServiceDescription; -import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionProvider; -import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionsConfiguration; -import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionProvider.FindServiceDescriptionsCallBack; -import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry; -import net.sf.taverna.t2.servicedescriptions.events.AddedProviderEvent; -import net.sf.taverna.t2.servicedescriptions.events.PartialServiceDescriptionsNotification; -import net.sf.taverna.t2.servicedescriptions.events.ProviderErrorNotification; -import net.sf.taverna.t2.servicedescriptions.events.ProviderStatusNotification; -import net.sf.taverna.t2.servicedescriptions.events.ProviderUpdatingNotification; -import net.sf.taverna.t2.servicedescriptions.events.ProviderWarningNotification; -import net.sf.taverna.t2.servicedescriptions.events.RemovedProviderEvent; -import net.sf.taverna.t2.servicedescriptions.events.ServiceDescriptionProvidedEvent; -import net.sf.taverna.t2.servicedescriptions.events.ServiceDescriptionRegistryEvent; -import net.sf.taverna.t2.servicedescriptions.impl.ServiceDescriptionDeserializer.DeserializationException; - -import org.apache.commons.beanutils.BeanUtils; -import org.apache.log4j.Logger; - -import uk.org.taverna.configuration.app.ApplicationConfiguration; - -public class ServiceDescriptionRegistryImpl implements ServiceDescriptionRegistry { - /** - * If a writable property of this name on a provider exists (ie. the provider has a method - * setServiceDescriptionRegistry(ServiceDescriptionRegistry registry) - then this property will - * be set to the current registry. - */ - public static final String SERVICE_DESCRIPTION_REGISTRY = "serviceDescriptionRegistry"; - public static Logger logger = Logger.getLogger(ServiceDescriptionRegistryImpl.class); - public static final ThreadGroup threadGroup = new ThreadGroup("Service description providers"); - /** - * Total maximum timeout while waiting for description threads to finish - */ - private static final long DESCRIPTION_THREAD_TIMEOUT_MS = 3000; - protected static final String CONF_DIR = "conf"; - protected static final String SERVICE_PROVIDERS_FILENAME = "service_providers.xml"; - private static final String DEFAULT_CONFIGURABLE_SERVICE_PROVIDERS_FILENAME = "default_service_providers.xml"; - - private ServiceDescriptionsConfiguration serviceDescriptionsConfig; - private ApplicationConfiguration applicationConfiguration; - /** - * <code>false</code> until first call to {@link #loadServiceProviders()} - which is done by - * first call to {@link #getServiceDescriptionProviders()}. - */ - private boolean hasLoadedProviders = false; - /** - * <code>true</code> while {@link #loadServiceProviders(File)}, - * {@link #loadServiceProviders(URL)} or {@link #loadServiceProviders()} is in progress, avoids - * triggering {@link #saveServiceDescriptions()} on - * {@link #addServiceDescriptionProvider(ServiceDescriptionProvider)} calls. - */ - private boolean loading = false; - private MultiCaster<ServiceDescriptionRegistryEvent> observers = new MultiCaster<>(this); - private List<ServiceDescriptionProvider> serviceDescriptionProviders; - private Set<ServiceDescriptionProvider> allServiceProviders; - private Map<ServiceDescriptionProvider, Set<ServiceDescription>> providerDescriptions = new HashMap<>(); - private Map<ServiceDescriptionProvider, Thread> serviceDescriptionThreads = new HashMap<>(); - /** - * Service providers added by the user, should be saved - */ - private Set<ServiceDescriptionProvider> userAddedProviders = new HashSet<>(); - private Set<ServiceDescriptionProvider> userRemovedProviders = new HashSet<>(); - private Set<ServiceDescriptionProvider> defaultServiceDescriptionProviders; - /** - * File containing a list of configured ConfigurableServiceProviders which is used to get the - * default set of service descriptions together with those provided by AbstractTemplateServiceS. - * This file is located in the conf directory of the Taverna startup directory. - */ - private File defaultConfigurableServiceProvidersFile; - private boolean defaultSystemConfigurableProvidersLoaded = false; - - static { - threadGroup.setMaxPriority(MIN_PRIORITY); - } - - public ServiceDescriptionRegistryImpl( - ApplicationConfiguration applicationConfiguration) { - this.applicationConfiguration = applicationConfiguration; - defaultConfigurableServiceProvidersFile = new File( - getTavernaStartupConfigurationDirectory(), - DEFAULT_CONFIGURABLE_SERVICE_PROVIDERS_FILENAME); - } - - /** - * Get the Taverna distribution (startup) configuration directory. - */ - private File getTavernaStartupConfigurationDirectory() { - File distroHome = null; - File configDirectory = null; - distroHome = applicationConfiguration.getStartupDir(); - configDirectory = new File(distroHome, "conf"); - if (!configDirectory.exists()) - configDirectory.mkdir(); - return configDirectory; - } - - private static void joinThreads(Collection<? extends Thread> threads, - long descriptionThreadTimeoutMs) { - long finishJoinBy = currentTimeMillis() + descriptionThreadTimeoutMs; - for (Thread thread : threads) { - // No shorter timeout than 1 ms (thread.join(0) waits forever!) - long timeout = Math.max(1, finishJoinBy - currentTimeMillis()); - try { - thread.join(timeout); - } catch (InterruptedException e) { - currentThread().interrupt(); - return; - } - if (thread.isAlive()) - logger.debug("Thread did not finish " + thread); - } - } - - - @Override - public void addObserver(Observer<ServiceDescriptionRegistryEvent> observer) { - observers.addObserver(observer); - } - - @Override - public void addServiceDescriptionProvider(ServiceDescriptionProvider provider) { - synchronized (this) { - userRemovedProviders.remove(provider); - if (!getDefaultServiceDescriptionProviders().contains(provider)) - userAddedProviders.add(provider); - allServiceProviders.add(provider); - } - - // Spring-like auto-config - try { - // BeanUtils should ignore this if provider does not have that property - BeanUtils.setProperty(provider, SERVICE_DESCRIPTION_REGISTRY, this); - } catch (IllegalAccessException | InvocationTargetException e) { - logger.warn("Could not set serviceDescriptionRegistry on " - + provider, e); - } - - if (!loading) - saveServiceDescriptions(); - observers.notify(new AddedProviderEvent(provider)); - updateServiceDescriptions(false, false); - } - - private File findServiceDescriptionsFile() { - File confDir = new File( - applicationConfiguration.getApplicationHomeDir(), CONF_DIR); - confDir.mkdirs(); - if (!confDir.isDirectory()) - throw new RuntimeException("Invalid directory: " + confDir); - File serviceDescriptionsFile = new File(confDir, - SERVICE_PROVIDERS_FILENAME); - return serviceDescriptionsFile; - } - - @Override - public List<Observer<ServiceDescriptionRegistryEvent>> getObservers() { - return observers.getObservers(); - } - - // Fallback to this method that uses hardcoded default services if you cannot read them from - // the file. -// @SuppressWarnings("unchecked") -// public synchronized Set<ServiceDescriptionProvider> getDefaultServiceDescriptionProvidersFallback() { -// /*if (defaultServiceDescriptionProviders != null) { -// return defaultServiceDescriptionProviders; -// } -// defaultServiceDescriptionProviders = new HashSet<ServiceDescriptionProvider>(); -// */ -// for (ServiceDescriptionProvider provider : serviceDescriptionProviders) { -// -// /* We do not need these - already loaded them from getDefaultServiceDescriptionProviders() -// if (!(provider instanceof ConfigurableServiceProvider)) { -// defaultServiceDescriptionProviders.add(provider); -// continue; -// }*/ -// -// // Just load the hard coded default configurable service providers -// if (provider instanceof ConfigurableServiceProvider){ -// ConfigurableServiceProvider<Object> template = ((ConfigurableServiceProvider<Object>) -// provider); -// // Get configurations -// List<Object> configurables = template.getDefaultConfigurations(); -// for (Object config : configurables) { -// // Make a copy that we can configure -// ConfigurableServiceProvider<Object> configurableProvider = template.clone(); -// try { -// configurableProvider.configure(config); -// } catch (ConfigurationException e) { -// logger.warn("Can't configure provider " -// + configurableProvider + " with " + config); -// continue; -// } -// defaultServiceDescriptionProviders.add(configurableProvider); -// } -// } -// } -// return defaultServiceDescriptionProviders; -// } - - // Get the default services. - @Override - public synchronized Set<ServiceDescriptionProvider> getDefaultServiceDescriptionProviders() { - if (defaultServiceDescriptionProviders != null) - return defaultServiceDescriptionProviders; - defaultServiceDescriptionProviders = new HashSet<>(); - - /* - * Add default configurable service description providers from the - * default_service_providers.xml file - */ - if (defaultConfigurableServiceProvidersFile.exists()) { - try { - ServiceDescriptionDeserializer deserializer = new ServiceDescriptionDeserializer( - serviceDescriptionProviders); - defaultServiceDescriptionProviders.addAll(deserializer - .deserializeDefaults(this, - defaultConfigurableServiceProvidersFile)); - /* - * We have successfully loaded the defaults for system - * configurable providers. Note that there are still defaults - * for third party configurable providers, which will be loaded - * below using getDefaultConfigurations(). - */ - defaultSystemConfigurableProvidersLoaded = true; - } catch (Exception e) { - logger.error("Could not load default service providers from " - + defaultConfigurableServiceProvidersFile.getAbsolutePath(), e); - - /* - * Fallback on the old hardcoded method of loading default - * system configurable service providers using - * getDefaultConfigurations(). - */ - defaultSystemConfigurableProvidersLoaded = false; - } - } else { - logger.warn("Could not find the file " - + defaultConfigurableServiceProvidersFile.getAbsolutePath() - + " containing default system service providers. " - + "Using the hardcoded list of default system providers."); - - /* - * Fallback on the old hardcoded method of loading default system - * configurable service providers using getDefaultConfigurations(). - */ - defaultSystemConfigurableProvidersLoaded = false; - } - - /* - * Load other default service description providers - template, local - * workers and third party configurable service providers - */ - for (ServiceDescriptionProvider provider : serviceDescriptionProviders) { - /* - * Template service providers (beanshell, string constant, etc. ) - * and providers of local workers. - */ - if (!(provider instanceof ConfigurableServiceProvider)) { - defaultServiceDescriptionProviders.add(provider); - continue; - } - - /* - * Default system or third party configurable service description - * provider. System ones are read from the - * default_service_providers.xml file so getDefaultConfigurations() - * on them will not have much effect here unless - * defaultSystemConfigurableProvidersLoaded is set to false. - */ - //FIXME needs to be designed to work using Configuration instances - //FIXME needs to get configurations via OSGi discovery - /* - ConfigurableServiceProvider template = (ConfigurableServiceProvider) provider; - // Get configurations - for (ObjectNode config : template.getDefaultConfigurations()) { - // Make a copy that we can configure - ConfigurableServiceProvider configurableProvider = template.clone(); - try { - configurableProvider.configure(config); - } catch (ConfigurationException e) { - logger.warn("Can't configure provider " - + configurableProvider + " with " + config); - continue; - } - defaultServiceDescriptionProviders.add(configurableProvider); - } - */ - } - - return defaultServiceDescriptionProviders; - } - - @Override - public synchronized Set<ServiceDescriptionProvider> getServiceDescriptionProviders() { - if (allServiceProviders != null) - return new HashSet<>(allServiceProviders); - allServiceProviders = new HashSet<>(userAddedProviders); - synchronized (this) { - if (!hasLoadedProviders) - try { - loadServiceProviders(); - } catch (Exception e) { - logger.error("Could not load service providers", e); - } finally { - hasLoadedProviders = true; - } - } - for (ServiceDescriptionProvider provider : getDefaultServiceDescriptionProviders()) { - if (userRemovedProviders.contains(provider)) - continue; - if (provider instanceof ConfigurableServiceProvider - && !serviceDescriptionsConfig.isIncludeDefaults()) - // We'll skip the default configurable service provders - continue; - allServiceProviders.add(provider); - } - return new HashSet<>(allServiceProviders); - } - - @Override - public Set<ServiceDescriptionProvider> getServiceDescriptionProviders( - ServiceDescription sd) { - Set<ServiceDescriptionProvider> result = new HashSet<>(); - for (ServiceDescriptionProvider sdp : providerDescriptions.keySet()) - if (providerDescriptions.get(sdp).contains(sd)) - result.add(sdp); - return result; - } - - @Override - public Set<ServiceDescription> getServiceDescriptions() { - updateServiceDescriptions(false, true); - Set<ServiceDescription> serviceDescriptions = new HashSet<>(); - synchronized (providerDescriptions) { - for (Set<ServiceDescription> providerDesc : providerDescriptions - .values()) - serviceDescriptions.addAll(providerDesc); - } - return serviceDescriptions; - } - - @Override - public ServiceDescription getServiceDescription(URI serviceType) { - for (ServiceDescription serviceDescription : getServiceDescriptions()) - if (serviceDescription.getActivityType().equals(serviceType)) - return serviceDescription; - return null; - } - - @Override - public List<ConfigurableServiceProvider> getUnconfiguredServiceProviders() { - List<ConfigurableServiceProvider> providers = new ArrayList<>(); - for (ServiceDescriptionProvider provider : serviceDescriptionProviders) - if (provider instanceof ConfigurableServiceProvider) - providers.add((ConfigurableServiceProvider) provider); - return providers; - } - - @Override - public Set<ServiceDescriptionProvider> getUserAddedServiceProviders() { - return new HashSet<>(userAddedProviders); - } - - @Override - public Set<ServiceDescriptionProvider> getUserRemovedServiceProviders() { - return new HashSet<>(userRemovedProviders); - } - - @Override - public void loadServiceProviders() { - File serviceProviderFile = findServiceDescriptionsFile(); - if (serviceProviderFile.isFile()) - loadServiceProviders(serviceProviderFile); - hasLoadedProviders = true; - } - - @Override - public void loadServiceProviders(File serviceProvidersFile) { - ServiceDescriptionDeserializer deserializer = new ServiceDescriptionDeserializer( - serviceDescriptionProviders); - loading = true; - try { - deserializer.deserialize(this, serviceProvidersFile); - } catch (DeserializationException e) { - logger.error("failed to deserialize configuration", e); - } - loading = false; - } - - @Override - public void loadServiceProviders(URL serviceProvidersURL) { - ServiceDescriptionDeserializer deserializer = new ServiceDescriptionDeserializer( - serviceDescriptionProviders); - loading = true; - try { - deserializer.deserialize(this, serviceProvidersURL); - } catch (DeserializationException e) { - logger.error("failed to deserialize configuration", e); - } - loading = false; - } - - @Override - public void refresh() { - updateServiceDescriptions(true, false); - } - - @Override - public void removeObserver(Observer<ServiceDescriptionRegistryEvent> observer) { - observers.removeObserver(observer); - } - - @Override - public synchronized void removeServiceDescriptionProvider( - ServiceDescriptionProvider provider) { - if (!userAddedProviders.remove(provider)) - // Not previously added - must be a default one.. but should we remove it? - if (loading || serviceDescriptionsConfig.isRemovePermanently() - && serviceDescriptionsConfig.isIncludeDefaults()) - userRemovedProviders.add(provider); - if (allServiceProviders.remove(provider)) { - synchronized (providerDescriptions) { - Thread thread = serviceDescriptionThreads.remove(provider); - if (thread != null) - thread.interrupt(); - providerDescriptions.remove(provider); - } - observers.notify(new RemovedProviderEvent(provider)); - } - if (!loading) - saveServiceDescriptions(); - } - - @Override - public void saveServiceDescriptions() { - File serviceDescriptionsFile = findServiceDescriptionsFile(); - saveServiceDescriptions(serviceDescriptionsFile); - } - - @Override - public void saveServiceDescriptions(File serviceDescriptionsFile) { - ServiceDescriptionSerializer serializer = new ServiceDescriptionSerializer(); - try { - serializer.serializeRegistry(this, serviceDescriptionsFile); - } catch (IOException e) { - throw new RuntimeException("Can't save service descriptions to " - + serviceDescriptionsFile); - } - } - - /** - * Exports all configurable service providers (that give service - * descriptions) currently found in the Service Registry (apart from service - * templates and local services) regardless of who added them (user or - * default system providers). - * <p> - * Unlike {@link #saveServiceDescriptions}, this export does not have the - * "ignored providers" section as this is just a plain export of everything - * in the Service Registry. - * - * @param serviceDescriptionsFile - */ - @Override - public void exportCurrentServiceDescriptions(File serviceDescriptionsFile) { - ServiceDescriptionSerializer serializer = new ServiceDescriptionSerializer(); - try { - serializer.serializeFullRegistry(this, serviceDescriptionsFile); - } catch (IOException e) { - throw new RuntimeException("Could not save service descriptions to " - + serviceDescriptionsFile); - } - } - - public void setServiceDescriptionProvidersList( - List<ServiceDescriptionProvider> serviceDescriptionProviders) { - this.serviceDescriptionProviders = serviceDescriptionProviders; - } - - private void updateServiceDescriptions(boolean refreshAll, boolean waitFor) { - List<Thread> threads = new ArrayList<>(); - for (ServiceDescriptionProvider provider : getServiceDescriptionProviders()) { - synchronized (providerDescriptions) { - if (providerDescriptions.containsKey(provider) && !refreshAll) - // We'll used the cached values - continue; - Thread oldThread = serviceDescriptionThreads.get(provider); - if (oldThread != null && oldThread.isAlive()) { - if (refreshAll) - // New thread will override the old thread - oldThread.interrupt(); - else { - // observers.notify(new ProviderStatusNotification(provider, "Waiting for provider")); - continue; - } - } - // Not run yet - we'll start a new tread - Thread thread = new FindServiceDescriptionsThread(provider); - threads.add(thread); - serviceDescriptionThreads.put(provider, thread); - thread.start(); - } - } - if (waitFor) - joinThreads(threads, DESCRIPTION_THREAD_TIMEOUT_MS); - } - - @Override - public boolean isDefaultSystemConfigurableProvidersLoaded() { - return defaultSystemConfigurableProvidersLoaded; - } - - /** - * Sets the serviceDescriptionsConfig. - * - * @param serviceDescriptionsConfig - * the new value of serviceDescriptionsConfig - */ - public void setServiceDescriptionsConfig( - ServiceDescriptionsConfiguration serviceDescriptionsConfig) { - this.serviceDescriptionsConfig = serviceDescriptionsConfig; - } - - class FindServiceDescriptionsThread extends Thread implements - UncaughtExceptionHandler, FindServiceDescriptionsCallBack { - private final ServiceDescriptionProvider provider; - private boolean aborting = false; - private final Set<ServiceDescription> providerDescs = new HashSet<>(); - - FindServiceDescriptionsThread(ServiceDescriptionProvider provider) { - super(threadGroup, "Find service descriptions from " + provider); - this.provider = provider; - setUncaughtExceptionHandler(this); - setDaemon(true); - } - - @Override - public void fail(String message, Throwable ex) { - logger.warn("Provider " + getProvider() + ": " + message, ex); - if (aborting) - return; - observers.notify(new ProviderErrorNotification(getProvider(), - message, ex)); - } - - @Override - public void finished() { - if (aborting) - return; - synchronized (providerDescriptions) { - providerDescriptions.put(getProvider(), providerDescs); - } - observers.notify(new ServiceDescriptionProvidedEvent(getProvider(), - providerDescs)); - } - - @Override - public void partialResults( - Collection<? extends ServiceDescription> serviceDescriptions) { - if (aborting) - return; - providerDescs.addAll(serviceDescriptions); - synchronized (providerDescriptions) { - providerDescriptions.put(getProvider(), providerDescs); - } - observers.notify(new PartialServiceDescriptionsNotification( - getProvider(), serviceDescriptions)); - } - - @Override - public void status(String message) { - logger.debug("Provider " + getProvider() + ": " + message); - if (aborting) - return; - observers.notify(new ProviderStatusNotification(getProvider(), - message)); - } - - @Override - public void warning(String message) { - logger.warn("Provider " + getProvider() + ": " + message); - if (aborting) - return; - observers.notify(new ProviderWarningNotification(getProvider(), - message)); - } - - public ServiceDescriptionProvider getProvider() { - return provider; - } - - @Override - public void interrupt() { - aborting = true; - super.interrupt(); - } - - @Override - public void run() { - observers.notify(new ProviderUpdatingNotification(provider)); - getProvider().findServiceDescriptionsAsync(this); - } - - @Override - public void uncaughtException(Thread t, Throwable ex) { - logger.error("Uncaught exception in " + t, ex); - fail("Uncaught exception", ex); - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/72850d5a/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionSerializer.java ---------------------------------------------------------------------- diff --git a/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionSerializer.java b/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionSerializer.java deleted file mode 100644 index 8a047a3..0000000 --- a/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionSerializer.java +++ /dev/null @@ -1,102 +0,0 @@ -package net.sf.taverna.t2.servicedescriptions.impl; - -import static net.sf.taverna.t2.servicedescriptions.impl.ServiceDescriptionConstants.CONFIGURATION; -import static net.sf.taverna.t2.servicedescriptions.impl.ServiceDescriptionConstants.IGNORED; -import static net.sf.taverna.t2.servicedescriptions.impl.ServiceDescriptionConstants.PROVIDERS; -import static net.sf.taverna.t2.servicedescriptions.impl.ServiceDescriptionConstants.PROVIDER_ID; -import static net.sf.taverna.t2.servicedescriptions.impl.ServiceDescriptionConstants.SERVICE_PANEL_CONFIGURATION; -import static net.sf.taverna.t2.servicedescriptions.impl.ServiceDescriptionConstants.TYPE; - -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.Set; - -import net.sf.taverna.t2.servicedescriptions.ConfigurableServiceProvider; -import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionProvider; -import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry; - -import org.apache.log4j.Logger; -import org.jdom.JDOMException; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; - -class ServiceDescriptionSerializer { - private static Logger logger = Logger - .getLogger(ServiceDescriptionSerializer.class); - - public void serializeRegistry(ServiceDescriptionRegistry registry, File file) - throws IOException { - Set<ServiceDescriptionProvider> ignoreProviders = registry - .getUserRemovedServiceProviders(); - JsonNode registryElement = serializeRegistry(registry, ignoreProviders); - try (BufferedOutputStream bufferedOutStream = new BufferedOutputStream( - new FileOutputStream(file))) { - bufferedOutStream.write(registryElement.toString() - .getBytes("UTF-8")); - } - } - - /** - * Export the whole service registry to an xml file, regardless of who added - * the service provider (user or system default). In this case there will be - * no "ignored providers" in the saved file. - */ - public void serializeFullRegistry(ServiceDescriptionRegistry registry, - File file) throws IOException { - JsonNode registryElement = serializeRegistry(registry, ALL_PROVIDERS); - try (BufferedOutputStream bufferedOutStream = new BufferedOutputStream( - new FileOutputStream(file))) { - bufferedOutStream.write(registryElement.toString() - .getBytes("UTF-8")); - } - } - - private static final JsonNodeFactory factory = JsonNodeFactory.instance; - private static final Set<ServiceDescriptionProvider> ALL_PROVIDERS = null; - - private JsonNode serializeRegistry(ServiceDescriptionRegistry registry, - Set<ServiceDescriptionProvider> ignoreProviders) { - ObjectNode overallConfiguration = factory.objectNode(); - overallConfiguration.put(SERVICE_PANEL_CONFIGURATION, - ignoreProviders != ALL_PROVIDERS ? "full" : "defaults only"); - ArrayNode providers = overallConfiguration.putArray(PROVIDERS); - - for (ServiceDescriptionProvider provider : registry - .getUserAddedServiceProviders()) - try { - providers.add(serializeProvider(provider)); - } catch (JDOMException | IOException e) { - logger.warn("Could not serialize " + provider, e); - } - - if (ignoreProviders != ALL_PROVIDERS) { - ArrayNode ignored = overallConfiguration.putArray(IGNORED); - for (ServiceDescriptionProvider provider : ignoreProviders) - try { - ignored.add(serializeProvider(provider)); - } catch (JDOMException | IOException e) { - logger.warn("Could not serialize " + provider, e); - } - } - - return overallConfiguration; - } - - private JsonNode serializeProvider(ServiceDescriptionProvider provider) - throws JDOMException, IOException { - ObjectNode node = factory.objectNode(); - node.put(PROVIDER_ID, provider.getId()); - - if (provider instanceof ConfigurableServiceProvider) { - ConfigurableServiceProvider configurable = (ConfigurableServiceProvider) provider; - node.put(TYPE, configurable.getConfiguration().getType().toString()); - node.put(CONFIGURATION, configurable.getConfiguration().getJson()); - } - return node; - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/72850d5a/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionXMLConstants.java ---------------------------------------------------------------------- diff --git a/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionXMLConstants.java b/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionXMLConstants.java deleted file mode 100644 index ee180a7..0000000 --- a/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionXMLConstants.java +++ /dev/null @@ -1,15 +0,0 @@ -package net.sf.taverna.t2.servicedescriptions.impl; - -import org.jdom.Namespace; - -public interface ServiceDescriptionXMLConstants { - - public static final Namespace SERVICE_DESCRIPTION_NS = Namespace - .getNamespace("http://taverna.sf.net/2009/xml/servicedescription";); - public static final String PROVIDER = "provider"; - public static final String PROVIDERS = "providers"; - public static final String SERVICE_DESCRIPTIONS = "serviceDescriptions"; - public static final String IGNORED_PROVIDERS = "ignoredProviders"; - public static final String PROVIDER_IDENTIFIER = "providerId"; - -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/72850d5a/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionsConfigurationImpl.java ---------------------------------------------------------------------- diff --git a/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionsConfigurationImpl.java b/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionsConfigurationImpl.java deleted file mode 100644 index ef0295c..0000000 --- a/activity-palette-impl/src/main/java/net/sf/taverna/t2/servicedescriptions/impl/ServiceDescriptionsConfigurationImpl.java +++ /dev/null @@ -1,92 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2007 The University of Manchester - * - * Modifications to the initial code base are copyright of their - * respective authors, or their employers as appropriate. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - ******************************************************************************/ -package net.sf.taverna.t2.servicedescriptions.impl; - -import java.util.HashMap; -import java.util.Map; - -import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionsConfiguration; - -import uk.org.taverna.configuration.AbstractConfigurable; -import uk.org.taverna.configuration.ConfigurationManager; - -public class ServiceDescriptionsConfigurationImpl extends AbstractConfigurable - implements ServiceDescriptionsConfiguration { - private static final String INCLUDE_DEFAULTS = "includeDefaults"; - private static final String SERVICE_PALETTE = "Service providers"; - private static final String SERVICE_PALETTE_PREFIX = "ServiceProviders"; - private static final String CATEGORY = "Services"; - private static final String UUID = "f0d1ef24-9337-412f-b2c3-220a01e2efd0"; - private static final String REMOVE_PERMANENTLY = "removePermanently"; - - public ServiceDescriptionsConfigurationImpl( - ConfigurationManager configurationManager) { - super(configurationManager); - } - - @Override - public String getCategory() { - return CATEGORY; - } - - @Override - public Map<String, String> getDefaultPropertyMap() { - Map<String, String> defaults = new HashMap<String, String>(); - defaults.put(INCLUDE_DEFAULTS, "true"); - defaults.put(REMOVE_PERMANENTLY, "true"); - return defaults; - } - - @Override - public String getDisplayName() { - return SERVICE_PALETTE; - } - - @Override - public String getFilePrefix() { - return SERVICE_PALETTE_PREFIX; - } - - @Override - public String getUUID() { - return UUID; - } - - @Override - public boolean isIncludeDefaults() { - return Boolean.parseBoolean(getProperty(INCLUDE_DEFAULTS)); - } - - @Override - public void setIncludeDefaults(boolean includeDefaults) { - setProperty(INCLUDE_DEFAULTS, Boolean.toString(includeDefaults)); - } - - @Override - public boolean isRemovePermanently() { - return Boolean.parseBoolean(getProperty(REMOVE_PERMANENTLY)); - } - - @Override - public void setRemovePermanently(boolean removePermanently) { - setProperty(REMOVE_PERMANENTLY, Boolean.toString(removePermanently)); - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/72850d5a/activity-palette-impl/src/main/java/net/sf/taverna/t2/workbench/ui/activitypalette/ActivityPaletteConfiguration.java ---------------------------------------------------------------------- diff --git a/activity-palette-impl/src/main/java/net/sf/taverna/t2/workbench/ui/activitypalette/ActivityPaletteConfiguration.java b/activity-palette-impl/src/main/java/net/sf/taverna/t2/workbench/ui/activitypalette/ActivityPaletteConfiguration.java deleted file mode 100644 index 46f82c4..0000000 --- a/activity-palette-impl/src/main/java/net/sf/taverna/t2/workbench/ui/activitypalette/ActivityPaletteConfiguration.java +++ /dev/null @@ -1,81 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2007 The University of Manchester - * - * Modifications to the initial code base are copyright of their - * respective authors, or their employers as appropriate. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - ******************************************************************************/ -package net.sf.taverna.t2.workbench.ui.activitypalette; - -import java.util.HashMap; -import java.util.Map; - -import uk.org.taverna.configuration.AbstractConfigurable; -import uk.org.taverna.configuration.ConfigurationManager; - -public class ActivityPaletteConfiguration extends AbstractConfigurable { - private Map<String,String> defaultPropertyMap; - - public ActivityPaletteConfiguration(ConfigurationManager configurationManager) { - super(configurationManager); - } - - @Override - public String getCategory() { - return "Services"; - } - - @Override - public Map<String, String> getDefaultPropertyMap() { - if (defaultPropertyMap == null) { - defaultPropertyMap = new HashMap<>(); - - // //wsdl - //defaultPropertyMap.put("taverna.defaultwsdl", "http://www.ebi.ac.uk/xembl/XEMBL.wsdl,"+ - // "http://soap.genome.jp/KEGG.wsdl,"+ - // "http://eutils.ncbi.nlm.nih.gov/entrez/eutils/soap/eutils.wsdl,"+ - // "http://soap.bind.ca/wsdl/bind.wsdl,"+ - // "http://www.ebi.ac.uk/ws/services/urn:Dbfetch?wsdl";); - - // //soaplab - //defaultPropertyMap.put("taverna.defaultsoaplab", "http://www.ebi.ac.uk/soaplab/services/";); - - // //biomart - //defaultPropertyMap.put("taverna.defaultmartregistry","http://www.biomart.org/biomart";); - - //add property names - //defaultPropertyMap.put("name.taverna.defaultwsdl", "WSDL"); - //defaultPropertyMap.put("name.taverna.defaultsoaplab","Soaplab"); - //defaultPropertyMap.put("name.taverna.defaultmartregistry", "Biomart"); - } - return defaultPropertyMap; - } - - @Override - public String getDisplayName() { - return "Activity Palette"; - } - - @Override - public String getFilePrefix() { - return "ActivityPalette"; - } - - @Override - public String getUUID() { - return "ad9f3a60-5967-11dd-ae16-0800200c9a66"; - } -}
