Repository: incubator-taverna-workbench-common-activities Updated Branches: refs/heads/master d33f77b0c -> 9e37ea395
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/9e37ea39/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/menu/SpreadsheetImportConfigureMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/menu/SpreadsheetImportConfigureMenuAction.java b/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/menu/SpreadsheetImportConfigureMenuAction.java index 7d1fa0a..1bbaa05 100644 --- a/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/menu/SpreadsheetImportConfigureMenuAction.java +++ b/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/menu/SpreadsheetImportConfigureMenuAction.java @@ -22,7 +22,7 @@ package net.sf.taverna.t2.activities.spreadsheet.menu; import javax.swing.Action; -import uk.org.taverna.commons.services.ServiceRegistry; +import org.apache.taverna.commons.services.ServiceRegistry; import net.sf.taverna.t2.activities.spreadsheet.actions.SpreadsheetImportActivityConfigurationAction; import net.sf.taverna.t2.activities.spreadsheet.il8n.SpreadsheetImportUIText; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/9e37ea39/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/servicedescriptions/SpreadsheetImportTemplateService.java ---------------------------------------------------------------------- diff --git a/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/servicedescriptions/SpreadsheetImportTemplateService.java b/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/servicedescriptions/SpreadsheetImportTemplateService.java index 8057f2d..f03d852 100644 --- a/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/servicedescriptions/SpreadsheetImportTemplateService.java +++ b/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/servicedescriptions/SpreadsheetImportTemplateService.java @@ -29,7 +29,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import net.sf.taverna.t2.activities.spreadsheet.il8n.SpreadsheetImportUIText; import net.sf.taverna.t2.servicedescriptions.AbstractTemplateService; import net.sf.taverna.t2.servicedescriptions.ServiceDescription; -import uk.org.taverna.scufl2.api.configurations.Configuration; +import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionProvider; +import org.apache.taverna.scufl2.api.configurations.Configuration; /** * Definition of the SpreadsheetImport spreadsheet import template service. @@ -92,4 +93,9 @@ public class SpreadsheetImportTemplateService extends AbstractTemplateService { public String getId() { return providerId.toString(); } + + @Override + public ServiceDescriptionProvider newInstance() { + return new SpreadsheetImportTemplateService(); + } } http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/9e37ea39/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportConfigTableModel.java ---------------------------------------------------------------------- diff --git a/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportConfigTableModel.java b/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportConfigTableModel.java index 0409b8e..81e5381 100644 --- a/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportConfigTableModel.java +++ b/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportConfigTableModel.java @@ -26,7 +26,7 @@ import java.util.Map; import javax.swing.table.AbstractTableModel; -import net.sf.taverna.t2.activities.spreadsheet.SpreadsheetUtils; +import org.apache.taverna.activities.spreadsheet.SpreadsheetUtils; import net.sf.taverna.t2.activities.spreadsheet.il8n.SpreadsheetImportUIText; /** http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/9e37ea39/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportConfigView.java ---------------------------------------------------------------------- diff --git a/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportConfigView.java b/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportConfigView.java index af57c44..9a1e9d7 100644 --- a/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportConfigView.java +++ b/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportConfigView.java @@ -67,8 +67,8 @@ import javax.swing.text.BadLocationException; import javax.swing.text.JTextComponent; import javax.swing.text.PlainDocument; -import net.sf.taverna.t2.activities.spreadsheet.Range; -import net.sf.taverna.t2.activities.spreadsheet.SpreadsheetUtils; +import org.apache.taverna.activities.spreadsheet.Range; +import org.apache.taverna.activities.spreadsheet.SpreadsheetUtils; import net.sf.taverna.t2.activities.spreadsheet.il8n.SpreadsheetImportUIText; import net.sf.taverna.t2.lang.ui.DialogTextArea; import net.sf.taverna.t2.lang.ui.icons.Icons; @@ -77,8 +77,8 @@ import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ActivityCon import org.apache.commons.lang.StringEscapeUtils; import org.apache.log4j.Logger; -import uk.org.taverna.commons.services.ServiceRegistry; -import uk.org.taverna.scufl2.api.activity.Activity; +import org.apache.taverna.commons.services.ServiceRegistry; +import org.apache.taverna.scufl2.api.activity.Activity; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/9e37ea39/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportContextualView.java ---------------------------------------------------------------------- diff --git a/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportContextualView.java b/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportContextualView.java index 2078faa..52bbc0f 100644 --- a/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportContextualView.java +++ b/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportContextualView.java @@ -33,10 +33,10 @@ import net.sf.taverna.t2.workbench.configuration.colour.ColourManager; import net.sf.taverna.t2.workbench.edits.EditManager; import net.sf.taverna.t2.workbench.file.FileManager; import net.sf.taverna.t2.workbench.ui.actions.activity.HTMLBasedActivityContextualView; -import uk.org.taverna.commons.services.ServiceRegistry; -import uk.org.taverna.scufl2.api.activity.Activity; -import uk.org.taverna.scufl2.api.port.InputActivityPort; -import uk.org.taverna.scufl2.api.port.OutputActivityPort; +import org.apache.taverna.commons.services.ServiceRegistry; +import org.apache.taverna.scufl2.api.activity.Activity; +import org.apache.taverna.scufl2.api.port.InputActivityPort; +import org.apache.taverna.scufl2.api.port.OutputActivityPort; /** * A simple non editable HTML table view over a {@link SpreadsheetImportActivity}. Clicking on the http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/9e37ea39/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportContextualViewFactory.java ---------------------------------------------------------------------- diff --git a/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportContextualViewFactory.java b/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportContextualViewFactory.java index 7e49168..3105223 100644 --- a/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportContextualViewFactory.java +++ b/taverna-spreadsheet-import-activity-ui/src/main/java/net/sf/taverna/t2/activities/spreadsheet/views/SpreadsheetImportContextualViewFactory.java @@ -31,8 +31,8 @@ import net.sf.taverna.t2.workbench.edits.EditManager; 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.commons.services.ServiceRegistry; -import uk.org.taverna.scufl2.api.activity.Activity; +import org.apache.taverna.commons.services.ServiceRegistry; +import org.apache.taverna.scufl2.api.activity.Activity; /** * Factory for creating contextual a view of the SpreadsheetImport Activity http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/9e37ea39/taverna-wsdl-activity-ui/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-wsdl-activity-ui/pom.xml b/taverna-wsdl-activity-ui/pom.xml index be2d224..f3f7baa 100644 --- a/taverna-wsdl-activity-ui/pom.xml +++ b/taverna-wsdl-activity-ui/pom.xml @@ -2,13 +2,12 @@ <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</groupId> - <artifactId>taverna-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <groupId>org.apache.taverna.workbench.commonactivities</groupId> + <artifactId>taverna-workbench-commonactivities</artifactId> + <version>3.1.0-incubating-SNAPSHOT</version> </parent> - <groupId>net.sf.taverna.t2.ui-activities</groupId> - <artifactId>wsdl-activity-ui</artifactId> - <version>2.0-SNAPSHOT</version> + <groupId>org.apache.taverna.ui-activities</groupId> + <artifactId>taverna-wsdl-activity-ui</artifactId> <packaging>bundle</packaging> <name>Taverna 2 WSDL Activity UI</name> <build> @@ -27,6 +26,7 @@ </plugins> </build> <dependencies> +<!-- <dependency> <groupId>net.sf.taverna.t2.ui-api</groupId> <artifactId>activity-icons-api</artifactId> @@ -62,7 +62,7 @@ <artifactId>ui</artifactId> <version>${t2.lang.version}</version> </dependency> - +--> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/9e37ea39/taverna-xpath-activity-ui/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-xpath-activity-ui/pom.xml b/taverna-xpath-activity-ui/pom.xml index 53b81ee..1675af5 100644 --- a/taverna-xpath-activity-ui/pom.xml +++ b/taverna-xpath-activity-ui/pom.xml @@ -2,46 +2,57 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>net.sf.taverna</groupId> - <artifactId>taverna-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <groupId>org.apache.taverna.workbench.commonactivities</groupId> + <artifactId>taverna-workbench-commonactivities</artifactId> + <version>3.1.0-incubating-SNAPSHOT</version> </parent> - <groupId>net.sf.taverna.t2.ui-activities</groupId> - <artifactId>xpath-activity-ui</artifactId> - <version>2.0-SNAPSHOT</version> + <groupId>org.apache.taverna.ui-activities</groupId> + <artifactId>taverna-xpath-activity-ui</artifactId> <packaging>bundle</packaging> <name>XPath Activity - UI bindings</name> + <dependencies> <dependency> - <groupId>net.sf.taverna.t2.activities</groupId> - <artifactId>xpath-activity</artifactId> - <version>${t2.activities.version}</version> + <groupId>org.apache.taverna.language</groupId> + <artifactId>taverna-scufl2-api</artifactId> + <version>${taverna.language.version}</version> </dependency> <dependency> - <groupId>net.sf.taverna.t2.ui-api</groupId> - <artifactId>activity-icons-api</artifactId> - <version>${t2.ui.api.version}</version> + <groupId>org.apache.taverna.engine</groupId> + <artifactId>taverna-services-api</artifactId> + <version>${taverna.engine.version}</version> </dependency> <dependency> - <groupId>net.sf.taverna.t2.ui-api</groupId> - <artifactId>contextual-views-api</artifactId> - <version>${t2.ui.api.version}</version> + <groupId>org.apache.taverna.workbench</groupId> + <artifactId>taverna-workbench-api</artifactId> + <version>${taverna.workbench.version}</version> </dependency> <dependency> - <groupId>net.sf.taverna.t2.ui-api</groupId> - <artifactId>menu-api</artifactId> - <version>${t2.ui.api.version}</version> + <groupId>org.apache.taverna.workbench</groupId> + <artifactId>taverna-contextual-views-api</artifactId> + <version>${taverna.workbench.version}</version> </dependency> <dependency> - <groupId>net.sf.taverna.t2.ui-api</groupId> - <artifactId>report-api</artifactId> - <version>${t2.ui.api.version}</version> + <groupId>org.apache.taverna.workbench</groupId> + <artifactId>taverna-menu-api</artifactId> + <version>${taverna.workbench.version}</version> </dependency> <dependency> - <groupId>net.sf.taverna.t2.ui-components</groupId> - <artifactId>workflow-view</artifactId> - <version>${t2.ui.components.version}</version> + <groupId>org.apache.taverna.workbench</groupId> + <artifactId>taverna-workflow-view</artifactId> + <version>${taverna.workbench.version}</version> </dependency> + <dependency> + <groupId>org.apache.taverna.commonactivities</groupId> + <artifactId>taverna-xpath-activity</artifactId> + <version>${taverna.commonactivities.version}</version> + </dependency> + <dependency> + <groupId>org.apache.taverna.workbench</groupId> + <artifactId>taverna-activity-tools</artifactId> + <version>3.1.0-incubating-SNAPSHOT</version> + <type>jar</type> + </dependency> </dependencies> <repositories> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/9e37ea39/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/config/XPathActivityConfigurationPanel.java ---------------------------------------------------------------------- diff --git a/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/config/XPathActivityConfigurationPanel.java b/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/config/XPathActivityConfigurationPanel.java index 4342a4a..54719a2 100644 --- a/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/config/XPathActivityConfigurationPanel.java +++ b/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/config/XPathActivityConfigurationPanel.java @@ -58,7 +58,7 @@ import javax.swing.event.CaretListener; import javax.swing.filechooser.FileFilter; import javax.swing.table.DefaultTableModel; -import net.sf.taverna.t2.activities.xpath.XPathActivityConfigurationBean; +import org.apache.taverna.activities.xpath.XPathActivityConfigurationBean; import net.sf.taverna.t2.activities.xpath.ui.config.xmltree.TableCellListener; import net.sf.taverna.t2.activities.xpath.ui.config.xmltree.XPathActivityXMLTree; import net.sf.taverna.t2.activities.xpath.ui.servicedescription.XPathActivityIcon; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/9e37ea39/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/config/XPathActivityConfigurationPanelProvider.java ---------------------------------------------------------------------- diff --git a/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/config/XPathActivityConfigurationPanelProvider.java b/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/config/XPathActivityConfigurationPanelProvider.java index 5954986..dec6f61 100644 --- a/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/config/XPathActivityConfigurationPanelProvider.java +++ b/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/config/XPathActivityConfigurationPanelProvider.java @@ -12,8 +12,8 @@ import javax.swing.JOptionPane; import net.sf.taverna.t2.activities.xpath.XPathActivityConfigurationBean; import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ActivityConfigurationPanel; -import uk.org.taverna.commons.services.ServiceRegistry; -import uk.org.taverna.scufl2.api.activity.Activity; +import org.apache.taverna.commons.services.ServiceRegistry; +import org.apache.taverna.scufl2.api.activity.Activity; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/9e37ea39/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/config/XPathActivityConfigureAction.java ---------------------------------------------------------------------- diff --git a/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/config/XPathActivityConfigureAction.java b/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/config/XPathActivityConfigureAction.java index 4e68948..3bdc74c 100644 --- a/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/config/XPathActivityConfigureAction.java +++ b/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/config/XPathActivityConfigureAction.java @@ -9,8 +9,8 @@ import net.sf.taverna.t2.workbench.edits.EditManager; import net.sf.taverna.t2.workbench.file.FileManager; import net.sf.taverna.t2.workbench.ui.actions.activity.ActivityConfigurationAction; import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ActivityConfigurationDialog; -import uk.org.taverna.commons.services.ServiceRegistry; -import uk.org.taverna.scufl2.api.activity.Activity; +import org.apache.taverna.commons.services.ServiceRegistry; +import org.apache.taverna.scufl2.api.activity.Activity; /** * @author Sergejs Aleksejevs http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/9e37ea39/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/contextualview/ConfigureXPathActivityMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/contextualview/ConfigureXPathActivityMenuAction.java b/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/contextualview/ConfigureXPathActivityMenuAction.java index 6695dc9..caa15da 100644 --- a/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/contextualview/ConfigureXPathActivityMenuAction.java +++ b/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/contextualview/ConfigureXPathActivityMenuAction.java @@ -9,7 +9,7 @@ import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager; import net.sf.taverna.t2.workbench.activitytools.AbstractConfigureActivityMenuAction; import net.sf.taverna.t2.workbench.edits.EditManager; import net.sf.taverna.t2.workbench.file.FileManager; -import uk.org.taverna.commons.services.ServiceRegistry; +import org.apache.taverna.commons.services.ServiceRegistry; /** * This action is responsible for enabling the contextual menu entry on processors that perform http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/9e37ea39/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/contextualview/XPathActivityMainContextViewFactory.java ---------------------------------------------------------------------- diff --git a/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/contextualview/XPathActivityMainContextViewFactory.java b/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/contextualview/XPathActivityMainContextViewFactory.java index 355ab8d..a86a1ff 100644 --- a/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/contextualview/XPathActivityMainContextViewFactory.java +++ b/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/contextualview/XPathActivityMainContextViewFactory.java @@ -10,8 +10,8 @@ import net.sf.taverna.t2.workbench.edits.EditManager; 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.commons.services.ServiceRegistry; -import uk.org.taverna.scufl2.api.activity.Activity; +import org.apache.taverna.commons.services.ServiceRegistry; +import org.apache.taverna.scufl2.api.activity.Activity; /** * @author Sergejs Aleksejevs http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/9e37ea39/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/contextualview/XPathActivityMainContextualView.java ---------------------------------------------------------------------- diff --git a/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/contextualview/XPathActivityMainContextualView.java b/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/contextualview/XPathActivityMainContextualView.java index d872228..54eee43 100644 --- a/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/contextualview/XPathActivityMainContextualView.java +++ b/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/contextualview/XPathActivityMainContextualView.java @@ -27,10 +27,10 @@ import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager; import net.sf.taverna.t2.workbench.edits.EditManager; import net.sf.taverna.t2.workbench.file.FileManager; import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView; -import uk.org.taverna.commons.services.ServiceRegistry; -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.commons.services.ServiceRegistry; +import org.apache.taverna.scufl2.api.activity.Activity; +import org.apache.taverna.scufl2.api.common.Scufl2Tools; +import org.apache.taverna.scufl2.api.configurations.Configuration; import com.fasterxml.jackson.databind.JsonNode; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/9e37ea39/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/menu/AddXPathTemplateAction.java ---------------------------------------------------------------------- diff --git a/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/menu/AddXPathTemplateAction.java b/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/menu/AddXPathTemplateAction.java index a80696d..e3ee445 100644 --- a/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/menu/AddXPathTemplateAction.java +++ b/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/menu/AddXPathTemplateAction.java @@ -33,8 +33,8 @@ import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager; import net.sf.taverna.t2.workbench.edits.EditManager; import net.sf.taverna.t2.workbench.selection.SelectionManager; import net.sf.taverna.t2.workbench.ui.workflowview.WorkflowView; -import uk.org.taverna.commons.services.ServiceRegistry; -import uk.org.taverna.scufl2.api.core.Workflow; +import org.apache.taverna.commons.services.ServiceRegistry; +import org.apache.taverna.scufl2.api.core.Workflow; /** * An action to add a REST activity + a wrapping processor to the workflow. http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/9e37ea39/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/menu/AddXPathTemplateMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/menu/AddXPathTemplateMenuAction.java b/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/menu/AddXPathTemplateMenuAction.java index 9132110..c2ec7ca 100644 --- a/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/menu/AddXPathTemplateMenuAction.java +++ b/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/menu/AddXPathTemplateMenuAction.java @@ -37,7 +37,7 @@ import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager; import net.sf.taverna.t2.workbench.edits.EditManager; import net.sf.taverna.t2.workbench.selection.SelectionManager; import net.sf.taverna.t2.workbench.ui.workflowview.WorkflowView; -import uk.org.taverna.commons.services.ServiceRegistry; +import org.apache.taverna.commons.services.ServiceRegistry; /** * An action to add a REST activity + a wrapping processor to the workflow. http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/9e37ea39/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/servicedescription/XPathTemplateService.java ---------------------------------------------------------------------- diff --git a/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/servicedescription/XPathTemplateService.java b/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/servicedescription/XPathTemplateService.java index d55235d..a1ebafc 100644 --- a/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/servicedescription/XPathTemplateService.java +++ b/taverna-xpath-activity-ui/src/main/java/net/sf/taverna/t2/activities/xpath/ui/servicedescription/XPathTemplateService.java @@ -6,9 +6,10 @@ import javax.swing.Icon; import net.sf.taverna.t2.servicedescriptions.AbstractTemplateService; import net.sf.taverna.t2.servicedescriptions.ServiceDescription; -import uk.org.taverna.scufl2.api.configurations.Configuration; +import org.apache.taverna.scufl2.api.configurations.Configuration; import com.fasterxml.jackson.databind.node.ObjectNode; +import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionProvider; /** * @author Sergejs Aleksejevs @@ -54,4 +55,9 @@ public class XPathTemplateService extends AbstractTemplateService { return "http://www.taverna.org.uk/2010/services/xpath";; } + @Override + public XPathTemplateService newInstance() { + return new XPathTemplateService(); + } + }
