[Mulgara-svn] r584 - in branches/mgr-75-jena/src/jar: query/java/org/mulgara/server resolver/java/org/mulgara/resolver server-beep/java/org/mulgara/server/beep server-http/java/org/mulgara/server/http server-local/java/org/mulgara/server/local server-rmi/java/org/mulgara/server/rmi

andrae at mulgara.org andrae at mulgara.org
Wed Nov 28 07:29:00 UTC 2007


Author: andrae
Date: 2007-11-28 01:28:59 -0600 (Wed, 28 Nov 2007)
New Revision: 584

Removed:
   branches/mgr-75-jena/src/jar/query/java/org/mulgara/server/JenaFactory.java
   branches/mgr-75-jena/src/jar/query/java/org/mulgara/server/JenaSession.java
   branches/mgr-75-jena/src/jar/resolver/java/org/mulgara/resolver/JenaFactoryImpl.java
   branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/JenaSessionWrapperRemoteJenaSession.java
   branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteJenaSession.java
   branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteJenaSessionImpl.java
   branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionWrapperJenaSession.java
Modified:
   branches/mgr-75-jena/src/jar/server-beep/java/org/mulgara/server/beep/BEEPSessionFactory.java
   branches/mgr-75-jena/src/jar/server-http/java/org/mulgara/server/http/HttpSessionFactory.java
   branches/mgr-75-jena/src/jar/server-local/java/org/mulgara/server/local/LocalSessionFactoryUnitTest.java
   branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionFactoryImpl.java
Log:
Untested, but should be the final demise of the Jena implementation.



Deleted: branches/mgr-75-jena/src/jar/query/java/org/mulgara/server/JenaFactory.java
===================================================================
--- branches/mgr-75-jena/src/jar/query/java/org/mulgara/server/JenaFactory.java	2007-11-28 06:26:56 UTC (rev 583)
+++ branches/mgr-75-jena/src/jar/query/java/org/mulgara/server/JenaFactory.java	2007-11-28 07:28:59 UTC (rev 584)
@@ -1,143 +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.server;
-
-// Jena
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.impl.LiteralLabel;
-import com.hp.hpl.jena.graph.Triple;
-
-// JRDF
-import org.jrdf.graph.*;
-
-// Internal packages
-import org.mulgara.query.*;
-
-/**
- * Converts JRDF objects to Jena objects.
- *
- * @created 2004-02-17
- *
- * @author Andrew Newman
- *
- * @version $Revision: 1.2 $
- *
- * @modified $Date: 2005/01/13 11:45:11 $ by $Author: newmana $
- *
- * @maintenanceAuthor $Author: newmana $
- *
- * @company <a href="mailto:info at PIsoftware.com">Plugged In Software</a>
- *
- * @copyright &copy;2004 <a href="http://www.pisoftware.com/">Plugged In
- *      Software Pty Ltd</a>
- *
- * @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
- */
-public interface JenaFactory {
-
-  /**
-   * This is used by the JRDFFactory telling us about a new anonymous resource.
-   *
-   * @param value The value to map to the node.
-   * @param node The node being stored.
-   */
-  public void addAnon(BlankNode value, Node node);
-
-  /**
-   * Converts a JRDF literal to a Jena LiteralLabel.
-   *
-   * @param literal Literal the literal to convert.
-   * @return LiteralLabel the converted Jena Literal Label.
-   */
-  public LiteralLabel convertLiteralToLabel(Literal literal);
-
-  /**
-   * Converts a {@link org.jrdf.graph.ObjectNode} to a
-   * {@link com.hp.hpl.jena.graph.Node}.
-   *
-   * @param object the JRDF subject node to convert.
-   * @return the converted Jena node object.
-   */
-  public Node convertObjectToNode(ObjectNode object);
-
-  /**
-   * Converts a {@link org.jrdf.graph.PredicateNode} to a
-   * {@link com.hp.hpl.jena.graph.Node}.
-   *
-   * @param predicate the JRDF subject node to convert.
-   * @return the converted Jena node object.
-   */
-  public Node convertPredicateToNode(PredicateNode predicate);
-
-  /**
-   * Converts a {@link org.jrdf.graph.SubjectNode} to a
-   * {@link com.hp.hpl.jena.graph.Node}.
-   *
-   * @param subject the JRDF subject node to convert.
-   * @return the converted Jena node object.
-   */
-  public Node convertSubjectToNode(SubjectNode subject);
-
-  /**
-   * Converts a {@link org.jrdf.graph.Triple} to a
-   * {@link com.hp.hpl.jena.graph.Triple}.
-   *
-   * @param triple the JRDF triple to convert.
-   * @return the converted Jena triple object.
-   */
-  public Triple convertTriple(org.jrdf.graph.Triple triple);
-
-  /**
-   * Converts a {@link org.jrdf.graph.ObjectNode} to a
-   * {@link com.hp.hpl.jena.graph.Node}.
-   *
-   * @param value the JRDF subject node to convert.
-   * @return the converted Jena node object.
-   */
-  public Node convertValueToNode(Value value);
-
-  /**
-   * Debug method to see the contents of the internal anonymous node mapping.
-   */
-  public void dumpAnonNodes();
-
-  /**
-   * Returns the JRDF factory.
-   *
-   * @return the JRDF factory.
-   */
-  public JRDFFactory getJrdfFactory();
-
-  /**
-   * Sets the jrdfFactory.  Cannot be done in the constructor as the
-   * jrdfFactory also needs to point to this object.
-   *
-   * @param jrdfFactory The factory to store.
-   */
-  public void setJrdfFactory(JRDFFactory jrdfFactory);
-}

Deleted: branches/mgr-75-jena/src/jar/query/java/org/mulgara/server/JenaSession.java
===================================================================
--- branches/mgr-75-jena/src/jar/query/java/org/mulgara/server/JenaSession.java	2007-11-28 06:26:56 UTC (rev 583)
+++ branches/mgr-75-jena/src/jar/query/java/org/mulgara/server/JenaSession.java	2007-11-28 07:28:59 UTC (rev 584)
@@ -1,163 +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.server;
-
-// Java 2 standard packages
-import java.net.URI;
-
-// Jena packages
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.Node_Variable;
-
-// Local packages
-import org.mulgara.query.*;
-
-/**
- * A Jena session.
- *
- * @created 2004-10-26
- *
- * @author Andrew Newman
- *
- * @version $Revision: 1.2 $
- *
- * @modified $Date: 2005/01/27 11:46:25 $ by $Author: newmana $
- *
- * @maintenanceAuthor $Author: newmana $
- *
- * @copyright &copy;2004 <a href="http://www.tucanatech.com/">Tucana
- *   Technology, Inc</a>
- *
- * @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
- */
-public interface JenaSession extends Session {
-
-  /**
-   * Insert a statement into a model.
-   *
-   * @param modelURI The URI of the model to delete from.
-   * @param subject the subject of the statement.
-   * @param predicate the predicate of the statement.
-   * @param object the object of the statement.
-   * @throws QueryException if the deletion cannot be completed.
-   */
-  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;
-
-  /**
-   * Delete a statement from a model.
-   *
-   * @param modelURI The URI of the model to delete from.
-   * @param subject the subject of the statement.
-   * @param predicate the predicate of the statement.
-   * @param object the object of the statement.
-   * @throws QueryException if the deletion cannot be completed.
-   */
-  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;
-
-  /**
-   * Return the number of statements in a particular graph.
-   *
-   * @param modelURI the uri for the garph.
-   * @throws QueryException if it fails to access the store.
-   */
-  public long getNumberOfStatements(URI modelURI) throws QueryException;
-
-  /**
-   * Returns the Jena factory associated with the session.
-   *
-   * @return the Jena factory associated with the session.
-   */
-  public JenaFactory getJenaFactory();
-
-  /**
-   * Finds the unique values for a given column. The column is based on the
-   * given Variable (column).
-   *
-   * @param modelURI The URI of the model to search against.
-   * @param column Variable The Variable that will be projected.
-   * @throws QueryException if there was an error accessing the store.
-   * @return ClosableIterator An iterator for the column.
-   */
-  public com.hp.hpl.jena.util.iterator.ClosableIterator findUniqueValues(
-      URI modelURI, Node_Variable column)
-      throws QueryException;
-
-  /**
-   * Insert an array of triples into a model.
-   *
-   * @param modelURI The URI of the model to delete from.
-   * @param triples the statements.
-   * @throws QueryException if the deletion cannot be completed.
-   */
-  public void insert(URI modelURI, com.hp.hpl.jena.graph.Triple[] triples)
-      throws QueryException;
-
-  /**
-   * Delete an array of triples from a model.
-   *
-   * @param modelURI The URI of the model to delete from.
-   * @param triples the statements.
-   * @throws QueryException if the deletion cannot be completed.
-   */
-  public void delete(URI modelURI, com.hp.hpl.jena.graph.Triple[] triples)
-      throws QueryException;
-
-  /**
-   * Test the graph for the occurrence of a triple.
-   *
-   * @param modelURI The URI of the model to insert into.
-   * @param subject The subject.
-   * @param predicate The predicate.
-   * @param object The object.
-   * @return True if the triple is found in the model, otherwise false.
-   * @throws QueryException If there was an error accessing the store.
-   */
-  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;
-
-  /**
-   * Returns an iterator to a set of statements that match a given subject,
-   * predicate and object.  A null value for any of the parts of a triple are
-   * treated as unconstrained, any values will be returned.
-   *
-   * @param modelURI The URI of the model to search against.
-   * @param subject The subject to find or null to indicate any subject.
-   * @param predicate The predicate to find or null to indicate any predicate.
-   * @param object ObjectNode The object to find or null to indicate any object.
-   * @throws QueryException If there was an error accessing the store.
-   */
-  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;
-}

Deleted: branches/mgr-75-jena/src/jar/resolver/java/org/mulgara/resolver/JenaFactoryImpl.java
===================================================================
--- branches/mgr-75-jena/src/jar/resolver/java/org/mulgara/resolver/JenaFactoryImpl.java	2007-11-28 06:26:56 UTC (rev 583)
+++ branches/mgr-75-jena/src/jar/resolver/java/org/mulgara/resolver/JenaFactoryImpl.java	2007-11-28 07:28:59 UTC (rev 584)
@@ -1,312 +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;
-
-import java.util.*;
-
-// Third party packages
-import com.hp.hpl.jena.datatypes.*;
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.graph.impl.*;
-import com.hp.hpl.jena.rdf.model.AnonId;
-
-// Log4J
-import org.apache.log4j.*;
-
-// JRDF
-import org.jrdf.graph.*;
-
-// Locally written classes.
-import org.mulgara.query.*;
-import org.mulgara.server.JRDFFactory;
-import org.mulgara.server.JenaFactory;
-
-/**
- * Converts JRDF objects to Jena objects.
- *
- * @created 2004-02-17
- *
- * @author Andrew Newman
- *
- * @version $Revision: 1.9 $
- *
- * @modified $Date: 2005/01/07 09:37:25 $ by $Author: newmana $
- *
- * @maintenanceAuthor $Author: newmana $
- *
- * @company <a href="mailto:info at PIsoftware.com">Plugged In Software</a>
- *
- * @copyright &copy;2004 <a href="http://www.pisoftware.com/">Plugged In
- *      Software Pty Ltd</a>
- *
- * @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
- */
-public class JenaFactoryImpl implements JenaFactory {
-
-  /**
-   * Logger. This is named after the class.
-   */
-  private final static Logger logger =
-      Logger.getLogger(JenaFactoryImpl.class.getName());
-
-  private Hashtable anonMap = new Hashtable();
-
-  /**
-   * A link to the JRDFFactory peer.
-   */
-  private JRDFFactory jrdfFactory = null;
-
-  /**
-   * Sets the jrdfFactory.  Cannot be done in the constructor as the
-   * jrdfFactory also needs to point to this object.
-   *
-   * @param jrdfFactory The factory to store.
-   */
-  public void setJrdfFactory(JRDFFactory jrdfFactory) {
-    this.jrdfFactory = jrdfFactory;
-  }
-
-  /**
-   * Returns the JRDF factory.
-   *
-   * @return the JRDF factory.
-   */
-  public JRDFFactory getJrdfFactory() {
-    return jrdfFactory;
-  }
-
-  /**
-   * Converts a {@link org.jrdf.graph.Triple} to a
-   * {@link com.hp.hpl.jena.graph.Triple}.
-   *
-   * @param triple the JRDF triple to convert.
-   * @return the converted Jena triple object.
-   */
-  public com.hp.hpl.jena.graph.Triple convertTriple(
-      org.jrdf.graph.Triple triple) {
-
-    com.hp.hpl.jena.graph.Node s = convertSubjectToNode(triple.getSubject());
-    com.hp.hpl.jena.graph.Node p = convertPredicateToNode(triple.getPredicate());
-    com.hp.hpl.jena.graph.Node o = convertObjectToNode(triple.getObject());
-
-    return new com.hp.hpl.jena.graph.Triple(s, p, o);
-  }
-
-  /**
-   * Converts a {@link org.jrdf.graph.SubjectNode} to a
-   * {@link com.hp.hpl.jena.graph.Node}.
-   *
-   * @param subject the JRDF subject node to convert.
-   * @return the converted Jena node object.
-   */
-  public com.hp.hpl.jena.graph.Node convertSubjectToNode(SubjectNode subject) {
-
-    com.hp.hpl.jena.graph.Node s;
-
-    if (subject == null) {
-
-      s = Node_Variable.ANY;
-    }
-    else if (subject instanceof URIReference) {
-
-      s = com.hp.hpl.jena.graph.Node.createURI((
-          (URIReference) subject).getURI().toString());
-    }
-    else {
-
-      s = getAnon((BlankNode) subject);
-    }
-
-    return s;
-  }
-
-  /**
-   * Converts a {@link org.jrdf.graph.PredicateNode} to a
-   * {@link com.hp.hpl.jena.graph.Node}.
-   *
-   * @param predicate the JRDF subject node to convert.
-   * @return the converted Jena node object.
-   */
-  public com.hp.hpl.jena.graph.Node convertPredicateToNode(
-      PredicateNode predicate) {
-
-    com.hp.hpl.jena.graph.Node p;
-
-    if (predicate == null) {
-
-      p = Node_Variable.ANY;
-    }
-    else if (predicate instanceof URIReference) {
-
-      p = com.hp.hpl.jena.graph.Node.createURI((
-           (URIReference) predicate).getURI().toString());
-    }
-    else {
-
-      //should not get here!
-      throw new IllegalArgumentException("PredicateNode: '" + predicate + "' " +
-                                         "is not of type URIReference.");
-    }
-
-    return p;
-  }
-
-  /**
-   * Converts a {@link org.jrdf.graph.ObjectNode} to a
-   * {@link com.hp.hpl.jena.graph.Node}.
-   *
-   * @param object the JRDF subject node to convert.
-   * @return the converted Jena node object.
-   */
-  public com.hp.hpl.jena.graph.Node convertObjectToNode(
-      ObjectNode object) {
-
-    com.hp.hpl.jena.graph.Node o;
-
-    if (object == null) {
-
-      o = Node_Variable.ANY;
-    }
-    else if (object instanceof URIReference) {
-
-      o = com.hp.hpl.jena.graph.Node.createURI((
-          (URIReference) object).getURI().toString());
-    }
-    else if (object instanceof Literal) {
-
-      LiteralLabel label = convertLiteralToLabel((Literal) object);
-      o = com.hp.hpl.jena.graph.Node.createLiteral(label);
-    }
-    else {
-
-      o = getAnon((BlankNode) object);
-    }
-
-    return o;
-  }
-
-  /**
-   * Converts a {@link org.jrdf.graph.ObjectNode} to a
-   * {@link com.hp.hpl.jena.graph.Node}.
-   *
-   * @param value the JRDF subject node to convert.
-   * @return the converted Jena node object.
-   */
-  public com.hp.hpl.jena.graph.Node convertValueToNode(Value value) {
-
-    com.hp.hpl.jena.graph.Node o;
-
-    if (value == null) {
-
-      o = Node_Variable.ANY;
-    }
-    else if (value instanceof URIReference) {
-
-      o = com.hp.hpl.jena.graph.Node.createURI((
-          (URIReference) value).getURI().toString());
-    }
-    else if (value instanceof Literal) {
-
-      LiteralLabel label = convertLiteralToLabel((Literal) value);
-      o = com.hp.hpl.jena.graph.Node.createLiteral(label);
-    }
-    else {
-
-      o = getAnon((BlankNode) value);
-    }
-
-    return o;
-  }
-
-  /**
-   * Converts a JRDF literal to a Jena LiteralLabel.
-   *
-   * @param literal Literal the literal to convert.
-   * @return LiteralLabel the converted Jena Literal Label.
-   */
-  public com.hp.hpl.jena.graph.impl.LiteralLabel convertLiteralToLabel(
-      Literal literal) {
-
-    if (literal.getDatatypeURI() != null) {
-
-      RDFDatatype type = new BaseDatatype(literal.getDatatypeURI().toString());
-      return new LiteralLabel(literal.getLexicalForm(), literal.getLanguage(),
-          type);
-    }
-    else {
-
-      return new LiteralLabel(literal.getLexicalForm(), literal.getLanguage());
-    }
-  }
-
-
-  /**
-   * Retrieve the anonymous node for a value, creating a new one if none exists
-   * for it yet.
-   *
-   * @param value The value to retrieve the anonymous node for.
-   * @return An anonymous node which is unique for the value.
-   */
-  private com.hp.hpl.jena.graph.Node getAnon(BlankNode value) {
-
-    com.hp.hpl.jena.graph.Node n = (com.hp.hpl.jena.graph.Node)anonMap.get(value);
-
-    if (n == null) {
-      String nodeId = ((BlankNode)value).toString();
-      n = com.hp.hpl.jena.graph.Node.createAnon(new AnonId(nodeId));
-      addAnon((BlankNode)value, n);
-      // tell the JrdfFactory as well
-      jrdfFactory.addAnon(n, (BlankNode) value);
-    }
-    return n;
-  }
-
-
-  /**
-   * This is used by the JRDFFactory telling us about a new anonymous resource.
-   *
-   * @param value The value to map to the node.
-   * @param node The node being stored.
-   */
-  public void addAnon(BlankNode value, com.hp.hpl.jena.graph.Node node) {
-    anonMap.put(value, node);
-  }
-
-
-  /**
-   * Debug method to see the contents of the internal anonymous node mapping.
-   */
-  public void dumpAnonNodes() {
-    Iterator it = anonMap.entrySet().iterator();
-    while (it.hasNext()) {
-      Map.Entry e = (Map.Entry)it.next();
-      System.out.println(e.getKey().toString() + " -> " + e.getValue().toString());
-    }
-  }
-
-}

Modified: branches/mgr-75-jena/src/jar/server-beep/java/org/mulgara/server/beep/BEEPSessionFactory.java
===================================================================
--- branches/mgr-75-jena/src/jar/server-beep/java/org/mulgara/server/beep/BEEPSessionFactory.java	2007-11-28 06:26:56 UTC (rev 583)
+++ branches/mgr-75-jena/src/jar/server-beep/java/org/mulgara/server/beep/BEEPSessionFactory.java	2007-11-28 07:28:59 UTC (rev 584)
@@ -151,10 +151,6 @@
     return null;
   }
 
-  public Session newJenaSession() throws QueryException {
-    return null;
-  }
-
   /**
   * METHOD TO DO
   *

Modified: branches/mgr-75-jena/src/jar/server-http/java/org/mulgara/server/http/HttpSessionFactory.java
===================================================================
--- branches/mgr-75-jena/src/jar/server-http/java/org/mulgara/server/http/HttpSessionFactory.java	2007-11-28 06:26:56 UTC (rev 583)
+++ branches/mgr-75-jena/src/jar/server-http/java/org/mulgara/server/http/HttpSessionFactory.java	2007-11-28 07:28:59 UTC (rev 584)
@@ -127,18 +127,7 @@
     return newSession();
   }
 
-  /**
-   * Creates a session that can be used for a Jena Graph.
-   *
-   * @throws QueryException
-   * @return Session
-   */
-  public Session newJenaSession() throws QueryException {
 
-    // Default to a new Session
-    return newSession();
-  }
-
   /**
    * Factory method. The session generated will be an unauthenticated (<q>guest
    * </q>) session.

Modified: branches/mgr-75-jena/src/jar/server-local/java/org/mulgara/server/local/LocalSessionFactoryUnitTest.java
===================================================================
--- branches/mgr-75-jena/src/jar/server-local/java/org/mulgara/server/local/LocalSessionFactoryUnitTest.java	2007-11-28 06:26:56 UTC (rev 583)
+++ branches/mgr-75-jena/src/jar/server-local/java/org/mulgara/server/local/LocalSessionFactoryUnitTest.java	2007-11-28 07:28:59 UTC (rev 584)
@@ -120,16 +120,6 @@
           SessionFactoryFinder.newSessionFactory(serverURI, false);
       session = (Session) factory.newSession();
 
-/*      //add
-      GraphMulgaraMaker graphMaker = new GraphMulgaraMaker(session,
-          serverURI,
-          ReificationStyle.Minimal);
-      ModelMulgaraMaker modelMaker = new ModelMulgaraMaker(graphMaker);
-      com.hp.hpl.jena.rdf.model.Model model = modelMaker.createModel("testModel");
-      model.add(model.createResource("info:foo"),
-          model.createProperty("info:bar#", "baz"),
-          "quuux");
-*/
       //query
       String modelURI = serverURI.toString() + "#testModel";
       String query = "select $s $p $o from <" + modelURI + "> where $s $p $o;";

Deleted: branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/JenaSessionWrapperRemoteJenaSession.java
===================================================================
--- branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/JenaSessionWrapperRemoteJenaSession.java	2007-11-28 06:26:56 UTC (rev 583)
+++ branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/JenaSessionWrapperRemoteJenaSession.java	2007-11-28 07:28:59 UTC (rev 584)
@@ -1,151 +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 Andrew Newman. 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.server.rmi;
-
-// Java 2 standard packages
-import java.net.URI;
-import java.rmi.RemoteException;
-
-// Log4j
-import org.apache.log4j.Logger;
-
-// Jena packages
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.Node_Variable;
-
-// Locally written packages
-import org.mulgara.query.QueryException;
-import org.mulgara.server.*;
-
-/**
- * Wrapper around a {@link JenaSession} to make it look like a
- * {@link RemoteJenaSession}.
- *
- * @author Andrew Newman
- *
- * @created 2005-01-08
- *
- * @version $Revision: 1.1 $
- *
- * @modified $Date: 2005/01/27 11:22:39 $
- *
- * @maintenanceAuthor $Author: newmana $
- *
- * @copyright &copy; 2005 Andrew Newman
- *
- * @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
- *
- * @see <a href="http://developer.java.sun.com/developer/JDCTechTips/2001/tt0327.html#jndi"/>
- *      <cite>JNDI lookup in distributed systems</cite> </a>
- */
-class JenaSessionWrapperRemoteJenaSession extends SessionWrapperRemoteSession
-    implements RemoteJenaSession {
-
-  /**
-   * Logger. This is named after the classname.
-   */
-  private final static Logger logger =
-    Logger.getLogger(JenaSessionWrapperRemoteJenaSession.class.getName());
-
-  /**
-   * The wrapped {@link JenaSession}
-   */
-  private final JenaSession jenaSession;
-
-  //
-  // Constructor
-  //
-
-  /**
-   * @param session {@inheritDoc}
-   * @throws IllegalArgumentException {@inheritDoc}
-   */
-  JenaSessionWrapperRemoteJenaSession(JenaSession session) {
-    super(session);
-
-    // Initialize fields
-    this.jenaSession = session;
-  }
-
-  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, RemoteException {
-    jenaSession.insert(modelURI, subject, predicate, object);
-  }
-
-  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, RemoteException {
-    jenaSession.delete(modelURI, subject, predicate, object);
-  }
-
-  public long getNumberOfStatements(URI modelURI)
-      throws QueryException, RemoteException {
-    return jenaSession.getNumberOfStatements(modelURI);
-  }
-
-  public JenaFactory getJenaFactory() throws RemoteException {
-    return jenaSession.getJenaFactory();
-  }
-
-  public com.hp.hpl.jena.util.iterator.ClosableIterator findUniqueValues(
-    URI modelURI, Node_Variable column)
-    throws QueryException, RemoteException {
-    com.hp.hpl.jena.util.iterator.ClosableIterator iter =
-        jenaSession.findUniqueValues(modelURI, column);
-    return iter;
-  }
-
-  public void insert(URI modelURI, com.hp.hpl.jena.graph.Triple[] triples)
-      throws QueryException, RemoteException {
-    jenaSession.insert(modelURI, triples);
-  }
-
-  public void delete(URI modelURI, com.hp.hpl.jena.graph.Triple[] triples)
-      throws QueryException, RemoteException {
-    jenaSession.delete(modelURI, triples);
-  }
-
-  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, RemoteException {
-
-    boolean contains = jenaSession.contains(modelURI, subject, predicate,
-        object);
-    return contains;
-  }
-
-  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, RemoteException {
-
-    com.hp.hpl.jena.util.iterator.ClosableIterator iter =
-        jenaSession.find(modelURI, subject, predicate, object);
-    return iter;
-  }
-}

Deleted: branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteJenaSession.java
===================================================================
--- branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteJenaSession.java	2007-11-28 06:26:56 UTC (rev 583)
+++ branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteJenaSession.java	2007-11-28 07:28:59 UTC (rev 584)
@@ -1,163 +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 Andrew Newman. 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.server.rmi;
-
-// Java 2 Standard Packages
-import java.rmi.*;
-import java.net.*;
-
-// Jena packages
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.Node_Variable;
-
-// Locally written packages
-import org.mulgara.query.*;
-import org.mulgara.server.*;
-
-/**
- * Java RMI remote interface for drivers.
- *
- * @author Andrew Newman
- *
- * @created 2005-01-08
- *
- * @version $Revision: 1.1 $
- *
- * @modified $Date: 2005/01/27 11:22:39 $
- *
- * @maintenanceAuthor $Author: newmana $
- *
- * @copyright &copy; 2005 Andrew Newman
- *
- * @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
- */
-interface RemoteJenaSession extends RemoteSession {
-
-  /**
-   * Insert a statement into a model.
-   *
-   * @param modelURI The URI of the model to delete from.
-   * @param subject the subject of the statement.
-   * @param predicate the predicate of the statement.
-   * @param object the object of the statement.
-   * @throws QueryException if the deletion cannot be completed.
-   */
-  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, RemoteException;
-
-  /**
-   * Delete a statement from a model.
-   *
-   * @param modelURI The URI of the model to delete from.
-   * @param subject the subject of the statement.
-   * @param predicate the predicate of the statement.
-   * @param object the object of the statement.
-   * @throws QueryException if the deletion cannot be completed.
-   */
-  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, RemoteException;
-
-  /**
-   * Return the number of statements in a particular graph.
-   *
-   * @param modelURI the uri for the garph.
-   * @throws QueryException if it fails to access the store.
-   */
-  public long getNumberOfStatements(URI modelURI) throws QueryException, RemoteException;
-
-  /**
-   * Returns the Jena factory associated with the session.
-   *
-   * @return the Jena factory associated with the session.
-   */
-  public JenaFactory getJenaFactory() throws RemoteException;
-
-  /**
-   * Finds the unique values for a given column. The column is based on the
-   * given Variable (column).
-   *
-   * @param modelURI The URI of the model to search against.
-   * @param column Variable The Variable that will be projected.
-   * @throws QueryException if there was an error accessing the store.
-   * @return ClosableIterator An iterator for the column.
-   */
-  public com.hp.hpl.jena.util.iterator.ClosableIterator findUniqueValues(
-      URI modelURI, Node_Variable column)
-      throws QueryException, RemoteException;
-
-  /**
-   * Insert an array of triples into a model.
-   *
-   * @param modelURI The URI of the model to delete from.
-   * @param triples the statements.
-   * @throws QueryException if the deletion cannot be completed.
-   */
-  public void insert(URI modelURI, com.hp.hpl.jena.graph.Triple[] triples)
-      throws QueryException, RemoteException;
-
-  /**
-   * Delete an array of triples from a model.
-   *
-   * @param modelURI The URI of the model to delete from.
-   * @param triples the statements.
-   * @throws QueryException if the deletion cannot be completed.
-   */
-  public void delete(URI modelURI, com.hp.hpl.jena.graph.Triple[] triples)
-      throws QueryException, RemoteException;
-
-  /**
-   * Test the graph for the occurrence of a triple.
-   *
-   * @param modelURI The URI of the model to insert into.
-   * @param subject The subject.
-   * @param predicate The predicate.
-   * @param object The object.
-   * @return True if the triple is found in the model, otherwise false.
-   * @throws QueryException If there was an error accessing the store.
-   */
-  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, RemoteException;
-
-  /**
-   * Returns an iterator to a set of statements that match a given subject,
-   * predicate and object.  A null value for any of the parts of a triple are
-   * treated as unconstrained, any values will be returned.
-   *
-   * @param modelURI The URI of the model to search against.
-   * @param subject The subject to find or null to indicate any subject.
-   * @param predicate The predicate to find or null to indicate any predicate.
-   * @param object ObjectNode The object to find or null to indicate any object.
-   * @throws QueryException If there was an error accessing the store.
-   */
-  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, RemoteException;
-}

Deleted: branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteJenaSessionImpl.java
===================================================================
--- branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteJenaSessionImpl.java	2007-11-28 06:26:56 UTC (rev 583)
+++ branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteJenaSessionImpl.java	2007-11-28 07:28:59 UTC (rev 584)
@@ -1,103 +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 Andrew Newman. 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.server.rmi;
-
-// Java 2 standard packages
-import java.net.URI;
-import java.rmi.RemoteException;
-
-// Log4j
-import org.apache.log4j.Logger;
-
-// Jena
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.Node_Variable;
-
-// Locally written packages
-import org.mulgara.query.Answer;
-import org.mulgara.query.ArrayAnswer;
-import org.mulgara.query.Query;
-import org.mulgara.query.QueryException;
-import org.mulgara.query.TuplesException;
-import org.mulgara.server.*;
-
-/**
- * {@link RemoteJenaSession} which generates unpaged results.
- *
- * @author Andrew Newman
- *
- * @created 2004-03-18
- *
- * @version $Revision: 1.1 $
- *
- * @modified $Date: 2005/01/27 11:22:39 $
- *
- * @maintenanceAuthor $Author: newmana $
- *
- * @copyright &copy; 2005 Andrew Newman
- *
- * @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
- *
- * @see <a href="http://developer.java.sun.com/developer/JDCTechTips/2001/tt0327.html#jndi"/>
- *      <cite>JNDI lookup in distributed systems</cite> </a>
- */
-class RemoteJenaSessionImpl extends JenaSessionWrapperRemoteJenaSession
-    implements RemoteJenaSession {
-
-  /**
-   * Logger. This is named after the classname.
-   */
-  private final static Logger logger =
-    Logger.getLogger(RemoteJenaSessionImpl.class.getName());
-
-  /**
-   * Reference to the RemoteSessionFactory
-   */
-  protected RemoteSessionFactory remoteSessionFactory;
-
-  //
-  // Constructor
-  //
-
-  /**
-   * @param session {@inheritDoc}
-   * @throws IllegalArgumentException {@inheritDoc}
-   */
-  RemoteJenaSessionImpl(JenaSession session, RemoteSessionFactory remoteSessionFactory) {
-    super(session);
-    this.remoteSessionFactory = remoteSessionFactory;
-  }
-
-  public void close() throws QueryException, RemoteException {
-    try {
-      super.close();
-    }
-    finally {
-      remoteSessionFactory.removeSession(this);
-    }
-  }
-}

Modified: branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionFactoryImpl.java
===================================================================
--- branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionFactoryImpl.java	2007-11-28 06:26:56 UTC (rev 583)
+++ branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionFactoryImpl.java	2007-11-28 07:28:59 UTC (rev 584)
@@ -41,7 +41,6 @@
 import org.mulgara.jrdf.*;
 import org.mulgara.query.QueryException;
 import org.mulgara.server.JRDFSession;
-import org.mulgara.server.JenaSession;
 import org.mulgara.server.ServerInfo;
 import org.mulgara.server.Session;
 import org.mulgara.server.SessionFactory;

Deleted: branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionWrapperJenaSession.java
===================================================================
--- branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionWrapperJenaSession.java	2007-11-28 06:26:56 UTC (rev 583)
+++ branches/mgr-75-jena/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionWrapperJenaSession.java	2007-11-28 07:28:59 UTC (rev 584)
@@ -1,211 +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 Andrew Newman. 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.server.rmi;
-
-// Java 2 standard packages
-import java.net.URI;
-import java.rmi.RemoteException;
-
-// Jena packages
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.Node_Variable;
-
-// Locally written packages
-import org.mulgara.query.*;
-import org.mulgara.server.*;
-
-/**
- * Wrapper around a {@link RemoteJenaSession} to make it look like a {@link
- * Session}. The only real functionality this wrapper implements is to nest any
- * {@link RemoteException}s inside {@link QueryException}s.
- *
- * @author Andrew Newman
- *
- * @created 2005-01-08
- *
- * @version $Revision: 1.2 $
- *
- * @modified $Date: 2005/06/26 12:48:16 $
- *
- * @maintenanceAuthor $Author: pgearon $
- *
- * @copyright &copy; 2005 Andrew Newman
- *
- * @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
- */
-class RemoteSessionWrapperJenaSession extends RemoteSessionWrapperSession
-    implements JenaSession {
-
-  /**
-   * The wrapped {@link RemoteJenaSession}
-   */
-  private RemoteJenaSession remoteJenaSession;
-
-  //
-  // Constructor
-  //
-
-  /**
-   *
-   * @param remoteSession the wrapped remote session
-   * @throws IllegalArgumentException if <var>remoteSession</var> is <code>null</code>
-   */
-  RemoteSessionWrapperJenaSession(RemoteJenaSession remoteSession, URI serverURI) {
-    super(remoteSession, serverURI);
-    remoteJenaSession = remoteSession;
-  }
-
-  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 {
-    try {
-      remoteJenaSession.insert(modelURI, subject, predicate, object);
-      resetRetries();
-    }
-    catch (RemoteException e) {
-      testRetry(e);
-      insert(modelURI, subject, predicate, object);
-    }
-  }
-
-  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 {
-    try {
-      remoteJenaSession.delete(modelURI, subject, predicate, object);
-      resetRetries();
-    }
-    catch (RemoteException e) {
-      testRetry(e);
-      delete(modelURI, subject, predicate, object);
-    }
-  }
-
-  public long getNumberOfStatements(URI modelURI)
-      throws QueryException {
-    try {
-      long r = remoteJenaSession.getNumberOfStatements(modelURI);
-      resetRetries();
-      return r;
-    }
-    catch (RemoteException e) {
-      testRetry(e);
-      return getNumberOfStatements(modelURI);
-    }
-  }
-
-  public JenaFactory getJenaFactory() {
-    try {
-      JenaFactory factory = remoteJenaSession.getJenaFactory();
-      resetRetries();
-      return factory;
-    }
-    catch (RemoteException e) {
-      try {
-        testRetry(e);
-      }
-      catch (QueryException qe) {
-
-        // Does not handle query exception
-        return null;
-      }
-      return getJenaFactory();
-    }
-  }
-
-  public com.hp.hpl.jena.util.iterator.ClosableIterator findUniqueValues(
-      URI modelURI, Node_Variable column)
-      throws QueryException {
-    try {
-      com.hp.hpl.jena.util.iterator.ClosableIterator iter =
-          remoteJenaSession.findUniqueValues(modelURI, column);
-      resetRetries();
-      return iter;
-    }
-    catch (RemoteException e) {
-      testRetry(e);
-      return findUniqueValues(modelURI, column);
-    }
-  }
-
-  public void insert(URI modelURI, com.hp.hpl.jena.graph.Triple[] triples)
-      throws QueryException {
-    try {
-      remoteJenaSession.insert(modelURI, triples);
-      resetRetries();
-    }
-    catch (RemoteException e) {
-      testRetry(e);
-      insert(modelURI, triples);
-    }
-  }
-
-  public void delete(URI modelURI, com.hp.hpl.jena.graph.Triple[] triples)
-      throws QueryException {
-    try {
-      remoteJenaSession.delete(modelURI, triples);
-      resetRetries();
-    }
-    catch (RemoteException e) {
-      testRetry(e);
-      delete(modelURI, triples);
-    }
-  }
-
-  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 {
-      boolean contains = remoteJenaSession.contains(modelURI, subject,
-          predicate, object);
-      resetRetries();
-      return contains;
-    }
-    catch (RemoteException e) {
-      testRetry(e);
-      return contains(modelURI, subject, predicate, object);
-    }
-  }
-
-  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 {
-    try {
-      com.hp.hpl.jena.util.iterator.ClosableIterator iter =
-          remoteJenaSession.find(modelURI, subject, predicate,
-          object);
-      resetRetries();
-      return iter;
-    }
-    catch (RemoteException e) {
-      testRetry(e);
-      return find(modelURI, subject, predicate, object);
-    }
-  }
-
-}




More information about the Mulgara-svn mailing list