[Mulgara-svn] r107 - in trunk: . src/jar src/jar/query/java/org/mulgara/server src/jar/resolver src/jar/resolver/java/org/mulgara/resolver src/jar/server-local/java/org/mulgara/server/local src/jar/server-rmi src/jar/server-rmi/java/org/mulgara/server/rmi
andrae at mulgara.org
andrae at mulgara.org
Mon Oct 23 06:07:11 UTC 2006
Author: andrae
Date: 2006-10-23 01:07:11 -0500 (Mon, 23 Oct 2006)
New Revision: 107
Removed:
trunk/src/jar/client-jena/
trunk/src/jar/jena/
trunk/src/jar/resolver/java/org/mulgara/resolver/LocalJenaDatabaseSession.java
Modified:
trunk/build.xml
trunk/src/jar/query/java/org/mulgara/server/SessionFactory.java
trunk/src/jar/resolver/build.xml
trunk/src/jar/resolver/java/org/mulgara/resolver/Database.java
trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java
trunk/src/jar/resolver/java/org/mulgara/resolver/JRDFFactoryImpl.java
trunk/src/jar/server-local/java/org/mulgara/server/local/LocalSessionFactory.java
trunk/src/jar/server-rmi/build.xml
trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionFactory.java
trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionFactoryImpl.java
trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiSessionFactory.java
Log:
This commit removes the jena interface from Mulgara.
Note: This passes jxunit-test and resolver-test. Currently running full
tests to ensure everything passes. Committing now to permit me to proceed
onto removing relatedTo.
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2006-10-22 12:00:10 UTC (rev 106)
+++ trunk/build.xml 2006-10-23 06:07:11 UTC (rev 107)
@@ -14,7 +14,6 @@
<property file="${jar.src.dir}/ant-task/ant-task-build.properties"/>
<property file="${jar.src.dir}/client-drools/client-drools-build.properties"/>
- <property file="${jar.src.dir}/client-jena/client-jena-build.properties"/>
<property file="${jar.src.dir}/client-jrdf/client-jrdf-build.properties"/>
<property file="${jar.src.dir}/config/config-build.properties"/>
<property file="${jar.src.dir}/demo/demo-build.properties"/>
@@ -30,7 +29,6 @@
<property file="${jar.src.dir}/driver/driver-build.properties"/>
<property file="${jar.src.dir}/dtd/dtd-build.properties"/>
<property file="${jar.src.dir}/itql/itql-build.properties"/>
- <property file="${jar.src.dir}/jena/jena-build.properties"/>
<property file="${jar.src.dir}/jrdf/jrdf-build.properties"/>
<property file="${jar.src.dir}/query/query-build.properties"/>
<!--property file="${jar.src.dir}/rdql/rdql-build.properties"/-->
@@ -86,7 +84,6 @@
<import file="${jar.src.dir}/ant-task/build.xml"/>
<import file="${jar.src.dir}/client-drools/build.xml"/>
- <import file="${jar.src.dir}/client-jena/build.xml"/>
<import file="${jar.src.dir}/client-jrdf/build.xml"/>
<import file="${jar.src.dir}/demo/build.xml"/>
<import file="${jar.src.dir}/demo-mp3/build.xml"/>
@@ -102,7 +99,6 @@
<import file="${jar.src.dir}/driver/build.xml"/>
<import file="${jar.src.dir}/dtd/build.xml"/>
<import file="${jar.src.dir}/itql/build.xml"/>
- <import file="${jar.src.dir}/jena/build.xml"/>
<import file="${jar.src.dir}/jrdf/build.xml"/>
<import file="${jar.src.dir}/query/build.xml"/>
<!--import file="${jar.src.dir}/rdql/build.xml"/-->
@@ -488,8 +484,7 @@
lib/${content-n3.jar}, lib/${content-mbox.jar}, lib/${content-rdfxml.jar},
lib/${content-rio.jar}, lib/${resolver-nodetype.jar}, lib/${resolver-prefix.jar},
lib/${resolver-relational.jar}, lib/${resolver-xsd.jar}, lib/${resolver-test.jar},
- lib/${resolver-jar.jar}, lib/${client-jena.jar}, lib/${dtd.jar},
- lib/${jena.base.jar}, lib/${jrdf.base.jar}
+ lib/${resolver-jar.jar}, lib/${dtd.jar}, lib/${jrdf.base.jar}
lib/activation-1.0.2.jar, lib/icu4j.jar, lib/jena-2.1.jar, lib/antlr.jar,
lib/${date-utils.jar}, lib/${commons-logging.jar}, lib/beepcore-0.9.08.jar, lib/log4j-1.2.8.jar, lib/${lucene.jar}, lib/mail-1.3.jar,
lib/${jetty.jar}, lib/${jetty.plus.jar}, lib/${jasper.compiler.jar}, lib/${servlet.jar}, lib/jargs-0.2.jar,
@@ -571,8 +566,7 @@
${content-n3.jar}, ${content-mbox.jar}, ${content-rdfxml.jar},
${content-rio.jar}, ${resolver-nodetype.jar}, ${resolver-prefix.jar},
${resolver-xsd.jar}, ${resolver-test.jar}, ${resolver-relational.jar},
- ${resolver-jar.jar}, ${client-jena.jar}, ${dtd.jar},
- ${jena.base.jar}, ${jrdf.base.jar}"/>
+ ${resolver-jar.jar}, ${dtd.jar}, ${jrdf.base.jar}"/>
<!-- Schemas -->
<zipfileset dir="${basedir}/data" prefix="data"
@@ -728,10 +722,10 @@
<!-- =================================================================== -->
<target name="javadoc"
depends="javadoc-uptodate, javadoc-overview.html,
- ant-task-jar, client-jena-jar, client-jrdf-jar, config-jar,
+ ant-task-jar, client-jrdf-jar, config-jar,
connection-jar, content-mbox-jar, content-mp3-jar,
content-n3-jar, content-rdfxml-jar, content-rio-jar,
- doclet.jar, itql-jar, jena-jar, jrdf-jar, store-jar,
+ doclet.jar, itql-jar, jrdf-jar, store-jar,
store-xa-jar, connection-jar,
store-nodepool-jar, store-nodepool-memory-jar,
store-nodepool-xa-jar, query-jar,
@@ -759,7 +753,6 @@
org.mulgara.driver.*,
org.mulgara.extractor.tag,
org.mulgara.itql,
- org.mulgara.jena,
org.mulgara.jrdf,
org.mulgara.local.*,
org.mulgara.query.*,
@@ -774,7 +767,6 @@
org.mulgara.store.*,
org.mulgara.store.graph.*,
org.mulgara.store.graph.xa.*,
- org.mulgara.store.jena.*,
org.mulgara.store.jxunit.*,
org.mulgara.store.loader.*,
org.mulgara.store.nodepool.*,
@@ -821,7 +813,6 @@
<classpath path="${lib.dir}/xmlc-all-runtime-2.2.jar"/>
<classpath path="${lib.dir}/xom-1.0d21.jar"/>
<sourcepath path="${ant-task.src.dir}/java"/>
- <sourcepath path="${client-jena.src.dir}/java"/>
<sourcepath path="${client-jrdf.src.dir}/java"/>
<sourcepath path="${connection.src.dir}/java"/>
<sourcepath path="${content-mp3.src.dir}/java"/>
@@ -831,7 +822,6 @@
<sourcepath path="${driver.src.dir}/java"/>
<sourcepath path="${dtd.src.dir}/java"/>
<sourcepath path="${itql.src.dir}/java"/>
- <sourcepath path="${jena.src.dir}/java"/>
<sourcepath path="${jrdf.src.dir}/java"/>
<sourcepath path="${krule.src.dir}/java"/>
<sourcepath path="${rules.src.dir}/java"/>
@@ -1710,7 +1700,7 @@
<!-- Creates the distribution file for the Embedded Mulgara server -->
<!-- =================================================================== -->
<target name="embedded-dist"
- depends="client-jrdf-jar, client-jena-jar, config-jar,
+ depends="client-jrdf-jar, config-jar,
content-mbox-jar, content-mp3-jar, content-n3-jar,
content-rdfxml-jar, content-rio-jar,
create-manifest, demo-jar, dtd-jar, driver-jar, dtd-jar, itql-jar,
@@ -1725,7 +1715,7 @@
server-jar, server-beep-jar, server-rmi-jar,
sofa-jar, rules-jar, krule-jar, store-stringpool-jar, store-stringpool-memory-jar,
store-stringpool-xa-jar, tuples-jar,
- tuples-hybrid-jar, util-jar, util-xa-jar, jena-jar,
+ tuples-hybrid-jar, util-jar, util-xa-jar,
webservices-war, webui-war, -embedded-dist-uptodate"
description="Creates the executable JAR for the Embedded Mulgara server"
unless="embedded.dist.uptodate">
@@ -1829,10 +1819,8 @@
<zipfileset src="${bin.dir}/${resolver-xsd.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${resolver-test.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${resolver-jar.jar}" excludes="META-INF/**"/>
- <zipfileset src="${bin.dir}/${client-jena.jar}" excludes="META-INF/**"/>
<zipfileset src="${lib.dir}/${jid3.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${dtd.jar}" excludes="META-INF/**"/>
- <zipfileset src="${bin.dir}/${jena.base.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${jrdf.base.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${rules.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${krule.jar}" excludes="META-INF/**"/>
@@ -1933,14 +1921,14 @@
</target>
<target name="client-test"
- depends="client-drools-test, client-jrdf-test, client-jena-test,
+ depends="client-drools-test, client-jrdf-test,
demo-mp3-test, driver-test, itql-test, query-test,
connector-test, connection-test, descriptor-test"
description="Runs client side tests">
</target>
<target name="session-test"
- depends="jena-test, jrdf-test, server-test,
+ depends="jrdf-test, server-test,
server-beep-test, server-http-test, server-local-test,
server-rmi-test"
description="Runs session based tests">
Modified: trunk/src/jar/query/java/org/mulgara/server/SessionFactory.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/server/SessionFactory.java 2006-10-22 12:00:10 UTC (rev 106)
+++ trunk/src/jar/query/java/org/mulgara/server/SessionFactory.java 2006-10-23 06:07:11 UTC (rev 107)
@@ -86,14 +86,6 @@
public Session newJRDFSession() throws QueryException;
/**
- * Creates a session that can be used for a Jena Graph.
- *
- * @throws QueryException
- * @return Session
- */
- public Session newJenaSession() throws QueryException;
-
- /**
* Flush and free persistent resources of the session factory.
*
* @throws QueryException if persistence resources couldn't be closed
Modified: trunk/src/jar/resolver/build.xml
===================================================================
--- trunk/src/jar/resolver/build.xml 2006-10-22 12:00:10 UTC (rev 106)
+++ trunk/src/jar/resolver/build.xml 2006-10-23 06:07:11 UTC (rev 107)
@@ -27,8 +27,6 @@
<fileset file="${tuples.dist.dir}/${tuples.jar}"/>
<fileset file="${util.dist.dir}/${util.jar}"/>
<fileset file="${jrdf.dist.dir}/${jrdf.base.jar}"/>
- <fileset file="${jena.dist.dir}/${jena.base.jar}"/>
- <fileset file="${client-jrdf.dist.dir}/${client-jrdf.jar}"/>
<fileset file="${resolver-http.dist.dir}/${resolver-http.jar}"/>
<fileset file="${resolver-file.dist.dir}/${resolver-file.jar}"/>
<fileset file="${resolver-jar.dist.dir}/${resolver-jar.jar}"/>
@@ -82,7 +80,7 @@
depends="-resolver-prepare, resolver-spi-jar, rules-jar,
resolver-http-jar, resolver-file-jar, resolver-url-jar,
resolver-jar-jar, content-rdfxml-jar, content-rdfxml-jar,
- client-jrdf-jar, jrdf-jar, jena-jar"
+ client-jrdf-jar, jrdf-jar"
description="Compiles all resolver related files included generated
source code">
@@ -125,7 +123,7 @@
</target>
<target name="resolver-test"
- depends="jrdf-jar, jena-jar, store-nodepool-memory-jar,
+ depends="jrdf-jar, store-nodepool-memory-jar,
resolver-jar, resolver-memory-jar,
store-nodepool-xa-jar, store-stringpool-xa-jar, resolver-store-jar,
resolver-url-jar, store-stringpool-memory-jar, tuples-hybrid-jar,
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/Database.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/Database.java 2006-10-22 12:00:10 UTC (rev 106)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/Database.java 2006-10-23 06:07:11 UTC (rev 107)
@@ -970,35 +970,6 @@
}
}
- /**
- * Creates a session that can be used for a Jena Graph.
- *
- * @throws QueryException
- * @return Session
- */
- public Session newJenaSession() throws QueryException {
- try {
- return new LocalJenaDatabaseSession(
- transactionManager,
- unmodifiableSecurityAdapterList,
- unmodifiableSymbolicTransformationList,
- jrdfSessionFactory,
- systemResolverFactory,
- temporaryResolverFactory,
- unmodifiableResolverFactoryList,
- unmodifiableExternalResolverFactoryMap,
- unmodifiableInternalResolverFactoryMap,
- metadata,
- contentHandlers,
- cachedResolverFactorySet,
- relatedQueryHandler,
- temporaryModelTypeURI);
- }
- catch (ResolverFactoryException e) {
- throw new QueryException("Couldn't create JRDF session", e);
- }
- }
-
//
// Internal methods
//
@@ -1270,35 +1241,6 @@
}
/**
- * @return an unsecured {@link Session} to the outer {@link Database}
- */
- public Session newJenaSession() throws QueryException
- {
- try {
- return new LocalJenaDatabaseSession(
- transactionManager,
- Collections.singletonList(
- new SystemModelSecurityAdapter(metadata.getSystemModelNode())
- ),
- unmodifiableSymbolicTransformationList,
- jrdfSessionFactory,
- systemResolverFactory,
- temporaryResolverFactory,
- unmodifiableResolverFactoryList,
- unmodifiableExternalResolverFactoryMap,
- unmodifiableInternalResolverFactoryMap,
- metadata,
- contentHandlers,
- cachedResolverFactorySet,
- relatedQueryHandler,
- temporaryModelTypeURI);
- }
- catch (ResolverFactoryException e) {
- throw new QueryException("Couldn't create session", e);
- }
- }
-
- /**
* {@inheritDoc} This method is a no-op in this implementation.
*/
public void close() throws QueryException
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java 2006-10-22 12:00:10 UTC (rev 106)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java 2006-10-23 06:07:11 UTC (rev 107)
@@ -53,6 +53,7 @@
import org.mulgara.query.*;
import org.mulgara.query.rdf.*;
import org.mulgara.resolver.spi.*;
+import org.mulgara.resolver.spi.ResolverFactoryException;
import org.mulgara.resolver.view.SessionView;
import org.mulgara.rules.*;
import org.mulgara.server.Session;
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/JRDFFactoryImpl.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/JRDFFactoryImpl.java 2006-10-22 12:00:10 UTC (rev 106)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/JRDFFactoryImpl.java 2006-10-23 06:07:11 UTC (rev 107)
@@ -41,7 +41,6 @@
import com.hp.hpl.jena.graph.impl.*;
// Local packages
-import org.mulgara.jena.*;
import org.mulgara.jrdf.*;
import org.mulgara.server.*;
@@ -79,26 +78,12 @@
private HashMap anonMap = new HashMap();
/**
- * A link to the JenaFactory peer.
- */
- private JenaFactory jenaFactory = null;
-
- /**
* Constructs a JRDF Factory that is not tied to a Jena Factory.
*/
public JRDFFactoryImpl() {
}
/**
- * Constructs a JRDF Factory that is tied to a Jena Factory.
- *
- * @param newJenaFactory the Jena factory to map bnodes to.
- */
- public JRDFFactoryImpl(JenaFactory newJenaFactory) {
- jenaFactory = newJenaFactory;
- }
-
- /**
* Converts a Jena Graph node to JRDF subject node.
*
* @param databaseGraph the JRDF database graph to create objects from.
@@ -274,9 +259,6 @@
*/
public void addNode(com.hp.hpl.jena.graph.Node key, BlankNode value) {
anonMap.put(key.toString(), value);
- if (jenaFactory != null) {
- jenaFactory.addAnon(value, key);
- }
}
Deleted: trunk/src/jar/resolver/java/org/mulgara/resolver/LocalJenaDatabaseSession.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/LocalJenaDatabaseSession.java 2006-10-22 12:00:10 UTC (rev 106)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/LocalJenaDatabaseSession.java 2006-10-23 06:07:11 UTC (rev 107)
@@ -1,445 +0,0 @@
-/*
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (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.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is the Kowari Metadata Store.
- *
- * The Initial Developer of the Original Code is Plugged In Software Pty
- * Ltd (http://www.pisoftware.com, mailto:info at pisoftware.com). Portions
- * created by Plugged In Software Pty Ltd are Copyright (C) 2001,2002
- * Plugged In Software Pty Ltd. All Rights Reserved.
- *
- * Contributor(s): N/A.
- *
- * [NOTE: The text of this Exhibit A may differ slightly from the text
- * of the notices in the Source Code files of the Original Code. You
- * should use the text of this Exhibit A rather than the text found in the
- * Original Code Source Code for Your Modifications.]
- *
- */
-
-package org.mulgara.resolver;
-
-// Java 2 standard packages
-import java.io.*;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.*;
-
-// Java 2 enterprise packages
-import javax.transaction.TransactionManager;
-
-// Third party packages
-import org.apache.log4j.Logger;
-
-// JRDF classes
-import org.jrdf.graph.*;
-
-// Jena Classes
-import com.hp.hpl.jena.graph.Node_Variable;
-
-// Local packages
-import org.mulgara.content.ContentHandlerManager;
-import org.mulgara.jena.*;
-import org.mulgara.jrdf.*;
-import org.mulgara.query.*;
-import org.mulgara.query.rdf.*;
-import org.mulgara.resolver.spi.*;
-import org.mulgara.server.*;
-import org.mulgara.store.statement.StatementStore;
-
-/**
- * A JRDF database session.
- *
- * @created 2004-10-26
- *
- * @author Andrew Newman
- *
- * @version $Revision: 1.12 $
- *
- * @modified $Date: 2005/05/19 08:43:59 $ by $Author: raboczi $
- *
- * @maintenanceAuthor $Author: raboczi $
- *
- * @copyright ©2004 <a href="http://www.tucanatech.com/">Tucana
- * Technology, Inc</a>
- *
- * @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
- */
-public class LocalJenaDatabaseSession extends LocalJRDFDatabaseSession
- implements LocalJenaSession {
-
- /**
- * Logger.
- */
- private static final Logger logger =
- Logger.getLogger(LocalJenaDatabaseSession.class.getName());
-
- /**
- * Factory use to map Jena blank nodes to JRDF blank nodes.
- */
- private JenaFactory jenaFactory;
-
- /**
- * Iterator handler.
- */
- private IteratorHandler iteratorHandler = new IteratorHandlerImpl();
-
-
- /**
- * Construct a database session.
- *
- * @param transactionManager the source of transactions for this session,
- * never <code>null</code>
- * @param securityAdapterList {@link List} of {@link SecurityAdapter}s to be
- * consulted before permitting operations, never <code>null</code>
- * @param symbolicTransformationList {@link List} of
- * {@link SymbolicTransformation}s to apply
- * @param resolverSessionFactory source of {@link ResolverSessionFactory}s,
- * never <code>null</code>
- * @param systemResolverFactory Source of {@link SystemResolver}s to manage
- * persistent models, for instance the system model (<code>#</code>); never
- * <code>null</code>
- * @param temporaryResolverFactory Source of {@link Resolver}s to manage
- * models which only last the duration of a transaction, for instance the
- * contents of external RDF/XML documents; never <code>null</code>
- * @param resolverFactoryList the list of registered {@link ResolverFactory}
- * instances to use for constraint resolution, never <code>null</code>
- * @param externalResolverFactoryMap map from URL protocol {@link String}s
- * to {@link ResolverFactory} instances for models accessed via that
- * protocol, never <code>null</code>
- * @param internalResolverFactoryMap map from model type {@link LocalNode}s
- * to {@link ResolverFactory} instances for that model type, never
- * <code>null</code>
- * @param metadata even more parameters from the parent {@link Database},
- * never <code>null</code>
- * @param contentHandlers contains the list of valid registered content handles
- * never <code>null</code>
- * @param relatedQueryHandler the name of the class that implements
- * {@link RelatedQueryHandler}
- * @throws IllegalArgumentException if any argument is <code>null</code>
- */
- LocalJenaDatabaseSession(TransactionManager transactionManager,
- List securityAdapterList, List symbolicTransformationList,
- ResolverSessionFactory resolverSessionFactory,
- SystemResolverFactory systemResolverFactory,
- ResolverFactory temporaryResolverFactory, List resolverFactoryList,
- Map externalResolverFactoryMap, Map internalResolverFactoryMap,
- DatabaseMetadata metadata, ContentHandlerManager contentHandlers,
- Set cachedResolverFactorySet, String relatedQueryHandler,
- URI temporaryModelTypeURI)
- throws ResolverFactoryException {
- super(transactionManager, securityAdapterList, symbolicTransformationList,
- resolverSessionFactory,
- systemResolverFactory, temporaryResolverFactory, resolverFactoryList,
- externalResolverFactoryMap, internalResolverFactoryMap, metadata,
- contentHandlers, cachedResolverFactorySet, relatedQueryHandler,
- temporaryModelTypeURI);
-
- jenaFactory = new JenaFactoryImpl();
- jrdfFactory = new JRDFFactoryImpl(jenaFactory);
- jenaFactory.setJrdfFactory(getJRDFFactory());
- }
-
- public void close() throws QueryException {
- iteratorHandler.close();
- super.close();
- }
-
- /**
- * @throws IllegalArgumentException if the graph given is not a Mulgara graph.
- */
- public com.hp.hpl.jena.util.iterator.ClosableIterator find(URI modelURI,
- com.hp.hpl.jena.graph.Node subject, com.hp.hpl.jena.graph.Node predicate,
- com.hp.hpl.jena.graph.Node object)
- throws QueryException, IllegalArgumentException {
-
- try {
- JRDFGraph tmpGraph = new JRDFGraph(this, modelURI);
-
- SubjectNode subjectNode;
- PredicateNode predicateNode;
- ObjectNode objectNode;
-
- // Only create a new blank node if not already in JRDF factory
- if (subject.isBlank() && !getJRDFFactory().hasNode(subject)) {
- subjectNode = new BlankNodeImpl();
- }
- else {
- subjectNode = getJRDFFactory().convertNodeToSubject(
- tmpGraph, subject);
- }
-
- predicateNode = getJRDFFactory().convertNodeToPredicate(
- tmpGraph, predicate);
-
- // Only create a new blank node if not already in JRDF factory
- if (object.isBlank() && !getJRDFFactory().hasNode(object)) {
- objectNode = new BlankNodeImpl();
- }
- else {
- objectNode = getJRDFFactory().convertNodeToObject(
- tmpGraph, object);
- }
-
- Answer answer = find(modelURI, subjectNode, predicateNode, objectNode);
-
- com.hp.hpl.jena.graph.Triple triple =
- new com.hp.hpl.jena.graph.Triple(subject, predicate, object);
-
- org.mulgara.jena.AnswerClosableIteratorImpl iter =
- new org.mulgara.jena.AnswerClosableIteratorImpl(answer, triple,
- modelURI, jenaFactory, iteratorHandler);
- return iter;
- }
- catch (URISyntaxException use) {
- throw new QueryException("Failed to find nodes", use);
- }
- catch (GraphElementFactoryException gefe) {
- throw new QueryException("Failed to find nodes", gefe);
- }
- catch (GraphException ge) {
- throw new QueryException("Failed to find nodes", ge);
- }
- }
-
- public boolean contains(URI modelURI, com.hp.hpl.jena.graph.Node subject,
- com.hp.hpl.jena.graph.Node predicate, com.hp.hpl.jena.graph.Node object)
- throws QueryException {
- try {
- JRDFGraph tmpGraph = new JRDFGraph(this, modelURI);
-
- SubjectNode subjectNode;
- PredicateNode predicateNode;
- ObjectNode objectNode;
-
- // Only create a new blank node if not already in JRDF factory
- if (subject.isBlank() && !getJRDFFactory().hasNode(subject)) {
- subjectNode = new BlankNodeImpl();
- }
- else {
- subjectNode = getJRDFFactory().convertNodeToSubject(
- tmpGraph, subject);
- }
-
- predicateNode = getJRDFFactory().convertNodeToPredicate(
- tmpGraph, predicate);
-
- // Only create a new blank node if not already in JRDF factory
- if (object.isBlank() && !getJRDFFactory().hasNode(object)) {
- objectNode = new BlankNodeImpl();
- }
- else {
- objectNode = getJRDFFactory().convertNodeToObject(
- tmpGraph, object);
- }
-
- return contains(modelURI, subjectNode, predicateNode, objectNode);
- }
- catch (URISyntaxException use) {
- throw new QueryException("Failed to find nodes", use);
- }
- catch (GraphElementFactoryException gefe) {
- throw new QueryException("Failed to find nodes", gefe);
- }
- catch (GraphException ge) {
- throw new QueryException("Failed to find nodes", ge);
- }
- }
-
- public void insert(URI modelURI,
- com.hp.hpl.jena.graph.Node subject, com.hp.hpl.jena.graph.Node predicate,
- com.hp.hpl.jena.graph.Node object) throws QueryException {
- startTransactionalOperation(true);
- try {
- JRDFGraph tmpGraph = new JRDFGraph(this, modelURI);
- modify(modelURI, tmpGraph, subject, predicate, object, true);
- return;
- }
- catch (Throwable e) {
- rollbackTransactionalBlock(e);
- }
- finally {
- finishTransactionalOperation("Could not commit insert");
- }
- }
-
- public void insert(URI modelURI, com.hp.hpl.jena.graph.Triple[] triples)
- throws QueryException {
- startTransactionalOperation(true);
- try {
- JRDFGraph tmpGraph = new JRDFGraph(this, modelURI);
- for (int index = 0; index < triples.length; index++) {
- modify(modelURI, tmpGraph, triples[index].getSubject(),
- triples[index].getPredicate(), triples[index].getObject(), true);
- }
- return;
- }
- catch (Throwable e) {
- rollbackTransactionalBlock(e);
- }
- finally {
- finishTransactionalOperation("Could not commit insert");
- }
- }
-
- /**
- * Converts Jena objects to JRDF objects and inserts them into the graph.
- *
- * @param modelURI the URI of the model.
- * @param tmpGraph the JRDF graph to use to localize objects.
- * @param subject the subject node to insert.
- * @param predicate the predicate node to insert.
- * @param object the object node to insert
- * @param add true if we're adding the statement, false to remove.
- * @throws Throwable if anything goes wrong.
- */
- private void modify(URI modelURI, JRDFGraph tmpGraph,
- com.hp.hpl.jena.graph.Node subject, com.hp.hpl.jena.graph.Node predicate,
- com.hp.hpl.jena.graph.Node object, boolean add) throws Throwable {
-
- SubjectNode subjectNode;
- PredicateNode predicateNode;
- ObjectNode objectNode;
-
- try {
- // Suspend the transaction in case JRDF needs it.
- suspendTransactionalBlock();
-
- // Convert Jena objects to JRDF objects
- subjectNode = getJRDFFactory().convertNodeToSubject(
- tmpGraph, subject);
- predicateNode = getJRDFFactory().convertNodeToPredicate(
- tmpGraph, predicate);
- objectNode = getJRDFFactory().convertNodeToObject(
- tmpGraph, object);
- }
- finally {
-
- // Resume the transaction.
- resumeTransactionalBlock();
- }
-
- Set statements = Collections.singleton(tmpGraph.getElementFactory().
- createTriple(subjectNode, predicateNode, objectNode));
-
- Statements wrapped = new TripleSetWrapperStatements(statements,
- systemResolver, TripleSetWrapperStatements.PERSIST);
- doModify(systemResolver, modelURI, wrapped, add);
- }
-
- public void delete(URI modelURI, com.hp.hpl.jena.graph.Node subject,
- com.hp.hpl.jena.graph.Node predicate, com.hp.hpl.jena.graph.Node object)
- throws QueryException {
- startTransactionalOperation(true);
- try {
- JRDFGraph tmpGraph = new JRDFGraph(this, modelURI);
- modify(modelURI, tmpGraph, subject, predicate, object, false);
- return;
- }
- catch (Throwable e) {
- rollbackTransactionalBlock(e);
- }
- finally {
- finishTransactionalOperation("Could not commit insert");
- }
- }
-
- public void delete(URI modelURI, com.hp.hpl.jena.graph.Triple[] triples)
- throws QueryException {
- startTransactionalOperation(true);
- try {
- JRDFGraph tmpGraph = new JRDFGraph(this, modelURI);
- for (int index = 0; index < triples.length; index++) {
- modify(modelURI, tmpGraph, triples[index].getSubject(),
- triples[index].getPredicate(), triples[index].getObject(), false);
- }
- return;
- }
- catch (Throwable e) {
- rollbackTransactionalBlock(e);
- }
- finally {
- finishTransactionalOperation("Could not commit insert");
- }
- }
-
- public long getNumberOfStatements(URI modelURI) throws QueryException {
- return getNumberOfTriples(modelURI);
- }
-
- public JenaFactory getJenaFactory() {
- return jenaFactory;
- }
-
- /**
- * @throws IllegalArgumentException if the graph given is not a Mulgara graph.
- */
- public com.hp.hpl.jena.util.iterator.ClosableIterator findUniqueValues(
- URI modelURI, Node_Variable column) throws QueryException {
-
- Variable realColumn = null;
- if (GraphMulgara.VARIABLES[0].equals(column)) {
- realColumn = StatementStore.VARIABLES[0];
- }
- else if (GraphMulgara.VARIABLES[1].equals(column)) {
- realColumn = StatementStore.VARIABLES[1];
- }
- else if (GraphMulgara.VARIABLES[2].equals(column)) {
- realColumn = StatementStore.VARIABLES[2];
- }
-
- //select $Subject $Predicate $Object
- ConstraintElement[] vars = new ConstraintElement[3];
- vars[0] = (ConstraintElement) StatementStore.VARIABLES[0];
- vars[1] = (ConstraintElement) StatementStore.VARIABLES[1];
- vars[2] = (ConstraintElement) StatementStore.VARIABLES[2];
-
- //where $Subject $Predicate $Object
- ConstraintImpl varConstraint = new ConstraintImpl(vars[0], vars[1], vars[2]);
-
- // Replace with mulgara:is instead. This will be much faster.
- //and ... ... ...
- ConstraintElement[] e = new ConstraintElement[3];
-
- return null;
-
-// try {
-// e[0] = (subject == null)
-// ? (ConstraintElement) StatementStore.VARIABLES[0]
-// : (ConstraintElement) toValue(subject);
-//
-// e[1] = (predicate == null)
-// ? (ConstraintElement) StatementStore.VARIABLES[1]
-// : (ConstraintElement) toValue(predicate);
-//
-// e[2] = (object == null)
-// ? (ConstraintElement) StatementStore.VARIABLES[2]
-// : (ConstraintElement) toValue(object);
-//
-// ConstraintImpl eConstraint = new ConstraintImpl(e[0], e[1], e[2]);
-//
-// return query(new Query(
-// Arrays.asList(vars), // variable list
-// new ModelResource(modelURI), // model expression
-// new ConstraintConjunction(varConstraint, eConstraint), // constraint expr
-// null, // no having
-// Collections.EMPTY_LIST, // no ordering
-// null, // no limit
-// 0, // zero offset
-// new UnconstrainedAnswer() // nothing given
-// ));
-// }
-// catch (QueryException qe) {
-// throw new GraphException("Failed to find the given triple pattern in " +
-// " the model.", qe);
-// }
- }
-}
Modified: trunk/src/jar/server-local/java/org/mulgara/server/local/LocalSessionFactory.java
===================================================================
--- trunk/src/jar/server-local/java/org/mulgara/server/local/LocalSessionFactory.java 2006-10-22 12:00:10 UTC (rev 106)
+++ trunk/src/jar/server-local/java/org/mulgara/server/local/LocalSessionFactory.java 2006-10-23 06:07:11 UTC (rev 107)
@@ -228,31 +228,6 @@
}
/**
- * Factory method.
- *
- * @return an unauthenticated session
- * @throws QueryException if a session couldn't be generated
- */
- public Session newJenaSession() throws QueryException {
-
- try {
-
- // Initialize session factory if not already in use.
- if (sessionFactory == null) {
- createDirectory();
-
- SessionFactoryFactory factoryFinder = new SessionFactoryFactory();
- sessionFactory = factoryFinder.newSessionFactory(serverURI, directory);
- }
- }
- catch (Exception e) {
- throw new QueryException("Couldn't create local database", e);
- }
-
- return sessionFactory.newJenaSession();
- }
-
- /**
* Closes the local database.
*
* @throws QueryException EXCEPTION TO DO
Modified: trunk/src/jar/server-rmi/build.xml
===================================================================
--- trunk/src/jar/server-rmi/build.xml 2006-10-22 12:00:10 UTC (rev 106)
+++ trunk/src/jar/server-rmi/build.xml 2006-10-23 06:07:11 UTC (rev 107)
@@ -90,13 +90,7 @@
<classpath refid="server-rmi-classpath"/>
<classpath path="${obj.dir}/jar/server-rmi/classes"/>
</rmic>
- <rmic classname="org.mulgara.server.rmi.JenaSessionWrapperRemoteJenaSession"
- base="${obj.dir}/jar/server-rmi/classes">
- <classpath refid="server-rmi-classpath"/>
- <classpath path="${obj.dir}/jar/server-rmi/classes"/>
- </rmic>
-
<rmic classname="org.mulgara.server.rmi.RemoteSessionImpl"
base="${obj.dir}/jar/server-rmi/classes">
@@ -111,13 +105,6 @@
<classpath path="${obj.dir}/jar/server-rmi/classes"/>
</rmic>
- <rmic classname="org.mulgara.server.rmi.RemoteJenaSessionImpl"
- base="${obj.dir}/jar/server-rmi/classes">
-
- <classpath refid="server-rmi-classpath"/>
- <classpath path="${obj.dir}/jar/server-rmi/classes"/>
- </rmic>
-
<rmic classname="org.mulgara.server.rmi.AnswerWrapperRemoteAnswer"
base="${obj.dir}/jar/server-rmi/classes">
Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionFactory.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionFactory.java 2006-10-22 12:00:10 UTC (rev 106)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionFactory.java 2006-10-23 06:07:11 UTC (rev 107)
@@ -107,15 +107,6 @@
public Session newJRDFSession() throws QueryException, RemoteException;
/**
- * Creates a session that can be used for a Jena Graph.
- *
- * @return an unauthenticated session
- * @throws QueryException EXCEPTION TO DO
- * @throws RemoteException EXCEPTION TO DO
- */
- public Session newJenaSession() throws QueryException, RemoteException;
-
- /**
* Factory method. The session generated will be an unauthenticated (<q>guest
* </q>) session. To authenticate it, the {@link Session#login} method must be
* used. The remote session should be wrapped in a Session object.
Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionFactoryImpl.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionFactoryImpl.java 2006-10-22 12:00:10 UTC (rev 106)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionFactoryImpl.java 2006-10-23 06:07:11 UTC (rev 107)
@@ -205,35 +205,7 @@
}
}
- /**
- * {@inheritDoc RemoteSessionFactory}
- *
- * @return RETURNED VALUE TO DO
- * @throws QueryException EXCEPTION TO DO
- */
- public Session newJenaSession() throws QueryException {
- try {
-
- // Create the session
- RemoteSession remoteSession =
- new RemoteJenaSessionImpl((JenaSession) sessionFactory.newJenaSession(), this);
- remoteSessionSet.add(remoteSession);
-
- RemoteJenaSession exportedRemoteSession =
- (RemoteJenaSession) UnicastRemoteObject.exportObject(remoteSession);
-
- // Apply two wrappers to hide the RemoteExceptions of the
- // RemoteSession interface so everything looks like a Session
- return new RemoteSessionWrapperJenaSession(exportedRemoteSession,
- this.getServerURI());
- }
- catch (RemoteException e) {
-
- throw new QueryException("Couldn't export session", e);
- }
- }
-
/**
* {@inheritDoc RemoteSessionFactory}
*/
Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiSessionFactory.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiSessionFactory.java 2006-10-22 12:00:10 UTC (rev 106)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiSessionFactory.java 2006-10-23 06:07:11 UTC (rev 107)
@@ -216,15 +216,6 @@
}
}
- public Session newJenaSession() throws QueryException {
- try {
- return remoteSessionFactory.newJenaSession();
- }
- catch (RemoteException e) {
- throw new QueryException("Couldn't contact server", e);
- }
- }
-
/**
* Close the remote session factory.
*/
More information about the Mulgara-svn
mailing list