Repository: incubator-taverna-plugin-component Updated Branches: refs/heads/master 787480d09 -> 4208425f7
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivityContextViewFactory.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivityContextViewFactory.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivityContextViewFactory.java index f85d8d5..b457807 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivityContextViewFactory.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivityContextViewFactory.java @@ -1,3 +1,22 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ + package org.apache.taverna.component.ui.view; import static org.apache.taverna.component.api.config.ComponentConfig.URI; @@ -12,16 +31,16 @@ import javax.swing.Action; import org.apache.taverna.component.api.ComponentFactory; import org.apache.taverna.component.ui.config.ComponentConfigureAction; -import uk.org.taverna.commons.services.ServiceRegistry; import org.apache.taverna.scufl2.api.activity.Activity; -import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry; -import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager; -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 net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView; -import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory; +import org.apache.taverna.servicedescriptions.ServiceDescriptionRegistry; +import org.apache.taverna.services.ServiceRegistry; +import org.apache.taverna.workbench.activityicons.ActivityIconManager; +import org.apache.taverna.workbench.configuration.colour.ColourManager; +import org.apache.taverna.workbench.edits.EditManager; +import org.apache.taverna.workbench.file.FileManager; +import org.apache.taverna.workbench.ui.actions.activity.HTMLBasedActivityContextualView; +import org.apache.taverna.workbench.ui.views.contextualviews.ContextualView; +import org.apache.taverna.workbench.ui.views.contextualviews.activity.ContextualViewFactory; public class ComponentActivityContextViewFactory implements ContextualViewFactory<Activity> { http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivitySemanticAnnotationContextViewFactory.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivitySemanticAnnotationContextViewFactory.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivitySemanticAnnotationContextViewFactory.java index 9ec1b9f..10359ed 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivitySemanticAnnotationContextViewFactory.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivitySemanticAnnotationContextViewFactory.java @@ -1,3 +1,22 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ + package org.apache.taverna.component.ui.view; import static org.apache.log4j.Logger.getLogger; @@ -21,9 +40,9 @@ import org.apache.taverna.scufl2.api.port.InputWorkflowPort; import org.apache.taverna.scufl2.api.port.OutputActivityPort; import org.apache.taverna.scufl2.api.port.OutputWorkflowPort; import org.apache.taverna.scufl2.api.port.Port; -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 org.apache.taverna.workbench.file.FileManager; +import org.apache.taverna.workbench.ui.views.contextualviews.ContextualView; +import org.apache.taverna.workbench.ui.views.contextualviews.activity.ContextualViewFactory; public class ComponentActivitySemanticAnnotationContextViewFactory implements ContextualViewFactory<Object> { http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivitySemanticAnnotationPanel.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivitySemanticAnnotationPanel.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivitySemanticAnnotationPanel.java index 6e45c84..2739e5d 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivitySemanticAnnotationPanel.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivitySemanticAnnotationPanel.java @@ -1,3 +1,22 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ + package org.apache.taverna.component.ui.view; import static java.awt.Color.GRAY; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentContextViewFactory.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentContextViewFactory.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentContextViewFactory.java index bd86839..d8bbc58 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentContextViewFactory.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentContextViewFactory.java @@ -1,3 +1,22 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ + package org.apache.taverna.component.ui.view; import static org.apache.taverna.component.api.config.ComponentConfig.URI; @@ -7,11 +26,11 @@ import java.util.List; import org.apache.taverna.component.api.Version; -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 org.apache.taverna.scufl2.api.activity.Activity; import org.apache.taverna.scufl2.api.container.WorkflowBundle; +import org.apache.taverna.workbench.file.FileManager; +import org.apache.taverna.workbench.ui.views.contextualviews.ContextualView; +import org.apache.taverna.workbench.ui.views.contextualviews.activity.ContextualViewFactory; public class ComponentContextViewFactory implements ContextualViewFactory<WorkflowBundle> { http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentContextualView.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentContextualView.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentContextualView.java index adca544..980e37c 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentContextualView.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentContextualView.java @@ -1,11 +1,25 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ + package org.apache.taverna.component.ui.view; import static java.lang.String.format; -//import static org.apache.taverna.component.ui.view.ViewUtil.getRawTablesHtml; -import static net.sf.taverna.t2.lang.ui.HtmlUtils.buildTableOpeningTag; -import static net.sf.taverna.t2.lang.ui.HtmlUtils.createEditorPane; -import static net.sf.taverna.t2.lang.ui.HtmlUtils.getHtmlHead; -import static net.sf.taverna.t2.lang.ui.HtmlUtils.panelForHtml; import java.awt.Color; @@ -13,9 +27,9 @@ import javax.swing.JComponent; import javax.swing.JEditorPane; import org.apache.taverna.component.api.Version; - -import net.sf.taverna.t2.workbench.configuration.colour.ColourManager; -import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView; +import org.apache.taverna.lang.ui.HtmlUtils; +import org.apache.taverna.workbench.configuration.colour.ColourManager; +import org.apache.taverna.workbench.ui.views.contextualviews.ContextualView; @SuppressWarnings("serial") public class ComponentContextualView extends ContextualView { @@ -31,13 +45,13 @@ public class ComponentContextualView extends ContextualView { @Override public JComponent getMainFrame() { - editorPane = createEditorPane(buildHtml()); - return panelForHtml(editorPane); + editorPane = HtmlUtils.createEditorPane(buildHtml()); + return HtmlUtils.panelForHtml(editorPane); } private String buildHtml() { - StringBuilder html = new StringBuilder(getHtmlHead(getBackgroundColour())); - html.append(buildTableOpeningTag()); + StringBuilder html = new StringBuilder(HtmlUtils.getHtmlHead(getBackgroundColour())); + html.append(HtmlUtils.buildTableOpeningTag()); viewUtils.getRawTablesHtml(component, html); return html.append("</table></body></html>").toString(); } http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ViewUtil.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ViewUtil.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ViewUtil.java index 1b07cc3..bcdbacc 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ViewUtil.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ViewUtil.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ + package org.apache.taverna.component.ui.view; import static java.lang.String.format; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.component.annotation.PropertyPanelFactorySPI ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.component.annotation.PropertyPanelFactorySPI b/taverna-component-activity-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.component.annotation.PropertyPanelFactorySPI deleted file mode 100644 index c025707..0000000 --- a/taverna-component-activity-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.component.annotation.PropertyPanelFactorySPI +++ /dev/null @@ -1,5 +0,0 @@ -org.apache.taverna.component.ui.annotation.AnnotationPropertyPanelFactory -org.apache.taverna.component.ui.annotation.DatatypePropertyPanelFactory -org.apache.taverna.component.ui.annotation.ObjectPropertyWithIndividualsPanelFactory -org.apache.taverna.component.ui.annotation.DateTimePropertyPanelFactory -org.apache.taverna.component.ui.annotation.FallbackPropertyPanelFactory \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/resources/META-INF/services/org.apache.taverna.component.ui.annotation.PropertyPanelFactorySPI ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/resources/META-INF/services/org.apache.taverna.component.ui.annotation.PropertyPanelFactorySPI b/taverna-component-activity-ui/src/main/resources/META-INF/services/org.apache.taverna.component.ui.annotation.PropertyPanelFactorySPI new file mode 100644 index 0000000..c025707 --- /dev/null +++ b/taverna-component-activity-ui/src/main/resources/META-INF/services/org.apache.taverna.component.ui.annotation.PropertyPanelFactorySPI @@ -0,0 +1,5 @@ +org.apache.taverna.component.ui.annotation.AnnotationPropertyPanelFactory +org.apache.taverna.component.ui.annotation.DatatypePropertyPanelFactory +org.apache.taverna.component.ui.annotation.ObjectPropertyWithIndividualsPanelFactory +org.apache.taverna.component.ui.annotation.DateTimePropertyPanelFactory +org.apache.taverna.component.ui.annotation.FallbackPropertyPanelFactory \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivity.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivity.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivity.java index aa5550c..94e95f0 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivity.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivity.java @@ -1,25 +1,10 @@ package org.apache.taverna.component.activity; -import static net.sf.taverna.t2.workflowmodel.utils.AnnotationTools.getAnnotationString; -import static net.sf.taverna.t2.workflowmodel.utils.AnnotationTools.setAnnotationString; import static org.apache.log4j.Logger.getLogger; import java.net.MalformedURLException; import java.util.Map; -import net.sf.taverna.t2.activities.dataflow.DataflowActivity; -import net.sf.taverna.t2.annotation.annotationbeans.SemanticAnnotation; -import net.sf.taverna.t2.invocation.InvocationContext; -import net.sf.taverna.t2.invocation.impl.InvocationContextImpl; -import net.sf.taverna.t2.reference.ReferenceService; -import net.sf.taverna.t2.reference.T2Reference; -import net.sf.taverna.t2.workflowmodel.Dataflow; -import net.sf.taverna.t2.workflowmodel.EditException; -import net.sf.taverna.t2.workflowmodel.Edits; -import net.sf.taverna.t2.workflowmodel.processor.activity.AbstractAsynchronousActivity; -import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityConfigurationException; -import net.sf.taverna.t2.workflowmodel.processor.activity.AsynchronousActivityCallback; - import org.apache.log4j.Logger; import org.apache.taverna.component.api.ComponentException; import org.apache.taverna.component.api.profile.ExceptionHandling; @@ -28,9 +13,21 @@ import org.apache.taverna.component.registry.ComponentUtil; import org.apache.taverna.component.utils.AnnotationUtils; import org.apache.taverna.component.utils.SystemUtils; -import uk.org.taverna.platform.execution.api.InvalidWorkflowException; - import com.fasterxml.jackson.databind.JsonNode; +import org.apache.taverna.activities.dataflow.DataflowActivity; +import org.apache.taverna.annotation.annotationbeans.SemanticAnnotation; +import org.apache.taverna.invocation.InvocationContext; +import org.apache.taverna.invocation.impl.InvocationContextImpl; +import org.apache.taverna.platform.execution.api.InvalidWorkflowException; +import org.apache.taverna.reference.ReferenceService; +import org.apache.taverna.reference.T2Reference; +import org.apache.taverna.workflowmodel.Dataflow; +import org.apache.taverna.workflowmodel.EditException; +import org.apache.taverna.workflowmodel.Edits; +import org.apache.taverna.workflowmodel.processor.activity.AbstractAsynchronousActivity; +import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException; +import org.apache.taverna.workflowmodel.processor.activity.AsynchronousActivityCallback; +import org.apache.taverna.workflowmodel.utils.AnnotationTools; public class ComponentActivity extends AbstractAsynchronousActivity<JsonNode> { @@ -140,10 +137,10 @@ public class ComponentActivity extends // FIXME Completely wrong way of doing this! try { //annUtils.getAnnotation(subject, uriForAnnotation) - String annotationValue = getAnnotationString(realizingDataflow, + String annotationValue = AnnotationTools.getAnnotationString(realizingDataflow, SemanticAnnotation.class, null); if (annotationValue != null) - setAnnotationString(this, SemanticAnnotation.class, + AnnotationTools.setAnnotationString(this, SemanticAnnotation.class, annotationValue, getEdits()).doEdit(); } catch (EditException e) { logger.error("failed to set annotation string", e); http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityConfigurationBean.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityConfigurationBean.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityConfigurationBean.java index 24cfe2e..6effc32 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityConfigurationBean.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityConfigurationBean.java @@ -13,9 +13,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean; -import net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean; -import net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityPortsDefinitionBean; +//import net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean; +//import net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean; +//import net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityPortsDefinitionBean; import org.apache.log4j.Logger; import org.apache.taverna.component.api.Version; @@ -29,6 +29,9 @@ import org.apache.taverna.scufl2.api.port.InputWorkflowPort; import org.apache.taverna.scufl2.api.port.OutputWorkflowPort; import com.fasterxml.jackson.databind.JsonNode; +import org.apache.taverna.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean; +import org.apache.taverna.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean; +import org.apache.taverna.workflowmodel.processor.activity.config.ActivityPortsDefinitionBean; /** * Component activity configuration bean. http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityFactory.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityFactory.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityFactory.java index 4c1b4f4..a9f08db 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityFactory.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityFactory.java @@ -6,14 +6,6 @@ import java.net.URI; import java.util.HashSet; import java.util.Set; -import net.sf.taverna.t2.workflowmodel.Edits; -import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityConfigurationException; -import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory; -import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort; -import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort; -import net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean; -import net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean; - import org.apache.taverna.component.api.ComponentException; import org.apache.taverna.component.api.Version.ID; import org.apache.taverna.component.registry.ComponentImplementationCache; @@ -24,6 +16,13 @@ import org.springframework.beans.factory.annotation.Required; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.taverna.workflowmodel.Edits; +import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException; +import org.apache.taverna.workflowmodel.processor.activity.ActivityFactory; +import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort; +import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort; +import org.apache.taverna.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean; +import org.apache.taverna.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean; public class ComponentActivityFactory extends ComponentExceptionFactory implements ActivityFactory { http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityLocalChecker.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityLocalChecker.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityLocalChecker.java index a1223c2..60a74bd 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityLocalChecker.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityLocalChecker.java @@ -1,13 +1,12 @@ package org.apache.taverna.component.activity; -import static net.sf.taverna.t2.visit.VisitReport.Status.WARNING; import static org.apache.taverna.component.activity.ComponentHealthCheck.NON_SHAREABLE; import java.util.List; - -import net.sf.taverna.t2.visit.VisitKind; -import net.sf.taverna.t2.visit.VisitReport; -import net.sf.taverna.t2.workflowmodel.health.HealthChecker; +import org.apache.taverna.visit.VisitKind; +import org.apache.taverna.visit.VisitReport; +import static org.apache.taverna.visit.VisitReport.Status.WARNING; +import org.apache.taverna.workflowmodel.health.HealthChecker; /** * Component health checker http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityUpgradeChecker.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityUpgradeChecker.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityUpgradeChecker.java index 1d57df3..5fbaac5 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityUpgradeChecker.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityUpgradeChecker.java @@ -3,19 +3,18 @@ */ package org.apache.taverna.component.activity; -import static net.sf.taverna.t2.visit.VisitReport.Status.WARNING; import static org.apache.log4j.Logger.getLogger; import static org.apache.taverna.component.activity.ComponentHealthCheck.OUT_OF_DATE; import java.util.List; -import net.sf.taverna.t2.visit.VisitKind; -import net.sf.taverna.t2.visit.VisitReport; -import net.sf.taverna.t2.workflowmodel.health.HealthChecker; - import org.apache.log4j.Logger; import org.apache.taverna.component.api.ComponentException; import org.apache.taverna.component.registry.ComponentUtil; +import org.apache.taverna.visit.VisitKind; +import org.apache.taverna.visit.VisitReport; +import static org.apache.taverna.visit.VisitReport.Status.WARNING; +import org.apache.taverna.workflowmodel.health.HealthChecker; import org.springframework.beans.factory.annotation.Required; /** http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentHealthCheck.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentHealthCheck.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentHealthCheck.java index af480da..b33b3e4 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentHealthCheck.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentHealthCheck.java @@ -1,7 +1,7 @@ package org.apache.taverna.component.activity; -import net.sf.taverna.t2.visit.VisitKind; -import net.sf.taverna.t2.visit.Visitor; +import org.apache.taverna.visit.VisitKind; +import org.apache.taverna.visit.Visitor; public class ComponentHealthCheck extends VisitKind { public static final int NO_PROBLEM = 0; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ProxyCallback.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ProxyCallback.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ProxyCallback.java index 927d63d..4ffd6c1 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ProxyCallback.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ProxyCallback.java @@ -3,9 +3,6 @@ */ package org.apache.taverna.component.activity; -import static net.sf.taverna.t2.reference.T2ReferenceType.ErrorDocument; -import static net.sf.taverna.t2.reference.T2ReferenceType.IdentifiedList; -import static net.sf.taverna.t2.reference.T2ReferenceType.ReferenceSet; import static org.apache.log4j.Logger.getLogger; import java.util.ArrayList; @@ -18,20 +15,22 @@ import java.util.Set; import javax.xml.ws.Holder; -import net.sf.taverna.t2.invocation.InvocationContext; -import net.sf.taverna.t2.reference.ErrorDocument; -import net.sf.taverna.t2.reference.ErrorDocumentService; -import net.sf.taverna.t2.reference.IdentifiedList; -import net.sf.taverna.t2.reference.ListService; -import net.sf.taverna.t2.reference.ReferenceService; -import net.sf.taverna.t2.reference.T2Reference; -import net.sf.taverna.t2.workflowmodel.processor.activity.AsynchronousActivityCallback; -import net.sf.taverna.t2.workflowmodel.processor.dispatch.events.DispatchErrorType; - import org.apache.log4j.Logger; import org.apache.taverna.component.api.profile.ExceptionHandling; import org.apache.taverna.component.api.profile.ExceptionReplacement; import org.apache.taverna.component.api.profile.HandleException; +import org.apache.taverna.invocation.InvocationContext; +import org.apache.taverna.reference.ErrorDocument; +import org.apache.taverna.reference.ErrorDocumentService; +import org.apache.taverna.reference.IdentifiedList; +import org.apache.taverna.reference.ListService; +import org.apache.taverna.reference.ReferenceService; +import org.apache.taverna.reference.T2Reference; +import static org.apache.taverna.reference.T2ReferenceType.ErrorDocument; +import static org.apache.taverna.reference.T2ReferenceType.IdentifiedList; +import static org.apache.taverna.reference.T2ReferenceType.ReferenceSet; +import org.apache.taverna.workflowmodel.processor.activity.AsynchronousActivityCallback; +import org.apache.taverna.workflowmodel.processor.dispatch.events.DispatchErrorType; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/BaseProfileLocator.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/BaseProfileLocator.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/BaseProfileLocator.java index 5694aa2..475accb 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/BaseProfileLocator.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/BaseProfileLocator.java @@ -25,8 +25,7 @@ import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.params.HttpClientParams; import org.apache.log4j.Logger; import org.apache.taverna.component.api.ComponentException; - -import uk.org.taverna.configuration.app.ApplicationConfiguration; +import org.apache.taverna.configuration.app.ApplicationConfiguration; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/ComponentProfileImpl.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/ComponentProfileImpl.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/ComponentProfileImpl.java index 28ae9be..66497ef 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/ComponentProfileImpl.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/ComponentProfileImpl.java @@ -24,8 +24,6 @@ import static com.hp.hpl.jena.rdf.model.ModelFactory.createOntologyModel; import static java.lang.System.identityHashCode; import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; -import static net.sf.taverna.t2.workflowmodel.health.HealthCheck.NO_PROBLEM; -import static net.sf.taverna.t2.workflowmodel.health.RemoteHealthChecker.contactEndpoint; import static org.apache.log4j.Logger.getLogger; import java.io.FileNotFoundException; @@ -70,6 +68,8 @@ import org.apache.taverna.component.api.profile.doc.SemanticAnnotation; import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.ontology.OntProperty; +import static org.apache.taverna.workflowmodel.health.HealthCheck.NO_PROBLEM; +import org.apache.taverna.workflowmodel.health.RemoteHealthChecker; /** * A ComponentProfile specifies the inputs, outputs and semantic annotations @@ -375,7 +375,7 @@ public class ComponentProfileImpl implements } private boolean isAccessible(String ontologyURI) { - return contactEndpoint(null, ontologyURI).getResultId() == NO_PROBLEM; + return RemoteHealthChecker.contactEndpoint(null, ontologyURI).getResultId() == NO_PROBLEM; } @Override http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/Client.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/Client.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/Client.java index 0fe6304..a4a2f5f 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/Client.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/Client.java @@ -38,15 +38,14 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import net.sf.taverna.t2.security.credentialmanager.CMException; -import net.sf.taverna.t2.security.credentialmanager.CredentialManager; -import net.sf.taverna.t2.security.credentialmanager.UsernamePassword; - import org.apache.commons.io.IOUtils; import org.apache.log4j.Logger; import org.apache.taverna.component.api.ComponentException; import org.apache.taverna.component.registry.standard.Client.MyExperimentConnector.ServerResponse; import org.apache.taverna.component.registry.standard.annotations.Unused; +import org.apache.taverna.security.credentialmanager.CMException; +import org.apache.taverna.security.credentialmanager.CredentialManager; +import org.apache.taverna.security.credentialmanager.UsernamePassword; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.SAXException; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentRegistry.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentRegistry.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentRegistry.java index 9217752..50cc469 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentRegistry.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentRegistry.java @@ -15,8 +15,6 @@ import java.util.Set; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import net.sf.taverna.t2.security.credentialmanager.CredentialManager; - import org.apache.log4j.Logger; import org.apache.taverna.component.api.Component; import org.apache.taverna.component.api.ComponentException; @@ -46,6 +44,7 @@ import org.apache.taverna.component.utils.AnnotationUtils; import org.apache.taverna.component.utils.SystemUtils; import org.apache.taverna.scufl2.api.container.WorkflowBundle; +import org.apache.taverna.security.credentialmanager.CredentialManager; class NewComponentRegistry extends ComponentRegistry { private static final String PROFILE_MIME_TYPE = "application/vnd.taverna.component-profile+xml"; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentRegistryFactory.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentRegistryFactory.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentRegistryFactory.java index 04075ad..9f245e2 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentRegistryFactory.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentRegistryFactory.java @@ -7,13 +7,12 @@ import java.net.URL; import java.util.HashMap; import java.util.Map; -import net.sf.taverna.t2.security.credentialmanager.CredentialManager; - import org.apache.taverna.component.api.ComponentException; import org.apache.taverna.component.registry.ComponentRegistry; import org.apache.taverna.component.registry.ComponentUtil; import org.apache.taverna.component.utils.AnnotationUtils; import org.apache.taverna.component.utils.SystemUtils; +import org.apache.taverna.security.credentialmanager.CredentialManager; import org.springframework.beans.factory.annotation.Required; public class NewComponentRegistryFactory { http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity/src/main/java/org/apache/taverna/component/utils/SystemUtils.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/utils/SystemUtils.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/utils/SystemUtils.java index 91fc8f9..dab2692 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/utils/SystemUtils.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/utils/SystemUtils.java @@ -8,16 +8,14 @@ import java.util.List; import javax.xml.bind.JAXBElement; -import net.sf.taverna.t2.workflowmodel.Dataflow; - import org.apache.taverna.component.api.ComponentException; import org.apache.taverna.component.registry.api.Description; +import org.apache.taverna.configuration.app.ApplicationConfiguration; +import org.apache.taverna.platform.execution.api.InvalidWorkflowException; +import org.apache.taverna.platform.execution.api.WorkflowCompiler; import org.apache.taverna.scufl2.api.container.WorkflowBundle; import org.apache.taverna.scufl2.api.io.WorkflowBundleIO; - -import uk.org.taverna.configuration.app.ApplicationConfiguration; -import uk.org.taverna.platform.execution.api.InvalidWorkflowException; -import uk.org.taverna.platform.execution.api.WorkflowCompiler; +import org.apache.taverna.workflowmodel.Dataflow; public class SystemUtils { private static final String T2FLOW_TYPE = "application/vnd.taverna.t2flow+xml";
