Author: misl
Date: Fri Apr 26 14:28:57 2013
New Revision: 1476222
URL: http://svn.apache.org/r1476222
Log:
First (complete?) set of changes for upgrading Jena 2.6.4 --> 2.10.0
Added:
clerezza/branches/726-UpgradeJena/ext.org.apache.jena/
- copied from r1476182,
clerezza/branches/726-UpgradeJena/ext.com.hp.hpl.jena/
clerezza/branches/726-UpgradeJena/ext.org.apache.jena.tdb/
- copied from r1476182,
clerezza/branches/726-UpgradeJena/ext.com.hp.hpl.jena.tdb/
Removed:
clerezza/branches/726-UpgradeJena/ext.com.hp.hpl.jena/
clerezza/branches/726-UpgradeJena/ext.com.hp.hpl.jena.tdb/
clerezza/branches/726-UpgradeJena/rdf.jena.facade/src/main/java/org/apache/clerezza/rdf/jena/facade/DirectReifier.java
Modified:
clerezza/branches/726-UpgradeJena/ext.org.apache.jena.tdb/pom.xml
clerezza/branches/726-UpgradeJena/ext.org.apache.jena/pom.xml
clerezza/branches/726-UpgradeJena/maven-pladoc-plugin/maven-pladoc-plugin.core/pom.xml
clerezza/branches/726-UpgradeJena/parent/pom.xml
clerezza/branches/726-UpgradeJena/platform.launcher.storageless.parent/pom.xml
clerezza/branches/726-UpgradeJena/platform.launcher.tdb/pom.xml
clerezza/branches/726-UpgradeJena/platform.testing/pom.xml
clerezza/branches/726-UpgradeJena/pom.xml
clerezza/branches/726-UpgradeJena/rdf.jena.commons/pom.xml
clerezza/branches/726-UpgradeJena/rdf.jena.facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java
clerezza/branches/726-UpgradeJena/rdf.jena.sparql/pom.xml
clerezza/branches/726-UpgradeJena/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDataset.java
clerezza/branches/726-UpgradeJena/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java
clerezza/branches/726-UpgradeJena/rdf.jena.tdb.storage/pom.xml
Modified: clerezza/branches/726-UpgradeJena/ext.org.apache.jena.tdb/pom.xml
URL:
http://svn.apache.org/viewvc/clerezza/branches/726-UpgradeJena/ext.org.apache.jena.tdb/pom.xml?rev=1476222&r1=1476182&r2=1476222&view=diff
==============================================================================
--- clerezza/branches/726-UpgradeJena/ext.org.apache.jena.tdb/pom.xml (original)
+++ clerezza/branches/726-UpgradeJena/ext.org.apache.jena.tdb/pom.xml Fri Apr
26 14:28:57 2013
@@ -29,14 +29,14 @@
</parent>
<packaging>bundle</packaging>
<groupId>org.apache.clerezza.ext</groupId>
- <artifactId>com.hp.hpl.jena.tdb</artifactId>
+ <artifactId>org.apache.jena.tdb</artifactId>
<version>0.4-SNAPSHOT</version>
<name>Clerezza Ext - Jena TDB OSGi Bundle</name>
<description>All required dependencies for Jena TDB</description>
<dependencies>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>tdb</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-tdb</artifactId>
<exclusions>
<exclusion>
<artifactId>xmlParserAPIs</artifactId>
@@ -52,7 +52,7 @@
</exclusion>
<exclusion>
<artifactId>jenatest</artifactId>
- <groupId>com.hp.hpl.jena</groupId>
+ <groupId>org.apache.jena</groupId>
</exclusion>
<exclusion>
<artifactId>junit</artifactId>
@@ -83,7 +83,7 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;artifactId=!slf4j-api|org.apache.felix.scr.annotations</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
- <Import-Package>!com.hp.hpl.jena.*.test,
+ <Import-Package>!org.apache.jena.*.test,
!org.apache.xml.resolver.*,!sun.*,
!com.sun.msv.*,
!com.sun.jdmk.*,
@@ -92,7 +92,7 @@
!javax.jmdns,
!org.apache.xerces.util,
*</Import-Package>
- <Export-Package>com.hp.hpl.jena.*</Export-Package>
+ <Export-Package>org.apache.jena.*</Export-Package>
</instructions>
</configuration>
</plugin>
Modified: clerezza/branches/726-UpgradeJena/ext.org.apache.jena/pom.xml
URL:
http://svn.apache.org/viewvc/clerezza/branches/726-UpgradeJena/ext.org.apache.jena/pom.xml?rev=1476222&r1=1476182&r2=1476222&view=diff
==============================================================================
--- clerezza/branches/726-UpgradeJena/ext.org.apache.jena/pom.xml (original)
+++ clerezza/branches/726-UpgradeJena/ext.org.apache.jena/pom.xml Fri Apr 26
14:28:57 2013
@@ -29,14 +29,14 @@
</parent>
<packaging>bundle</packaging>
<groupId>org.apache.clerezza.ext</groupId>
- <artifactId>com.hp.hpl.jena</artifactId>
+ <artifactId>org.apache.jena</artifactId>
<version>0.7-SNAPSHOT</version>
<name>Clerezza Ext - Jena OSGi Bundle</name>
<description>All required dependencies for Jena</description>
<dependencies>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>arq</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
<exclusions>
<exclusion>
<artifactId>xmlParserAPIs</artifactId>
@@ -49,8 +49,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
<exclusions>
<exclusion>
<artifactId>xmlParserAPIs</artifactId>
@@ -80,7 +80,7 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Embed-Dependency>*;artifactId=!slf4j-*|org.apache.felix.scr.annotations</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
- <Import-Package>!com.hp.hpl.jena.*.test,
+ <Import-Package>!org.apache.jena.*.test,
!org.apache.xml.resolver.*,!sun.*,
!com.sun.msv.*,
!com.sun.jdmk.*,
@@ -89,7 +89,7 @@
!com.ibm.uvm.tools,
!javax.jmdns,
*</Import-Package>
- <Export-Package>com.hp.hpl.jena.*,
org.apache.xerces.util</Export-Package>
+ <Export-Package>org.apache.jena.*,
org.apache.xerces.util</Export-Package>
</instructions>
</configuration>
</plugin>
Modified:
clerezza/branches/726-UpgradeJena/maven-pladoc-plugin/maven-pladoc-plugin.core/pom.xml
URL:
http://svn.apache.org/viewvc/clerezza/branches/726-UpgradeJena/maven-pladoc-plugin/maven-pladoc-plugin.core/pom.xml?rev=1476222&r1=1476221&r2=1476222&view=diff
==============================================================================
---
clerezza/branches/726-UpgradeJena/maven-pladoc-plugin/maven-pladoc-plugin.core/pom.xml
(original)
+++
clerezza/branches/726-UpgradeJena/maven-pladoc-plugin/maven-pladoc-plugin.core/pom.xml
Fri Apr 26 14:28:57 2013
@@ -112,7 +112,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza.ext</groupId>
- <artifactId>com.hp.hpl.jena</artifactId>
+ <artifactId>org.apache.jena</artifactId>
<!-- <scope>provided</scope> -->
<exclusions>
<exclusion>
Modified: clerezza/branches/726-UpgradeJena/parent/pom.xml
URL:
http://svn.apache.org/viewvc/clerezza/branches/726-UpgradeJena/parent/pom.xml?rev=1476222&r1=1476221&r2=1476222&view=diff
==============================================================================
--- clerezza/branches/726-UpgradeJena/parent/pom.xml (original)
+++ clerezza/branches/726-UpgradeJena/parent/pom.xml Fri Apr 26 14:28:57 2013
@@ -375,19 +375,19 @@
<version>2.10.0</version>
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- <version>2.6.4</version>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
+ <version>2.10.0</version>
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>tdb</artifactId>
- <version>0.8.9</version>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-tdb</artifactId>
+ <version>0.10.0</version>
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>arq</artifactId>
- <version>2.8.7</version>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
+ <version>2.10.0</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
Modified:
clerezza/branches/726-UpgradeJena/platform.launcher.storageless.parent/pom.xml
URL:
http://svn.apache.org/viewvc/clerezza/branches/726-UpgradeJena/platform.launcher.storageless.parent/pom.xml?rev=1476222&r1=1476221&r2=1476222&view=diff
==============================================================================
---
clerezza/branches/726-UpgradeJena/platform.launcher.storageless.parent/pom.xml
(original)
+++
clerezza/branches/726-UpgradeJena/platform.launcher.storageless.parent/pom.xml
Fri Apr 26 14:28:57 2013
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza.ext</groupId>
- <artifactId>com.hp.hpl.jena</artifactId>
+ <artifactId>org.apache.jena</artifactId>
<scope>runtime</scope>
<version>0.7-SNAPSHOT</version>
</dependency>
Modified: clerezza/branches/726-UpgradeJena/platform.launcher.tdb/pom.xml
URL:
http://svn.apache.org/viewvc/clerezza/branches/726-UpgradeJena/platform.launcher.tdb/pom.xml?rev=1476222&r1=1476221&r2=1476222&view=diff
==============================================================================
--- clerezza/branches/726-UpgradeJena/platform.launcher.tdb/pom.xml (original)
+++ clerezza/branches/726-UpgradeJena/platform.launcher.tdb/pom.xml Fri Apr 26
14:28:57 2013
@@ -70,7 +70,7 @@
<outputDirectory>target/extracted</outputDirectory>
<includes>**</includes>
<excludes>
- META-INF/**,**/com.hp.hpl.jena*
+ META-INF/**,**/org.apache.jena*
</excludes>
</configuration>
</execution>
@@ -186,7 +186,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza.ext</groupId>
- <artifactId>com.hp.hpl.jena.tdb</artifactId>
+ <artifactId>org.apache.jena.tdb</artifactId>
<scope>runtime</scope>
<version>0.4-SNAPSHOT</version>
</dependency>
Modified: clerezza/branches/726-UpgradeJena/platform.testing/pom.xml
URL:
http://svn.apache.org/viewvc/clerezza/branches/726-UpgradeJena/platform.testing/pom.xml?rev=1476222&r1=1476221&r2=1476222&view=diff
==============================================================================
--- clerezza/branches/726-UpgradeJena/platform.testing/pom.xml (original)
+++ clerezza/branches/726-UpgradeJena/platform.testing/pom.xml Fri Apr 26
14:28:57 2013
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza.ext</groupId>
- <artifactId>com.hp.hpl.jena</artifactId>
+ <artifactId>org.apache.jena</artifactId>
</dependency>
<!-- <dependency>
<groupId>org.apache.felix</groupId>
Modified: clerezza/branches/726-UpgradeJena/pom.xml
URL:
http://svn.apache.org/viewvc/clerezza/branches/726-UpgradeJena/pom.xml?rev=1476222&r1=1476221&r2=1476222&view=diff
==============================================================================
--- clerezza/branches/726-UpgradeJena/pom.xml (original)
+++ clerezza/branches/726-UpgradeJena/pom.xml Fri Apr 26 14:28:57 2013
@@ -49,8 +49,8 @@
<module>parent</module>
<module>clerezza-jar-resource-bundle</module>
<module>platform.style.classic.webguiexamples</module>
- <module>ext.com.hp.hpl.jena</module>
- <module>ext.com.hp.hpl.jena.tdb</module>
+ <module>ext.org.apache.jena</module>
+ <module>ext.org.apache.jena.tdb</module>
<module>ext.com.ibm.icu</module>
<module>ext.javax.mail</module>
<module>ext.org.json.simple</module>
Modified: clerezza/branches/726-UpgradeJena/rdf.jena.commons/pom.xml
URL:
http://svn.apache.org/viewvc/clerezza/branches/726-UpgradeJena/rdf.jena.commons/pom.xml?rev=1476222&r1=1476221&r2=1476222&view=diff
==============================================================================
--- clerezza/branches/726-UpgradeJena/rdf.jena.commons/pom.xml (original)
+++ clerezza/branches/726-UpgradeJena/rdf.jena.commons/pom.xml Fri Apr 26
14:28:57 2013
@@ -40,8 +40,8 @@
<version>0.13-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
<exclusions>
<exclusion>
<artifactId>slf4j-log4j12</artifactId>
Modified:
clerezza/branches/726-UpgradeJena/rdf.jena.facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java
URL:
http://svn.apache.org/viewvc/clerezza/branches/726-UpgradeJena/rdf.jena.facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java?rev=1476222&r1=1476221&r2=1476222&view=diff
==============================================================================
---
clerezza/branches/726-UpgradeJena/rdf.jena.facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java
(original)
+++
clerezza/branches/726-UpgradeJena/rdf.jena.facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java
Fri Apr 26 14:28:57 2013
@@ -20,7 +20,6 @@ package org.apache.clerezza.rdf.jena.fac
import com.hp.hpl.jena.graph.Graph;
import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.Reifier;
import com.hp.hpl.jena.graph.TripleMatch;
import com.hp.hpl.jena.graph.impl.GraphBase;
import com.hp.hpl.jena.mem.TrackingTripleIterator;
@@ -150,9 +149,4 @@ public class JenaGraph extends GraphBase
protected ExtendedIterator graphBaseFind(TripleMatch m) {
return new TrackingTripleIterator(convert(filter(m)));
}
-
- @Override
- protected Reifier constructReifier() {
- return new DirectReifier(this);
- }
}
Modified: clerezza/branches/726-UpgradeJena/rdf.jena.sparql/pom.xml
URL:
http://svn.apache.org/viewvc/clerezza/branches/726-UpgradeJena/rdf.jena.sparql/pom.xml?rev=1476222&r1=1476221&r2=1476222&view=diff
==============================================================================
--- clerezza/branches/726-UpgradeJena/rdf.jena.sparql/pom.xml (original)
+++ clerezza/branches/726-UpgradeJena/rdf.jena.sparql/pom.xml Fri Apr 26
14:28:57 2013
@@ -45,8 +45,8 @@
<version>0.13-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>arq</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified:
clerezza/branches/726-UpgradeJena/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDataset.java
URL:
http://svn.apache.org/viewvc/clerezza/branches/726-UpgradeJena/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDataset.java?rev=1476222&r1=1476221&r2=1476222&view=diff
==============================================================================
---
clerezza/branches/726-UpgradeJena/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDataset.java
(original)
+++
clerezza/branches/726-UpgradeJena/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDataset.java
Fri Apr 26 14:28:57 2013
@@ -18,13 +18,15 @@
*/
package org.apache.clerezza.rdf.jena.sparql;
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.Node;
import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.query.LabelExistsException;
+import com.hp.hpl.jena.query.ReadWrite;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.shared.Lock;
import com.hp.hpl.jena.sparql.core.DatasetGraph;
+import com.hp.hpl.jena.sparql.util.Context;
+
import java.util.Iterator;
import org.apache.clerezza.rdf.core.TripleCollection;
import org.apache.clerezza.rdf.core.UriRef;
@@ -108,4 +110,59 @@ public class TcDataset implements Datase
@Override
public void close() {
}
+
+ @Override
+ public void setDefaultModel( Model model ) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void addNamedModel( String uri, Model model ) throws
LabelExistsException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void removeNamedModel( String uri ) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void replaceNamedModel( String uri, Model model ) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Context getContext() {
+ return null;
+ }
+
+ @Override
+ public boolean supportsTransactions() {
+ return false;
+ }
+
+ @Override
+ public void begin( ReadWrite readWrite ) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void commit() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void abort() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public boolean isInTransaction() {
+ return false;
+ }
+
+ @Override
+ public void end() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
}
Modified:
clerezza/branches/726-UpgradeJena/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java
URL:
http://svn.apache.org/viewvc/clerezza/branches/726-UpgradeJena/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java?rev=1476222&r1=1476221&r2=1476222&view=diff
==============================================================================
---
clerezza/branches/726-UpgradeJena/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java
(original)
+++
clerezza/branches/726-UpgradeJena/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java
Fri Apr 26 14:28:57 2013
@@ -180,5 +180,14 @@ class TcDatasetGraph implements DatasetG
public Iterator<Quad> findNG(Node node, Node node1, Node node2, Node
node3) {
throw new UnsupportedOperationException("Not supported yet.");
}
-
+
+ @Override
+ public void add( Node g, Node s, Node p, Node o ) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void delete( Node g, Node s, Node p, Node o ) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
}
Modified: clerezza/branches/726-UpgradeJena/rdf.jena.tdb.storage/pom.xml
URL:
http://svn.apache.org/viewvc/clerezza/branches/726-UpgradeJena/rdf.jena.tdb.storage/pom.xml?rev=1476222&r1=1476221&r2=1476222&view=diff
==============================================================================
--- clerezza/branches/726-UpgradeJena/rdf.jena.tdb.storage/pom.xml (original)
+++ clerezza/branches/726-UpgradeJena/rdf.jena.tdb.storage/pom.xml Fri Apr 26
14:28:57 2013
@@ -61,8 +61,8 @@
<artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>tdb</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-tdb</artifactId>
<exclusions>
<exclusion>
<groupId>com.sun.jmx</groupId>
