Menu
▾
▴
[Ozone-cvs] CVS: ozone/modules/xml/dom4j/src/org/ozoneDB/xml/dom4j OzoneAttributeImpl.java,1.2,1.3 OzoneCDATAImpl.java,1.1,1.2 OzoneCommentImpl.java,1.1,1.2 OzoneDocumentFactory.java,1.2,1.3 OzoneDocumentFactoryImpl.java,1.2,1.3 OzoneDocumentHelper.java,1.2,1.3 OzoneDocumentImpl.java,1.2,1.3 OzoneDocumentTypeImpl.java,1.1,1.2 OzoneElementImpl.java,1.3,1.4 OzoneEntityImpl.java,1.1,1.2 OzoneNamespaceImpl.java,1.3,1.4 OzoneProcessingInstructionImpl.java,1.1,1.2 OzoneQNameCache.java,1.1,1.2 OzoneQNameImpl.java,1.3,1.4 OzoneTextImpl.java,1.1,1.2 OzoneQName.java,1.2,NONE
Update of /cvsroot/ozone/ozone/modules/xml/dom4j/src/org/ozoneDB/xml/dom4j
In directory sc8-pr-cvs1:/tmp/cvs-serv11169/src/org/ozoneDB/xml/dom4j
Modified Files:
OzoneAttributeImpl.java OzoneCDATAImpl.java
OzoneCommentImpl.java OzoneDocumentFactory.java
OzoneDocumentFactoryImpl.java OzoneDocumentHelper.java
OzoneDocumentImpl.java OzoneDocumentTypeImpl.java
OzoneElementImpl.java OzoneEntityImpl.java
OzoneNamespaceImpl.java OzoneProcessingInstructionImpl.java
OzoneQNameCache.java OzoneQNameImpl.java OzoneTextImpl.java
Removed Files:
OzoneQName.java
Log Message:
Adoptation of the Ozone implementation of the DOM4J api to make it work with the new alterations to dom4j made in cooperation with one fo the dom4j developers (marten)
Index: OzoneAttributeImpl.java
===================================================================
RCS file: /cvsroot/ozone/ozone/modules/xml/dom4j/src/org/ozoneDB/xml/dom4j/OzoneAttributeImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- OzoneAttributeImpl.java 18 May 2003 08:36:17 -0000 1.2
+++ OzoneAttributeImpl.java 23 Jun 2003 11:54:52 -0000 1.3
@@ -128,11 +128,27 @@
init();
}
- protected DocumentFactory getDocumentFactory() {
+ public DocumentFactory getDocumentFactory() {
+ throw new OzoneRemoteException("getDocumentFactory will not work in Ozone");
+ }
+
+ protected NodeFactory getNodeFactory() {
try {
- return (DocumentFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ // todo: might be faster to return super.getNodeFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (NodeFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
} catch (Exception e) {
- throw new OzoneRemoteException("Documentfactory not registered" + e.toString());
+ throw new OzoneRemoteException("NodeFctory not registered" + e.toString());
+ }
+ }
+
+ protected XPathFactory getXPathFactory() {
+ try {
+ // todo: might be faster to return super.getXPathFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (XPathFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ } catch (Exception e) {
+ throw new OzoneRemoteException("XPathFactory not registered" + e.toString());
}
}
Index: OzoneCDATAImpl.java
===================================================================
RCS file: /cvsroot/ozone/ozone/modules/xml/dom4j/src/org/ozoneDB/xml/dom4j/OzoneCDATAImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- OzoneCDATAImpl.java 25 Apr 2003 08:11:50 -0000 1.1
+++ OzoneCDATAImpl.java 23 Jun 2003 11:54:52 -0000 1.2
@@ -56,11 +56,27 @@
init();
}
- protected DocumentFactory getDocumentFactory() {
+ public DocumentFactory getDocumentFactory() {
+ throw new OzoneRemoteException("getDocumentFactory will not work in Ozone");
+ }
+
+ protected NodeFactory getNodeFactory() {
try {
- return (DocumentFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ // todo: might be faster to return super.getNodeFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (NodeFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
} catch (Exception e) {
- throw new OzoneRemoteException("Documentfactory not registered" + e.toString());
+ throw new OzoneRemoteException("NodeFctory not registered" + e.toString());
+ }
+ }
+
+ protected XPathFactory getXPathFactory() {
+ try {
+ // todo: might be faster to return super.getXPathFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (XPathFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ } catch (Exception e) {
+ throw new OzoneRemoteException("XPathFactory not registered" + e.toString());
}
}
Index: OzoneCommentImpl.java
===================================================================
RCS file: /cvsroot/ozone/ozone/modules/xml/dom4j/src/org/ozoneDB/xml/dom4j/OzoneCommentImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- OzoneCommentImpl.java 25 Apr 2003 08:11:50 -0000 1.1
+++ OzoneCommentImpl.java 23 Jun 2003 11:54:52 -0000 1.2
@@ -61,11 +61,27 @@
init();
}
- protected DocumentFactory getDocumentFactory() {
+ public DocumentFactory getDocumentFactory() {
+ throw new OzoneRemoteException("getDocumentFactory will not work in Ozone");
+ }
+
+ protected NodeFactory getNodeFactory() {
try {
- return (DocumentFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ // todo: might be faster to return super.getNodeFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (NodeFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
} catch (Exception e) {
- throw new OzoneRemoteException("Documentfactory not registered" + e.toString());
+ throw new OzoneRemoteException("NodeFctory not registered" + e.toString());
+ }
+ }
+
+ protected XPathFactory getXPathFactory() {
+ try {
+ // todo: might be faster to return super.getXPathFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (XPathFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ } catch (Exception e) {
+ throw new OzoneRemoteException("XPathFactory not registered" + e.toString());
}
}
Index: OzoneDocumentFactory.java
===================================================================
RCS file: /cvsroot/ozone/ozone/modules/xml/dom4j/src/org/ozoneDB/xml/dom4j/OzoneDocumentFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- OzoneDocumentFactory.java 5 May 2003 07:16:37 -0000 1.2
+++ OzoneDocumentFactory.java 23 Jun 2003 11:54:52 -0000 1.3
@@ -15,7 +15,26 @@
* <br> Date: Jul 27, 2002
* @author Per Nyfelt
*/
-public interface OzoneDocumentFactory extends PersistentDocumentFactory, OzoneRemote {
+public interface OzoneDocumentFactory extends NodeFactory, XPathFactory, OzoneRemote {
public static final String OBJECT_NAME = "DocumentFactory";
+
+ /**
+ *
+ * @param name is the name for the document which is used to retrieve the
+ * document at a later time.
+ * @return
+ * @throws Exception
+ */
+ Document createDocument(String name) throws Exception;
+
+ /**
+ *
+ * @param rootElement
+ * @param name is the name for the document which is used to retrieve the
+ * document at a later time.
+ * @return
+ * @throws Exception
+ */
+ Document createDocument(Element rootElement, String name) throws Exception;
}
Index: OzoneDocumentFactoryImpl.java
===================================================================
RCS file: /cvsroot/ozone/ozone/modules/xml/dom4j/src/org/ozoneDB/xml/dom4j/OzoneDocumentFactoryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- OzoneDocumentFactoryImpl.java 28 Apr 2003 08:35:50 -0000 1.2
+++ OzoneDocumentFactoryImpl.java 23 Jun 2003 11:54:52 -0000 1.3
@@ -47,9 +47,9 @@
/** Default namespace prefix -> URI mappings for XPath expressions to use */
private Map xpathNamespaceURIs;
- public static synchronized PersistentDocumentFactory getInstance(OzoneInterface db) throws Exception {
+ public static synchronized OzoneDocumentFactory getInstance(OzoneInterface db) throws Exception {
//System.out.println(this.getClass() + "looking for DocumentFactory instance (" + OBJECT_NAME + ") for database " + db);
- PersistentDocumentFactory factory = (OzoneDocumentFactory) db.objectForName(OBJECT_NAME);
+ OzoneDocumentFactory factory = (OzoneDocumentFactory) db.objectForName(OBJECT_NAME);
if (factory == null) {
System.out.println("creating new OzoneDocumentFactory");
factory = OzoneDocumentFactoryImpl.create(db);
@@ -58,7 +58,7 @@
return factory;
}
- public static PersistentDocumentFactory create(OzoneInterface db) {
+ public static OzoneDocumentFactory create(OzoneInterface db) {
return (OzoneDocumentFactory) db.createObject(OzoneDocumentFactoryImpl.class,
OzoneInterface.Public,
OBJECT_NAME);
Index: OzoneDocumentHelper.java
===================================================================
RCS file: /cvsroot/ozone/ozone/modules/xml/dom4j/src/org/ozoneDB/xml/dom4j/OzoneDocumentHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- OzoneDocumentHelper.java 5 May 2003 07:16:37 -0000 1.2
+++ OzoneDocumentHelper.java 23 Jun 2003 11:54:52 -0000 1.3
@@ -36,7 +36,7 @@
public class OzoneDocumentHelper {
- private static PersistentDocumentFactory factory;
+ private static OzoneDocumentFactory factory;
private static OzoneInterface db;
private static DocumentBuilder builder;
@@ -52,7 +52,7 @@
return db;
}
- public static PersistentDocumentFactory getFactory() throws RuntimeException {
+ public static OzoneDocumentFactory getFactory() throws RuntimeException {
if (factory == null) {
throw new RuntimeException("You must run the configure method before using this helper");
}
Index: OzoneDocumentImpl.java
===================================================================
RCS file: /cvsroot/ozone/ozone/modules/xml/dom4j/src/org/ozoneDB/xml/dom4j/OzoneDocumentImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- OzoneDocumentImpl.java 28 Apr 2003 08:35:54 -0000 1.2
+++ OzoneDocumentImpl.java 23 Jun 2003 11:54:52 -0000 1.3
@@ -106,11 +106,27 @@
init();
}
- protected DocumentFactory getDocumentFactory() {
+ public DocumentFactory getDocumentFactory() {
+ throw new OzoneRemoteException("getDocumentFactory will not work in Ozone");
+ }
+
+ protected NodeFactory getNodeFactory() {
try {
- return (DocumentFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ // todo: might be faster to return super.getNodeFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (NodeFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
} catch (Exception e) {
- throw new OzoneRemoteException("Documentfactory not registered" + e.toString());
+ throw new OzoneRemoteException("NodeFctory not registered" + e.toString());
+ }
+ }
+
+ protected XPathFactory getXPathFactory() {
+ try {
+ // todo: might be faster to return super.getXPathFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (XPathFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ } catch (Exception e) {
+ throw new OzoneRemoteException("XPathFactory not registered" + e.toString());
}
}
Index: OzoneDocumentTypeImpl.java
===================================================================
RCS file: /cvsroot/ozone/ozone/modules/xml/dom4j/src/org/ozoneDB/xml/dom4j/OzoneDocumentTypeImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- OzoneDocumentTypeImpl.java 25 Apr 2003 08:11:50 -0000 1.1
+++ OzoneDocumentTypeImpl.java 23 Jun 2003 11:54:52 -0000 1.2
@@ -9,6 +9,8 @@
import org.dom4j.tree.DefaultDocumentType;
import org.dom4j.DocumentFactory;
+import org.dom4j.NodeFactory;
+import org.dom4j.XPathFactory;
import org.ozoneDB.*;
import org.ozoneDB.core.ObjectID;
import org.ozoneDB.core.ObjectContainer;
@@ -80,11 +82,27 @@
new Object[]{elementName, publicID, systemID});
}
- protected DocumentFactory getDocumentFactory() {
+ public DocumentFactory getDocumentFactory() {
+ throw new OzoneRemoteException("getDocumentFactory will not work in Ozone");
+ }
+
+ protected NodeFactory getNodeFactory() {
try {
- return (DocumentFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ // todo: might be faster to return super.getNodeFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (NodeFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
} catch (Exception e) {
- throw new OzoneRemoteException("Documentfactory not registered" + e.toString());
+ throw new OzoneRemoteException("NodeFctory not registered" + e.toString());
+ }
+ }
+
+ protected XPathFactory getXPathFactory() {
+ try {
+ // todo: might be faster to return super.getXPathFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (XPathFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ } catch (Exception e) {
+ throw new OzoneRemoteException("XPathFactory not registered" + e.toString());
}
}
Index: OzoneElementImpl.java
===================================================================
RCS file: /cvsroot/ozone/ozone/modules/xml/dom4j/src/org/ozoneDB/xml/dom4j/OzoneElementImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- OzoneElementImpl.java 5 May 2003 07:16:37 -0000 1.3
+++ OzoneElementImpl.java 23 Jun 2003 11:54:52 -0000 1.4
@@ -82,11 +82,27 @@
new Object[]{name, namespace});
}
- protected DocumentFactory getDocumentFactory() {
+ public DocumentFactory getDocumentFactory() {
+ throw new OzoneRemoteException("getDocumentFactory will not work in Ozone");
+ }
+
+ protected NodeFactory getNodeFactory() {
try {
- return (DocumentFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ // todo: might be faster to return super.getNodeFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (NodeFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
} catch (Exception e) {
- throw new OzoneRemoteException("Documentfactory not registered" + e.toString());
+ throw new OzoneRemoteException("NodeFctory not registered" + e.toString());
+ }
+ }
+
+ protected XPathFactory getXPathFactory() {
+ try {
+ // todo: might be faster to return super.getXPathFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (XPathFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ } catch (Exception e) {
+ throw new OzoneRemoteException("XPathFactory not registered" + e.toString());
}
}
Index: OzoneEntityImpl.java
===================================================================
RCS file: /cvsroot/ozone/ozone/modules/xml/dom4j/src/org/ozoneDB/xml/dom4j/OzoneEntityImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- OzoneEntityImpl.java 25 Apr 2003 08:11:50 -0000 1.1
+++ OzoneEntityImpl.java 23 Jun 2003 11:54:52 -0000 1.2
@@ -87,11 +87,27 @@
init();
}
- protected DocumentFactory getDocumentFactory() {
+ public DocumentFactory getDocumentFactory() {
+ throw new OzoneRemoteException("getDocumentFactory will not work in Ozone");
+ }
+
+ protected NodeFactory getNodeFactory() {
try {
- return (DocumentFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ // todo: might be faster to return super.getNodeFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (NodeFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
} catch (Exception e) {
- throw new OzoneRemoteException("Documentfactory not registered" + e.toString());
+ throw new OzoneRemoteException("NodeFctory not registered" + e.toString());
+ }
+ }
+
+ protected XPathFactory getXPathFactory() {
+ try {
+ // todo: might be faster to return super.getXPathFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (XPathFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ } catch (Exception e) {
+ throw new OzoneRemoteException("XPathFactory not registered" + e.toString());
}
}
Index: OzoneNamespaceImpl.java
===================================================================
RCS file: /cvsroot/ozone/ozone/modules/xml/dom4j/src/org/ozoneDB/xml/dom4j/OzoneNamespaceImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- OzoneNamespaceImpl.java 5 May 2003 07:16:37 -0000 1.3
+++ OzoneNamespaceImpl.java 23 Jun 2003 11:54:52 -0000 1.4
@@ -7,9 +7,7 @@
// $Id$
package org.ozoneDB.xml.dom4j;
-import org.dom4j.DocumentFactory;
-import org.dom4j.Element;
-import org.dom4j.Namespace;
+import org.dom4j.*;
import org.dom4j.tree.DefaultNamespace;
import org.ozoneDB.OzoneInterface;
import org.ozoneDB.OzoneRemoteException;
@@ -71,11 +69,27 @@
return obj;
}
- protected DocumentFactory getDocumentFactory() {
+ public DocumentFactory getDocumentFactory() {
+ throw new OzoneRemoteException("getDocumentFactory will not work in Ozone");
+ }
+
+ protected NodeFactory getNodeFactory() {
try {
- return (DocumentFactory) db.objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ // todo: might be faster to return super.getNodeFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (NodeFactory) db.objectForName(OzoneDocumentFactory.OBJECT_NAME);
} catch (Exception e) {
- throw new OzoneRemoteException("Documentfactory not registered" + e.toString());
+ throw new OzoneRemoteException("NodeFctory not registered" + e.toString());
+ }
+ }
+
+ protected XPathFactory getXPathFactory() {
+ try {
+ // todo: might be faster to return super.getXPathFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (XPathFactory) db.objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ } catch (Exception e) {
+ throw new OzoneRemoteException("XPathFactory not registered" + e.toString());
}
}
Index: OzoneProcessingInstructionImpl.java
===================================================================
RCS file: /cvsroot/ozone/ozone/modules/xml/dom4j/src/org/ozoneDB/xml/dom4j/OzoneProcessingInstructionImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- OzoneProcessingInstructionImpl.java 25 Apr 2003 08:11:50 -0000 1.1
+++ OzoneProcessingInstructionImpl.java 23 Jun 2003 11:54:52 -0000 1.2
@@ -84,11 +84,27 @@
init();
}
- protected DocumentFactory getDocumentFactory() {
+ public DocumentFactory getDocumentFactory() {
+ throw new OzoneRemoteException("getDocumentFactory will not work in Ozone");
+ }
+
+ protected NodeFactory getNodeFactory() {
try {
- return (DocumentFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ // todo: might be faster to return super.getNodeFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (NodeFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
} catch (Exception e) {
- throw new OzoneRemoteException("Documentfactory not registered" + e.toString());
+ throw new OzoneRemoteException("NodeFctory not registered" + e.toString());
+ }
+ }
+
+ protected XPathFactory getXPathFactory() {
+ try {
+ // todo: might be faster to return super.getXPathFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (XPathFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ } catch (Exception e) {
+ throw new OzoneRemoteException("XPathFactory not registered" + e.toString());
}
}
Index: OzoneQNameCache.java
===================================================================
RCS file: /cvsroot/ozone/ozone/modules/xml/dom4j/src/org/ozoneDB/xml/dom4j/OzoneQNameCache.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- OzoneQNameCache.java 25 Apr 2003 08:11:50 -0000 1.1
+++ OzoneQNameCache.java 23 Jun 2003 11:54:52 -0000 1.2
@@ -23,7 +23,7 @@
final static long serialVersionUID = 1L;
protected transient OzoneInterface db;
- public OzoneQNameCache(DocumentFactory documentFactory, OzoneInterface db) {
+ public OzoneQNameCache(OzoneDocumentFactory documentFactory, OzoneInterface db) {
super(documentFactory);
this.db = db;
System.out.println(this.getClass() + " OzoneQNameCache constructor invoked");
Index: OzoneQNameImpl.java
===================================================================
RCS file: /cvsroot/ozone/ozone/modules/xml/dom4j/src/org/ozoneDB/xml/dom4j/OzoneQNameImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- OzoneQNameImpl.java 5 May 2003 07:16:37 -0000 1.3
+++ OzoneQNameImpl.java 23 Jun 2003 11:54:52 -0000 1.4
@@ -7,9 +7,7 @@
// $Id$
package org.ozoneDB.xml.dom4j;
-import org.dom4j.DocumentFactory;
-import org.dom4j.Namespace;
-import org.dom4j.QName;
+import org.dom4j.*;
import org.ozoneDB.OzoneInterface;
import org.ozoneDB.OzoneRemoteException;
//import org.ozoneDB.tools.OPP.OPP;
@@ -79,10 +77,26 @@
}
public DocumentFactory getDocumentFactory() {
+ throw new OzoneRemoteException("getDocumentFactory will not work in Ozone");
+ }
+
+ public NodeFactory getNodeFactory() {
try {
- return (DocumentFactory) db.objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ // todo: might be faster to return super.getNodeFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (NodeFactory) db.objectForName(OzoneDocumentFactory.OBJECT_NAME);
} catch (Exception e) {
- throw new OzoneRemoteException("Documentfactory not registered" + e.toString());
+ throw new OzoneRemoteException("NodeFctory not registered" + e.toString());
+ }
+ }
+
+ protected XPathFactory getXPathFactory() {
+ try {
+ // todo: might be faster to return super.getXPathFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (XPathFactory) db.objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ } catch (Exception e) {
+ throw new OzoneRemoteException("XPathFactory not registered" + e.toString());
}
}
Index: OzoneTextImpl.java
===================================================================
RCS file: /cvsroot/ozone/ozone/modules/xml/dom4j/src/org/ozoneDB/xml/dom4j/OzoneTextImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- OzoneTextImpl.java 25 Apr 2003 08:11:50 -0000 1.1
+++ OzoneTextImpl.java 23 Jun 2003 11:54:52 -0000 1.2
@@ -59,11 +59,27 @@
init();
}
- protected DocumentFactory getDocumentFactory() {
+ public DocumentFactory getDocumentFactory() {
+ throw new OzoneRemoteException("getDocumentFactory will not work in Ozone");
+ }
+
+ protected NodeFactory getNodeFactory() {
try {
- return (DocumentFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ // todo: might be faster to return super.getNodeFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (NodeFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
} catch (Exception e) {
- throw new OzoneRemoteException("Documentfactory not registered" + e.toString());
+ throw new OzoneRemoteException("NodeFctory not registered" + e.toString());
+ }
+ }
+
+ protected XPathFactory getXPathFactory() {
+ try {
+ // todo: might be faster to return super.getXPathFactory() if it is instanceof OzoneCompatible first
+ // before falling back to object for name look-up
+ return (XPathFactory) database().objectForName(OzoneDocumentFactory.OBJECT_NAME);
+ } catch (Exception e) {
+ throw new OzoneRemoteException("XPathFactory not registered" + e.toString());
}
}
--- OzoneQName.java DELETED ---
|