You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/02/22 14:38:12 UTC
incubator-taverna-plugin-component git commit: TAVERNA-892 Jena 3.0.0
Repository: incubator-taverna-plugin-component
Updated Branches:
refs/heads/master 8ecbada11 -> e84b5c161
TAVERNA-892 Jena 3.0.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/commit/e84b5c16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/tree/e84b5c16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/diff/e84b5c16
Branch: refs/heads/master
Commit: e84b5c161b8c0282514e5fc93a523dd8f35bdeb7
Parents: 8ecbada
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Feb 22 13:34:00 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 22 13:38:04 2016 +0000
----------------------------------------------------------------------
pom.xml | 4 ++--
.../AbstractSemanticAnnotationContextualView.java | 10 +++++-----
.../ui/annotation/AnnotationPropertyPanelFactory.java | 8 ++++----
.../ui/annotation/DatatypePropertyPanelFactory.java | 8 ++++----
.../ui/annotation/DateTimePropertyPanelFactory.java | 12 ++++++------
.../ui/annotation/FallbackPropertyPanelFactory.java | 4 ++--
.../ObjectPropertyWithIndividualsPanelFactory.java | 12 ++++++------
.../ui/annotation/PropertyPanelFactorySPI.java | 4 ++--
.../ui/annotation/SemanticAnnotationPanel.java | 6 +++---
.../ui/annotation/SemanticAnnotationUtils.java | 14 +++++++-------
.../component/ui/annotation/TurtleInputPanel.java | 8 ++++----
.../ui/annotation/UnrecognizedStatementPanel.java | 2 +-
.../taverna/component/ui/localworld/LocalWorld.java | 10 +++++-----
.../ComponentActivitySemanticAnnotationPanel.java | 4 ++--
taverna-component-activity/pom.xml | 12 +++---------
.../component/profile/ComponentProfileImpl.java | 8 ++++----
.../profile/SemanticAnnotationProfileImpl.java | 10 +++++-----
.../taverna/component/utils/AnnotationUtils.java | 8 ++++----
taverna-component-repository-api/pom.xml | 7 +++----
.../apache/taverna/component/api/profile/Profile.java | 2 +-
.../api/profile/SemanticAnnotationProfile.java | 8 ++++----
21 files changed, 77 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 26dca60..f73a7c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,8 +49,8 @@
<packaging>pom</packaging>
<name>Apache Taverna Plugin for Component activity</name>
<properties>
- <taverna.language.version>0.15.1-incubating</taverna.language.version>
- <taverna.osgi.version>0.2.0-incubating-SNAPSHOT</taverna.osgi.version>
+ <taverna.language.version>0.15.1-incubating-SNAPSHOT</taverna.language.version>
+ <taverna.osgi.version>0.2.1-incubating-SNAPSHOT</taverna.osgi.version>
<taverna.engine.version>3.1.0-incubating-SNAPSHOT</taverna.engine.version>
<taverna.commonactivities.version>2.1.0-incubating-SNAPSHOT</taverna.commonactivities.version>
<taverna.workbench.version>3.1.0-incubating-SNAPSHOT</taverna.workbench.version>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AbstractSemanticAnnotationContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AbstractSemanticAnnotationContextualView.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AbstractSemanticAnnotationContextualView.java
index db8d890..8a0089e 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AbstractSemanticAnnotationContextualView.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AbstractSemanticAnnotationContextualView.java
@@ -52,11 +52,11 @@ import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
import org.apache.taverna.scufl2.api.common.AbstractNamed;
import org.apache.taverna.scufl2.api.common.Named;
-import com.hp.hpl.jena.ontology.OntProperty;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
+import org.apache.jena.ontology.OntProperty;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Statement;
import org.apache.taverna.workbench.file.FileManager;
import org.apache.taverna.workbench.ui.views.contextualviews.ContextualView;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AnnotationPropertyPanelFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AnnotationPropertyPanelFactory.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AnnotationPropertyPanelFactory.java
index 7932e86..0f8d642 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AnnotationPropertyPanelFactory.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AnnotationPropertyPanelFactory.java
@@ -19,7 +19,7 @@
package org.apache.taverna.component.ui.annotation;
-import static com.hp.hpl.jena.rdf.model.ResourceFactory.createTypedLiteral;
+import static org.apache.jena.rdf.model.ResourceFactory.createTypedLiteral;
import static java.lang.Integer.MIN_VALUE;
import static org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.getObjectName;
@@ -28,9 +28,9 @@ import javax.swing.JTextArea;
import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
-import com.hp.hpl.jena.ontology.OntProperty;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Statement;
+import org.apache.jena.ontology.OntProperty;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Statement;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DatatypePropertyPanelFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DatatypePropertyPanelFactory.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DatatypePropertyPanelFactory.java
index 208dff7..5a0c478 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DatatypePropertyPanelFactory.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DatatypePropertyPanelFactory.java
@@ -19,7 +19,7 @@
package org.apache.taverna.component.ui.annotation;
-import static com.hp.hpl.jena.rdf.model.ResourceFactory.createTypedLiteral;
+import static org.apache.jena.rdf.model.ResourceFactory.createTypedLiteral;
import static java.lang.Integer.MIN_VALUE;
import static org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.getObjectName;
@@ -28,9 +28,9 @@ import javax.swing.JTextArea;
import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
-import com.hp.hpl.jena.ontology.OntProperty;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Statement;
+import org.apache.jena.ontology.OntProperty;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Statement;
/**
* @author Alan Williams
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DateTimePropertyPanelFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DateTimePropertyPanelFactory.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DateTimePropertyPanelFactory.java
index d0dd9e3..42b14aa 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DateTimePropertyPanelFactory.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DateTimePropertyPanelFactory.java
@@ -19,8 +19,8 @@
package org.apache.taverna.component.ui.annotation;
-import static com.hp.hpl.jena.datatypes.xsd.XSDDatatype.XSDdateTime;
-import static com.hp.hpl.jena.rdf.model.ResourceFactory.createTypedLiteral;
+import static org.apache.jena.datatypes.xsd.XSDDatatype.XSDdateTime;
+import static org.apache.jena.rdf.model.ResourceFactory.createTypedLiteral;
import static java.lang.Integer.MIN_VALUE;
import java.util.Calendar;
@@ -34,10 +34,10 @@ import javax.swing.text.DefaultCaret;
import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
-import com.hp.hpl.jena.datatypes.xsd.XSDDateTime;
-import com.hp.hpl.jena.ontology.OntProperty;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Statement;
+import org.apache.jena.datatypes.xsd.XSDDateTime;
+import org.apache.jena.ontology.OntProperty;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Statement;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/FallbackPropertyPanelFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/FallbackPropertyPanelFactory.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/FallbackPropertyPanelFactory.java
index 2ed3048..3075ae6 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/FallbackPropertyPanelFactory.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/FallbackPropertyPanelFactory.java
@@ -24,8 +24,8 @@ import javax.swing.JLabel;
import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Statement;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/ObjectPropertyWithIndividualsPanelFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/ObjectPropertyWithIndividualsPanelFactory.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/ObjectPropertyWithIndividualsPanelFactory.java
index 3731049..e26405c 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/ObjectPropertyWithIndividualsPanelFactory.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/ObjectPropertyWithIndividualsPanelFactory.java
@@ -49,12 +49,12 @@ import javax.swing.ListCellRenderer;
import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
import org.apache.taverna.component.ui.localworld.LocalWorld;
-import com.hp.hpl.jena.ontology.Individual;
-import com.hp.hpl.jena.ontology.OntClass;
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntProperty;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Statement;
+import org.apache.jena.ontology.Individual;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntProperty;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Statement;
import org.apache.taverna.lang.ui.DeselectingButton;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/PropertyPanelFactorySPI.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/PropertyPanelFactorySPI.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/PropertyPanelFactorySPI.java
index b1446b7..426ae81 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/PropertyPanelFactorySPI.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/PropertyPanelFactorySPI.java
@@ -28,8 +28,8 @@ import javax.swing.border.EmptyBorder;
import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Statement;
/**
* @author David Withers
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationPanel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationPanel.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationPanel.java
index c88b455..3f3a1ee 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationPanel.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationPanel.java
@@ -60,9 +60,9 @@ import javax.swing.border.EmptyBorder;
import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
-import com.hp.hpl.jena.ontology.OntProperty;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Statement;
+import org.apache.jena.ontology.OntProperty;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Statement;
import org.apache.taverna.lang.ui.DeselectingButton;
public class SemanticAnnotationPanel extends JPanel {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationUtils.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationUtils.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationUtils.java
index 7d41228..4a209e7 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationUtils.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationUtils.java
@@ -19,7 +19,7 @@
package org.apache.taverna.component.ui.annotation;
-import static com.hp.hpl.jena.rdf.model.ModelFactory.createDefaultModel;
+import static org.apache.jena.rdf.model.ModelFactory.createDefaultModel;
import static org.apache.log4j.Logger.getLogger;
import java.io.IOException;
@@ -39,12 +39,12 @@ import org.apache.taverna.scufl2.api.annotation.Annotation;
import org.apache.taverna.scufl2.api.common.AbstractNamed;
import org.apache.taverna.scufl2.api.container.WorkflowBundle;
-import com.hp.hpl.jena.ontology.OntProperty;
-import com.hp.hpl.jena.ontology.OntResource;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
+import org.apache.jena.ontology.OntProperty;
+import org.apache.jena.ontology.OntResource;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Statement;
/**
* @author David Withers
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/TurtleInputPanel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/TurtleInputPanel.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/TurtleInputPanel.java
index 2febeed..22e0a8c 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/TurtleInputPanel.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/TurtleInputPanel.java
@@ -19,7 +19,7 @@
package org.apache.taverna.component.ui.annotation;
-import static com.hp.hpl.jena.rdf.model.ModelFactory.createOntologyModel;
+import static org.apache.jena.rdf.model.ModelFactory.createOntologyModel;
import static java.awt.BorderLayout.CENTER;
import static java.awt.BorderLayout.EAST;
import static java.awt.BorderLayout.SOUTH;
@@ -35,9 +35,9 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
-import com.hp.hpl.jena.ontology.Individual;
-import com.hp.hpl.jena.ontology.OntClass;
-import com.hp.hpl.jena.ontology.OntModel;
+import org.apache.jena.ontology.Individual;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntModel;
import org.apache.taverna.lang.ui.DeselectingButton;
import org.apache.taverna.lang.ui.ReadOnlyTextArea;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/UnrecognizedStatementPanel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/UnrecognizedStatementPanel.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/UnrecognizedStatementPanel.java
index 4a37150..2ad4ed8 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/UnrecognizedStatementPanel.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/UnrecognizedStatementPanel.java
@@ -26,7 +26,7 @@ import java.awt.BorderLayout;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import com.hp.hpl.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.Statement;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/localworld/LocalWorld.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/localworld/LocalWorld.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/localworld/LocalWorld.java
index 0153a2d..8851644 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/localworld/LocalWorld.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/localworld/LocalWorld.java
@@ -19,7 +19,7 @@
package org.apache.taverna.component.ui.localworld;
-import static com.hp.hpl.jena.rdf.model.ModelFactory.createOntologyModel;
+import static org.apache.jena.rdf.model.ModelFactory.createOntologyModel;
import static org.apache.log4j.Logger.getLogger;
import static org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.createTurtle;
import static org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.populateModelFromString;
@@ -35,10 +35,10 @@ import java.util.List;
import org.apache.log4j.Logger;
-import com.hp.hpl.jena.ontology.Individual;
-import com.hp.hpl.jena.ontology.OntClass;
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.rdf.model.Resource;
+import org.apache.jena.ontology.Individual;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.rdf.model.Resource;
import org.apache.taverna.configuration.app.ApplicationConfiguration;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/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 2739e5d..bfb7f37 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
@@ -44,8 +44,8 @@ import javax.swing.border.EmptyBorder;
import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
-import com.hp.hpl.jena.ontology.OntProperty;
-import com.hp.hpl.jena.rdf.model.Statement;
+import org.apache.jena.ontology.OntProperty;
+import org.apache.jena.rdf.model.Statement;
public class ComponentActivitySemanticAnnotationPanel extends JPanel {
private static final long serialVersionUID = 3599768150252711758L;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/taverna-component-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-component-activity/pom.xml b/taverna-component-activity/pom.xml
index c5b94c6..0801684 100644
--- a/taverna-component-activity/pom.xml
+++ b/taverna-component-activity/pom.xml
@@ -179,15 +179,9 @@
</dependency>
<dependency>
- <groupId>org.apache.clerezza.ext</groupId>
- <artifactId>com.hp.hpl.jena</artifactId>
- <version>0.6-incubating</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-osgi</artifactId>
+ <version>${jena.version}</version>
</dependency>
<dependency>
<groupId>org.apache.taverna.engine</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/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 66497ef..fae98a6 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
@@ -20,7 +20,7 @@
******************************************************************************/
package org.apache.taverna.component.profile;
-import static com.hp.hpl.jena.rdf.model.ModelFactory.createOntologyModel;
+import static org.apache.jena.rdf.model.ModelFactory.createOntologyModel;
import static java.lang.System.identityHashCode;
import static java.util.Collections.emptyList;
import static java.util.Collections.emptyMap;
@@ -65,9 +65,9 @@ import org.apache.taverna.component.api.profile.doc.Port;
import org.apache.taverna.component.api.profile.doc.Profile;
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 org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntProperty;
import static org.apache.taverna.workflowmodel.health.HealthCheck.NO_PROBLEM;
import org.apache.taverna.workflowmodel.health.RemoteHealthChecker;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/SemanticAnnotationProfileImpl.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/SemanticAnnotationProfileImpl.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/SemanticAnnotationProfileImpl.java
index 797a88c..d928446 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/SemanticAnnotationProfileImpl.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/SemanticAnnotationProfileImpl.java
@@ -34,11 +34,11 @@ import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
import org.apache.taverna.component.api.profile.doc.SemanticAnnotation;
-import com.hp.hpl.jena.ontology.Individual;
-import com.hp.hpl.jena.ontology.OntClass;
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntProperty;
-import com.hp.hpl.jena.ontology.OntResource;
+import org.apache.jena.ontology.Individual;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntProperty;
+import org.apache.jena.ontology.OntResource;
/**
* Definition of a semantic annotation for a component element.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/taverna-component-activity/src/main/java/org/apache/taverna/component/utils/AnnotationUtils.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/utils/AnnotationUtils.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/utils/AnnotationUtils.java
index 3890f4e..c024e64 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/utils/AnnotationUtils.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/utils/AnnotationUtils.java
@@ -11,10 +11,10 @@ import org.apache.taverna.scufl2.api.common.URITools;
import org.apache.taverna.scufl2.api.container.WorkflowBundle;
import org.apache.taverna.scufl2.ucfpackage.UCFPackage.ResourceEntry;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.Statement;
public class AnnotationUtils {
private static final String TITLE_ANNOTATION = "http://purl.org/dc/terms/title";
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/taverna-component-repository-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-component-repository-api/pom.xml b/taverna-component-repository-api/pom.xml
index 7a72339..d8254af 100644
--- a/taverna-component-repository-api/pom.xml
+++ b/taverna-component-repository-api/pom.xml
@@ -54,10 +54,9 @@
<version>${taverna.language.version}</version>
</dependency>
<dependency>
- <!-- FIXME: Use jena-osgi bundle -->
- <groupId>org.apache.clerezza.ext</groupId>
- <artifactId>com.hp.hpl.jena</artifactId>
- <version>0.6-incubating</version>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-osgi</artifactId>
+ <version>${jena.version}</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/profile/Profile.java
----------------------------------------------------------------------
diff --git a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/profile/Profile.java b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/profile/Profile.java
index 6609a15..d048f00 100644
--- a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/profile/Profile.java
+++ b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/profile/Profile.java
@@ -7,7 +7,7 @@ import org.apache.taverna.component.api.ComponentException;
import org.apache.taverna.component.api.NamedItem;
import org.apache.taverna.component.api.Registry;
-import com.hp.hpl.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntModel;
public interface Profile extends NamedItem, AnnotatedElement {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/e84b5c16/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/profile/SemanticAnnotationProfile.java
----------------------------------------------------------------------
diff --git a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/profile/SemanticAnnotationProfile.java b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/profile/SemanticAnnotationProfile.java
index 6d5694b..e154138 100644
--- a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/profile/SemanticAnnotationProfile.java
+++ b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/profile/SemanticAnnotationProfile.java
@@ -2,10 +2,10 @@ package org.apache.taverna.component.api.profile;
import java.util.List;
-import com.hp.hpl.jena.ontology.Individual;
-import com.hp.hpl.jena.ontology.OntClass;
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntProperty;
+import org.apache.jena.ontology.Individual;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntProperty;
public interface SemanticAnnotationProfile {