You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2012/07/14 12:08:40 UTC
svn commit: r1361511 - in
/webservices/axiom/branches/AXIOM-435/modules/axiom-api/src:
main/java/org/apache/axiom/om/ main/java/org/apache/axiom/om/dom/
test/java/org/apache/axiom/om/
Author: veithen
Date: Sat Jul 14 10:08:40 2012
New Revision: 1361511
URL: http://svn.apache.org/viewvc?rev=1361511&view=rev
Log:
Some unfinished code.
Added:
webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/OMEntityReference.java (with props)
Modified:
webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/OMFactory.java
webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/dom/DOMMetaFactory.java
webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/test/java/org/apache/axiom/om/DOMCompatibilityTest.java
Added: webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/OMEntityReference.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/OMEntityReference.java?rev=1361511&view=auto
==============================================================================
--- webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/OMEntityReference.java (added)
+++ webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/OMEntityReference.java Sat Jul 14 10:08:40 2012
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.om;
+
+/**
+ * Represents an unexpanded entity reference in an XML document.
+ */
+public interface OMEntityReference extends OMNode {
+ /**
+ * Get the name of the referenced entity.
+ *
+ * @return the name of the entity
+ */
+ String getName();
+}
Propchange: webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/OMEntityReference.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/OMFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/OMFactory.java?rev=1361511&r1=1361510&r2=1361511&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/OMFactory.java (original)
+++ webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/OMFactory.java Sat Jul 14 10:08:40 2012
@@ -248,8 +248,9 @@ public interface OMFactory {
/**
* @param parent
* @param text
- * @param type - this should be either of XMLStreamConstants.CHARACTERS,
- * XMLStreamConstants.CDATA, XMLStreamConstants.SPACE, XMLStreamConstants.ENTITY_REFERENCE
+ * @param type
+ * the node type: {@link OMNode#TEXT_NODE}, {@link OMNode#CDATA_SECTION_NODE} or
+ * {@link OMNode#SPACE_NODE}
* @return Returns OMText.
*/
OMText createOMText(OMContainer parent, String text, int type);
@@ -271,8 +272,9 @@ public interface OMFactory {
/**
* @param s
- * @param type - OMText node can handle SPACE, CHARACTERS, CDATA and ENTITY REFERENCES. For
- * Constants, use either XMLStreamConstants or constants found in OMNode.
+ * @param type
+ * the node type: {@link OMNode#TEXT_NODE}, {@link OMNode#CDATA_SECTION_NODE} or
+ * {@link OMNode#SPACE_NODE}
* @return Returns OMText.
*/
OMText createOMText(String s, int type);
Modified: webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/dom/DOMMetaFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/dom/DOMMetaFactory.java?rev=1361511&r1=1361510&r2=1361511&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/dom/DOMMetaFactory.java (original)
+++ webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/dom/DOMMetaFactory.java Sat Jul 14 10:08:40 2012
@@ -25,6 +25,7 @@ import org.apache.axiom.om.OMAbstractFac
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMEntityReference;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMInformationItem;
import org.apache.axiom.om.OMMetaFactory;
@@ -41,6 +42,7 @@ import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentType;
import org.w3c.dom.Element;
+import org.w3c.dom.EntityReference;
import org.w3c.dom.Node;
import org.w3c.dom.ProcessingInstruction;
import org.w3c.dom.Text;
@@ -90,6 +92,10 @@ import org.w3c.dom.Text;
* <td>{@link OMProcessingInstruction}</td>
* <td>{@link ProcessingInstruction}</td>
* </tr>
+ * <tr>
+ * <td>{@link OMEntityReference}</td>
+ * <td>{@link EntityReference}</td>
+ * </tr>
* </table>
* <dl>
* <dt>[1]
Modified: webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/test/java/org/apache/axiom/om/DOMCompatibilityTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/test/java/org/apache/axiom/om/DOMCompatibilityTest.java?rev=1361511&r1=1361510&r2=1361511&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/test/java/org/apache/axiom/om/DOMCompatibilityTest.java (original)
+++ webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/test/java/org/apache/axiom/om/DOMCompatibilityTest.java Sat Jul 14 10:08:40 2012
@@ -64,7 +64,7 @@ public class DOMCompatibilityTest extend
new MethodSignature("getLocalName", new Class[0]) }));
suite.addTest(new MethodCollisionTestCase(OMText.class, Text.class));
suite.addTest(new MethodCollisionTestCase(OMText.class, CDATASection.class));
- suite.addTest(new MethodCollisionTestCase(OMText.class, EntityReference.class));
+ suite.addTest(new MethodCollisionTestCase(OMEntityReference.class, EntityReference.class));
return suite;
}
}