This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit fce8143d583faaf6f114b7d3f7ea120049f2cf59 Author: Andy Seaborne <[email protected]> AuthorDate: Sun Dec 21 11:35:58 2025 +0000 GH-3664: Rename package oaj.rdfxml.xmlinput1 as oaj.rdfxml.arp1 --- .../apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java | 6 +++--- .../main/java/org/apache/jena/rdf/model/RDFReaderI.java | 2 +- .../apache/jena/rdf/model/impl/RDFDefaultErrorHandler.java | 2 +- .../org/apache/jena/rdf/model/impl/RDFReaderFImpl.java | 2 +- .../apache/jena/rdfxml/{xmlinput1 => arp1}/ALiteral.java | 4 ++-- .../org/apache/jena/rdfxml/{xmlinput1 => arp1}/ARP.java | 4 ++-- .../apache/jena/rdfxml/{xmlinput1 => arp1}/ARPConfig.java | 2 +- .../jena/rdfxml/{xmlinput1 => arp1}/ARPErrorNumbers.java | 2 +- .../jena/rdfxml/{xmlinput1 => arp1}/ARPEventHandler.java | 2 +- .../jena/rdfxml/{xmlinput1 => arp1}/ARPHandlers.java | 6 +++--- .../apache/jena/rdfxml/{xmlinput1 => arp1}/ARPOptions.java | 2 +- .../apache/jena/rdfxml/{xmlinput1 => arp1}/AResource.java | 2 +- .../apache/jena/rdfxml/{xmlinput1 => arp1}/DOM2Model.java | 2 +- .../jena/rdfxml/{xmlinput1 => arp1}/ExtendedHandler.java | 2 +- .../{xmlinput1 => arp1}/FatalParsingErrorException.java | 2 +- .../jena/rdfxml/{xmlinput1 => arp1}/JenaHandler.java | 4 ++-- .../jena/rdfxml/{xmlinput1 => arp1}/NamespaceHandler.java | 2 +- .../jena/rdfxml/{xmlinput1 => arp1}/ParseException.java | 4 ++-- .../jena/rdfxml/{xmlinput1 => arp1}/RDFXMLReader.java | 4 ++-- .../apache/jena/rdfxml/{xmlinput1 => arp1}/SAX2Model.java | 2 +- .../apache/jena/rdfxml/{xmlinput1 => arp1}/SAX2RDF.java | 10 +++++----- .../apache/jena/rdfxml/{xmlinput1 => arp1}/StAX2Model.java | 2 +- .../apache/jena/rdfxml/{xmlinput1 => arp1}/StAX2SAX.java | 2 +- .../jena/rdfxml/{xmlinput1 => arp1}/StatementHandler.java | 2 +- .../apache/jena/rdfxml/{xmlinput1 => arp1}/impl/ANode.java | 2 +- .../{xmlinput1 => arp1}/impl/ARPDatatypeLiteral.java | 12 ++++++------ .../jena/rdfxml/{xmlinput1 => arp1}/impl/ARPLocation.java | 2 +- .../jena/rdfxml/{xmlinput1 => arp1}/impl/ARPResource.java | 2 +- .../{xmlinput1 => arp1}/impl/ARPSaxErrorHandler.java | 2 +- .../jena/rdfxml/{xmlinput1 => arp1}/impl/ARPString.java | 6 +++--- .../rdfxml/{xmlinput1 => arp1}/impl/AResourceInternal.java | 4 ++-- .../rdfxml/{xmlinput1 => arp1}/impl/AbsXMLContext.java | 4 ++-- .../rdfxml/{xmlinput1 => arp1}/impl/AttributeLexer.java | 8 ++++---- .../rdfxml/{xmlinput1 => arp1}/impl/CharacterModel.java | 2 +- .../{xmlinput1 => arp1}/impl/DefaultErrorHandler.java | 4 ++-- .../jena/rdfxml/{xmlinput1 => arp1}/impl/ElementLexer.java | 4 ++-- .../{xmlinput1 => arp1}/impl/LexicalHandlerImpl.java | 2 +- .../apache/jena/rdfxml/{xmlinput1 => arp1}/impl/Names.java | 2 +- .../rdfxml/{xmlinput1 => arp1}/impl/ParserSupport.java | 4 ++-- .../jena/rdfxml/{xmlinput1 => arp1}/impl/QNameLexer.java | 6 +++--- .../jena/rdfxml/{xmlinput1 => arp1}/impl/RDFXMLParser.java | 8 ++++---- .../jena/rdfxml/{xmlinput1 => arp1}/impl/SAX2RDFImpl.java | 4 ++-- .../apache/jena/rdfxml/{xmlinput1 => arp1}/impl/Taint.java | 2 +- .../jena/rdfxml/{xmlinput1 => arp1}/impl/TaintImpl.java | 2 +- .../jena/rdfxml/{xmlinput1 => arp1}/impl/URIReference.java | 8 ++++---- .../{xmlinput1 => arp1}/impl/UntaintableURIReference.java | 2 +- .../rdfxml/{xmlinput1 => arp1}/impl/WrappedException.java | 2 +- .../{xmlinput1 => arp1}/impl/XMLBaselessContext.java | 4 ++-- .../jena/rdfxml/{xmlinput1 => arp1}/impl/XMLContext.java | 4 ++-- .../jena/rdfxml/{xmlinput1 => arp1}/impl/XMLHandler.java | 12 ++++++------ .../apache/jena/rdfxml/{xmlinput1 => arp1}/package.html | 0 .../states/AbsWantLiteralValueOrDescription.java | 6 +++--- .../rdfxml/{xmlinput1 => arp1}/states/AbsXMLLiteral.java | 6 +++--- .../jena/rdfxml/{xmlinput1 => arp1}/states/Collection.java | 8 ++++---- .../jena/rdfxml/{xmlinput1 => arp1}/states/Frame.java | 8 ++++---- .../jena/rdfxml/{xmlinput1 => arp1}/states/FrameI.java | 6 +++--- .../{xmlinput1 => arp1}/states/HasSubjectFrameI.java | 4 ++-- .../rdfxml/{xmlinput1 => arp1}/states/InnerXMLLiteral.java | 2 +- .../rdfxml/{xmlinput1 => arp1}/states/LookingForRDF.java | 8 ++++---- .../rdfxml/{xmlinput1 => arp1}/states/OuterXMLLiteral.java | 6 +++--- .../rdfxml/{xmlinput1 => arp1}/states/RDFCollection.java | 6 +++--- .../states/StartStateRDForDescription.java | 6 +++--- .../rdfxml/{xmlinput1 => arp1}/states/WantDescription.java | 4 ++-- .../jena/rdfxml/{xmlinput1 => arp1}/states/WantEmpty.java | 4 ++-- .../states/WantLiteralValueOrDescription.java | 6 +++--- .../{xmlinput1 => arp1}/states/WantPropertyElement.java | 4 ++-- .../states/WantTopLevelDescription.java | 8 ++++---- .../{xmlinput1 => arp1}/states/WantTypedLiteral.java | 8 ++++---- .../{xmlinput1 => arp1}/states/WantsObjectFrameI.java | 2 +- .../rdfxml/{xmlinput1 => arp1}/states/WantsObjectI.java | 4 ++-- .../java/org/apache/jena/rdfxml/arp1tests/NTripleARP1.java | 2 +- .../org/apache/jena/rdfxml/arp1tests/NTripleTestSuite.java | 10 +++++----- .../org/apache/jena/rdfxml/arp1tests/TestErrorMsg.java | 2 +- .../apache/jena/rdfxml/arp1tests/TestPropEltErrorMsg.java | 2 +- .../org/apache/jena/rdfxml/arp1tests/TestRDFXML_URI.java | 4 ++-- .../apache/jena/rdfxml/arp1tests/TestSuiteException.java | 4 ++-- .../java/org/apache/jena/rdfxml/arp1tests/TestsARP.java | 2 +- .../org/apache/jena/rdfxml/arp1tests/TestsDOM2RDF.java | 2 +- .../org/apache/jena/rdfxml/arp1tests/TestsMoreDOM2RDF.java | 8 ++++---- .../org/apache/jena/rdfxml/arp1tests/TestsSAX2RDF.java | 6 +++--- .../org/apache/jena/rdfxml/arp1tests/TestsSAX2RDFMore.java | 6 +++--- .../org/apache/jena/rdfxml/arp1tests/TestsStAX2Model.java | 2 +- .../org/apache/jena/rdfxml/arp1tests/TestsTainting.java | 4 ++-- .../java/org/apache/jena/rdfxml/arp1tests/WGTestSuite.java | 6 +++--- .../org/apache/jena/rdfxml/arp1tests/states/AttrEvent.java | 4 ++-- .../apache/jena/rdfxml/arp1tests/states/ElementEvent.java | 2 +- .../org/apache/jena/rdfxml/arp1tests/states/Event.java | 2 +- .../org/apache/jena/rdfxml/arp1tests/states/EventList.java | 6 +++--- .../org/apache/jena/rdfxml/arp1tests/states/QName.java | 2 +- .../org/apache/jena/rdfxml/arp1tests/states/TestData.java | 6 +++--- .../apache/jena/rdfxml/arp1tests/states/TestEventList.java | 2 +- .../org/apache/jena/rdfxml/arp1tests/states/TestFrame.java | 14 +++++++------- .../apache/jena/rdfxml/arp1tests/states/TestHandler.java | 7 ++++--- .../org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java | 2 +- .../src/test/java/org/apache/jena/test/X_RDFReaderF.java | 2 +- 95 files changed, 202 insertions(+), 201 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java index 8b27d35647..f7a2899101 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java @@ -32,8 +32,8 @@ import org.apache.jena.graph.Node ; import org.apache.jena.graph.Triple ; import org.apache.jena.irix.IRIs; import org.apache.jena.rdf.model.RDFErrorHandler ; -import org.apache.jena.rdfxml.xmlinput1.*; -import org.apache.jena.rdfxml.xmlinput1.impl.ARPSaxErrorHandler; +import org.apache.jena.rdfxml.arp1.*; +import org.apache.jena.rdfxml.arp1.impl.ARPSaxErrorHandler; import org.apache.jena.riot.*; import org.apache.jena.riot.system.ErrorHandler; import org.apache.jena.riot.system.FactoryRDF; @@ -48,7 +48,7 @@ import org.xml.sax.SAXParseException ; * <p> * <b>LEGACY</b> * <p> - * Uses ARQ1 - the version of ARP from Jena 4.7.0 to Jena 4.10.0. + * Uses ARP1 - the version of ARP from Jena 4.7.0 to Jena 4.10.0. * <p> * Replaced at Jena 5 by RRX. * diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/RDFReaderI.java b/jena-core/src/main/java/org/apache/jena/rdf/model/RDFReaderI.java index 7527ea1a43..7e45647dbf 100644 --- a/jena-core/src/main/java/org/apache/jena/rdf/model/RDFReaderI.java +++ b/jena-core/src/main/java/org/apache/jena/rdf/model/RDFReaderI.java @@ -87,7 +87,7 @@ public interface RDFReaderI { * <dt>N-TRIPLE</dt> * <dd>No properties.</dd> * <dt>RDF/XML</dt><dt>RDF/XML-ABBREV</dt> - * <dd>See {@link org.apache.jena.rdfxml.xmlinput1.RDFXMLReader#setProperty(String,Object)} + * <dd>See {@link org.apache.jena.rdfxml.arp1.RDFXMLReader#setProperty(String,Object)} * </dl> * @param propName the name of the property * @param propValue the value of the property diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFDefaultErrorHandler.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFDefaultErrorHandler.java index da93c2d16d..ec186472e7 100644 --- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFDefaultErrorHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFDefaultErrorHandler.java @@ -19,7 +19,7 @@ package org.apache.jena.rdf.model.impl; import org.apache.jena.rdf.model.* ; -import org.apache.jena.rdfxml.xmlinput1.ParseException; +import org.apache.jena.rdfxml.arp1.ParseException; import org.apache.jena.shared.* ; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java index 0a6919ad5a..f72985f5a8 100644 --- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java +++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java @@ -26,7 +26,7 @@ import org.apache.jena.atlas.lib.Creator; import org.apache.jena.atlas.logging.Log; import org.apache.jena.rdf.model.RDFReaderF; import org.apache.jena.rdf.model.RDFReaderI; -import org.apache.jena.rdfxml.xmlinput1.RDFXMLReader; +import org.apache.jena.rdfxml.arp1.RDFXMLReader; import org.apache.jena.shared.JenaException; import org.apache.jena.shared.NoReaderForLangException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ALiteral.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ALiteral.java similarity index 94% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ALiteral.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ALiteral.java index 0cb5ed275c..b7066148fe 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ALiteral.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ALiteral.java @@ -22,9 +22,9 @@ * Created on June 26, 2001, 9:27 AM */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; -import org.apache.jena.rdfxml.xmlinput1.impl.ANode; +import org.apache.jena.rdfxml.arp1.impl.ANode; /** * A string literal property value from an RDF/XML file. diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARP.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARP.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARP.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARP.java index 23bc0d2d9d..c79d4ab2b5 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARP.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARP.java @@ -21,12 +21,12 @@ * See end of file for BSD-style license. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; import java.io.IOException; import java.io.InputStream; import java.io.Reader; -import org.apache.jena.rdfxml.xmlinput1.impl.RDFXMLParser; +import org.apache.jena.rdfxml.arp1.impl.RDFXMLParser; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; import org.xml.sax.Locator; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPConfig.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPConfig.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPConfig.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPConfig.java index f363925649..5806ce499e 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPConfig.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPConfig.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; import org.xml.sax.ErrorHandler; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPErrorNumbers.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPErrorNumbers.java similarity index 99% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPErrorNumbers.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPErrorNumbers.java index 077d675936..2db77ab094 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPErrorNumbers.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPErrorNumbers.java @@ -22,7 +22,7 @@ * Created on July 10, 2001, 8:34 AM */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; /** * Error numbers used by ARP. diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPEventHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPEventHandler.java similarity index 96% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPEventHandler.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPEventHandler.java index 10f8013074..b07aa6efa0 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPEventHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPEventHandler.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; /** * Convenience generalization of all ARP handler interfaces. diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPHandlers.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPHandlers.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPHandlers.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPHandlers.java index 4c649038e2..9991bb1869 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPHandlers.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPHandlers.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; -import org.apache.jena.rdfxml.xmlinput1.impl.DefaultErrorHandler; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; +import org.apache.jena.rdfxml.arp1.impl.DefaultErrorHandler; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; import org.xml.sax.ErrorHandler; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPOptions.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPOptions.java similarity index 99% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPOptions.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPOptions.java index 3a4d067887..e7dcf76511 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPOptions.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPOptions.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; import org.apache.jena.irix.IRIProvider; import org.apache.jena.irix.SystemIRIx; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/AResource.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/AResource.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/AResource.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/AResource.java index 86aa4fd281..bec703bdc4 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/AResource.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/AResource.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; /** * A URI or blank node reported to a {@link StatementHandler}. diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/DOM2Model.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/DOM2Model.java similarity index 99% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/DOM2Model.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/DOM2Model.java index e2a4be224b..6d2fb4952a 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/DOM2Model.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/DOM2Model.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; import javax.xml.transform.Source; import javax.xml.transform.Transformer; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ExtendedHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ExtendedHandler.java similarity index 99% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ExtendedHandler.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ExtendedHandler.java index 1d44ad37dc..dbb3d1e54f 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ExtendedHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ExtendedHandler.java @@ -21,7 +21,7 @@ * See end of file for BSD-style license. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; /**Extended callbacks from a reader to an RDF application. * This reports: diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/FatalParsingErrorException.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/FatalParsingErrorException.java similarity index 96% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/FatalParsingErrorException.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/FatalParsingErrorException.java index 16d55b9f4a..4684683be8 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/FatalParsingErrorException.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/FatalParsingErrorException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; /** * This exception should only be seen in user code when using diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/JenaHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/JenaHandler.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/JenaHandler.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/JenaHandler.java index 97d7ff0a50..19a3ec1781 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/JenaHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/JenaHandler.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; import org.apache.jena.graph.Graph ; import org.apache.jena.graph.Triple ; import org.apache.jena.rdf.model.Model ; import org.apache.jena.rdf.model.RDFErrorHandler ; -import org.apache.jena.rdfxml.xmlinput1.impl.ARPSaxErrorHandler; +import org.apache.jena.rdfxml.arp1.impl.ARPSaxErrorHandler; import org.apache.jena.shared.JenaException ; import org.apache.jena.shared.PrefixMapping ; import org.apache.jena.util.XMLChar; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/NamespaceHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/NamespaceHandler.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/NamespaceHandler.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/NamespaceHandler.java index 68ffeb5ddc..94e31a7572 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/NamespaceHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/NamespaceHandler.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; /** * The interface for being notified about namespace use in an RDF/XML diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ParseException.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ParseException.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ParseException.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ParseException.java index dbc0852629..25908ce9f8 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ParseException.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ParseException.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; -import org.apache.jena.rdfxml.xmlinput1.impl.ARPLocation; +import org.apache.jena.rdfxml.arp1.impl.ARPLocation; import org.xml.sax.SAXParseException; import java.lang.reflect.Field; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/RDFXMLReader.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/RDFXMLReader.java similarity index 99% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/RDFXMLReader.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/RDFXMLReader.java index 8b14eda001..853413aecd 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/RDFXMLReader.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/RDFXMLReader.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; import java.io.*; import java.net.HttpURLConnection; @@ -34,7 +34,7 @@ import org.apache.jena.rdf.model.RDFErrorHandler ; import org.apache.jena.rdf.model.RDFReaderI ; import org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler ; import org.apache.jena.rdf.model.impl.RDFReaderFImpl; -import org.apache.jena.rdfxml.xmlinput1.impl.RDFXMLParser; +import org.apache.jena.rdfxml.arp1.impl.RDFXMLParser; import org.apache.jena.shared.DoesNotExistException ; import org.apache.jena.shared.JenaException ; import org.apache.jena.shared.UnknownPropertyException ; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/SAX2Model.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/SAX2Model.java similarity index 99% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/SAX2Model.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/SAX2Model.java index 4386bec81b..8df5a4ee40 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/SAX2Model.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/SAX2Model.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; import org.apache.jena.rdf.model.Model ; import org.apache.jena.rdf.model.RDFErrorHandler ; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/SAX2RDF.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/SAX2RDF.java similarity index 95% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/SAX2RDF.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/SAX2RDF.java index 27131eec11..45f4d29b63 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/SAX2RDF.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/SAX2RDF.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; -import org.apache.jena.rdfxml.xmlinput1.impl.SAX2RDFImpl; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; +package org.apache.jena.rdfxml.arp1; +import org.apache.jena.rdfxml.arp1.impl.SAX2RDFImpl; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import org.xml.sax.XMLReader; @@ -128,7 +128,7 @@ implements ARPConfig { /**The handlers used for processing ARP events. * Do not use with a {@link SAX2Model}. - * @see org.apache.jena.rdfxml.xmlinput1.ARPConfig#getHandlers() + * @see org.apache.jena.rdfxml.arp1.ARPConfig#getHandlers() */ @Override public ARPHandlers getHandlers() { @@ -137,7 +137,7 @@ implements ARPConfig { /**Copys handlers used for processing ARP events. * Do not use with a {@link SAX2Model}. - * @see org.apache.jena.rdfxml.xmlinput1.ARPConfig#setHandlersWith(ARPHandlers) + * @see org.apache.jena.rdfxml.arp1.ARPConfig#setHandlersWith(ARPHandlers) */ @Override public void setHandlersWith(ARPHandlers handlers) { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/StAX2Model.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/StAX2Model.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/StAX2Model.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/StAX2Model.java index 0c2c102b14..516ead8309 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/StAX2Model.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/StAX2Model.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLStreamException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/StAX2SAX.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/StAX2SAX.java similarity index 99% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/StAX2SAX.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/StAX2SAX.java index 20a44f9bbc..5c6308de46 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/StAX2SAX.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/StAX2SAX.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; import java.util.Iterator; import javax.xml.namespace.QName; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/StatementHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/StatementHandler.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/StatementHandler.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/StatementHandler.java index 63d4601782..86b18e4f88 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/StatementHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/StatementHandler.java @@ -22,7 +22,7 @@ * Created on June 26, 2001, 9:30 AM */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; /** The callback from a reader to an RDF application. * Each triple in the input file causes a call on one of the statement methods. diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ANode.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ANode.java similarity index 94% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ANode.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ANode.java index 02119cf69c..8e9f739cbc 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ANode.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ANode.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; public interface ANode extends Taint { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPDatatypeLiteral.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPDatatypeLiteral.java similarity index 82% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPDatatypeLiteral.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPDatatypeLiteral.java index 6a04608b08..75f9dbfe22 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPDatatypeLiteral.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPDatatypeLiteral.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; -import org.apache.jena.rdfxml.xmlinput1.ALiteral; -import org.apache.jena.rdfxml.xmlinput1.states.Frame; +import org.apache.jena.rdfxml.arp1.ALiteral; +import org.apache.jena.rdfxml.arp1.states.Frame; import org.xml.sax.SAXParseException; public class ARPDatatypeLiteral extends TaintImpl implements ALiteral { @@ -36,7 +36,7 @@ public class ARPDatatypeLiteral extends TaintImpl implements ALiteral { taint(); } /** - * @see org.apache.jena.rdfxml.xmlinput1.ALiteral#isWellFormedXML() + * @see org.apache.jena.rdfxml.arp1.ALiteral#isWellFormedXML() */ @Override public boolean isWellFormedXML() { @@ -49,7 +49,7 @@ public class ARPDatatypeLiteral extends TaintImpl implements ALiteral { } /** - * @see org.apache.jena.rdfxml.xmlinput1.ALiteral#getDatatypeURI() + * @see org.apache.jena.rdfxml.arp1.ALiteral#getDatatypeURI() */ @Override public String getDatatypeURI() { @@ -57,7 +57,7 @@ public class ARPDatatypeLiteral extends TaintImpl implements ALiteral { } /** - * @see org.apache.jena.rdfxml.xmlinput1.ALiteral#getLang() + * @see org.apache.jena.rdfxml.arp1.ALiteral#getLang() */ @Override public String getLang() { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPLocation.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPLocation.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPLocation.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPLocation.java index 4327006ee0..60db617268 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPLocation.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPLocation.java @@ -22,7 +22,7 @@ * Created on July 14, 2001, 11:47 AM */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import org.xml.sax.Locator; public class ARPLocation implements Locator { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPResource.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPResource.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPResource.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPResource.java index 1c43b335ca..585148082d 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPResource.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPResource.java @@ -22,7 +22,7 @@ * Created on June 25, 2001, 9:57 PM */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; public class ARPResource extends TaintImpl implements AResourceInternal { // Constants cribbed from com.megginson.sax.rdf.RDFFilter diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPSaxErrorHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPSaxErrorHandler.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPSaxErrorHandler.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPSaxErrorHandler.java index 8e61616347..2062ef0e6f 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPSaxErrorHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPSaxErrorHandler.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import org.apache.jena.rdf.model.RDFErrorHandler ; import org.xml.sax.SAXException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPString.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPString.java similarity index 94% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPString.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPString.java index 402ca43cbb..d0187a07a9 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPString.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPString.java @@ -22,10 +22,10 @@ * Created on June 22, 2001, 9:44 AM */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; -import org.apache.jena.rdfxml.xmlinput1.ALiteral; -import org.apache.jena.rdfxml.xmlinput1.states.Frame; +import org.apache.jena.rdfxml.arp1.ALiteral; +import org.apache.jena.rdfxml.arp1.states.Frame; import org.xml.sax.SAXParseException; public class ARPString extends TaintImpl implements ALiteral { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/AResourceInternal.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/AResourceInternal.java similarity index 92% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/AResourceInternal.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/AResourceInternal.java index f8a5f92c73..c7469a59a5 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/AResourceInternal.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/AResourceInternal.java @@ -22,9 +22,9 @@ * Created on June 26, 2001, 9:26 AM */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; -import org.apache.jena.rdfxml.xmlinput1.AResource; +import org.apache.jena.rdfxml.arp1.AResource; /** A resource from the input file. */ diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/AbsXMLContext.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/AbsXMLContext.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/AbsXMLContext.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/AbsXMLContext.java index 91ca827994..8e43e02e6a 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/AbsXMLContext.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/AbsXMLContext.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import java.util.regex.Pattern; import org.apache.jena.irix.IRIx; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; import org.apache.jena.shared.JenaException; import org.xml.sax.SAXParseException ; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/AttributeLexer.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/AttributeLexer.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/AttributeLexer.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/AttributeLexer.java index 50135d5240..65caecd24b 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/AttributeLexer.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/AttributeLexer.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import java.util.BitSet; import org.apache.jena.irix.IRIException; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; -import org.apache.jena.rdfxml.xmlinput1.ParseException; -import org.apache.jena.rdfxml.xmlinput1.states.Frame; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.ParseException; +import org.apache.jena.rdfxml.arp1.states.Frame; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/CharacterModel.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/CharacterModel.java similarity index 99% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/CharacterModel.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/CharacterModel.java index ed74ed4957..0552a07137 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/CharacterModel.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/CharacterModel.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import java.text.Normalizer; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/DefaultErrorHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/DefaultErrorHandler.java similarity index 94% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/DefaultErrorHandler.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/DefaultErrorHandler.java index 420bb1650b..46d47fed47 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/DefaultErrorHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/DefaultErrorHandler.java @@ -22,9 +22,9 @@ * Created on July 10, 2001, 11:23 AM */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; -import org.apache.jena.rdfxml.xmlinput1.ParseException; +import org.apache.jena.rdfxml.arp1.ParseException; /** */ diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ElementLexer.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ElementLexer.java similarity index 96% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ElementLexer.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ElementLexer.java index 05d32c6ffb..89d8a016fc 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ElementLexer.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ElementLexer.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; -import org.apache.jena.rdfxml.xmlinput1.states.Frame; +import org.apache.jena.rdfxml.arp1.states.Frame; import org.xml.sax.SAXParseException; public class ElementLexer extends QNameLexer { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/LexicalHandlerImpl.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/LexicalHandlerImpl.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/LexicalHandlerImpl.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/LexicalHandlerImpl.java index 4d36eabed0..4e2da6e2f3 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/LexicalHandlerImpl.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/LexicalHandlerImpl.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import org.xml.sax.SAXException; import org.xml.sax.ext.LexicalHandler; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/Names.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/Names.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/Names.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/Names.java index b55b84c1f0..1bbdfb9e30 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/Names.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/Names.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; public interface Names { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ParserSupport.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ParserSupport.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ParserSupport.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ParserSupport.java index 1ece098227..58b0a7bdab 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ParserSupport.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ParserSupport.java @@ -22,13 +22,13 @@ * Created on July 15, 2001, 7:13 AM */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import java.util.HashMap ; import java.util.Map ; import org.apache.jena.irix.IRIx; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; import org.apache.jena.util.XML11Char; import org.apache.jena.util.XMLChar; import org.xml.sax.SAXParseException ; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/QNameLexer.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/QNameLexer.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/QNameLexer.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/QNameLexer.java index 5a09a9644d..3ca0cc9190 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/QNameLexer.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/QNameLexer.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import java.util.HashSet; import java.util.Set; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; -import org.apache.jena.rdfxml.xmlinput1.states.Frame; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.states.Frame; import org.xml.sax.SAXParseException; abstract public class QNameLexer implements Names, ARPErrorNumbers { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/RDFXMLParser.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/RDFXMLParser.java similarity index 96% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/RDFXMLParser.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/RDFXMLParser.java index bc7c543828..fba643ed90 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/RDFXMLParser.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/RDFXMLParser.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import java.io.IOException; import java.io.InputStreamReader; @@ -24,9 +24,9 @@ import java.io.Reader; import java.io.UTFDataFormatException; import org.apache.jena.irix.IRIException; -import org.apache.jena.rdfxml.xmlinput1.FatalParsingErrorException; -import org.apache.jena.rdfxml.xmlinput1.ParseException; -import org.apache.jena.rdfxml.xmlinput1.SAX2RDF; +import org.apache.jena.rdfxml.arp1.FatalParsingErrorException; +import org.apache.jena.rdfxml.arp1.ParseException; +import org.apache.jena.rdfxml.arp1.SAX2RDF; import org.apache.jena.shared.JenaException; import org.apache.jena.util.CharEncoding ; import org.apache.jena.util.JenaXMLInput; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/SAX2RDFImpl.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/SAX2RDFImpl.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/SAX2RDFImpl.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/SAX2RDFImpl.java index 76d69fe96f..212aaf1051 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/SAX2RDFImpl.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/SAX2RDFImpl.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; -import org.apache.jena.rdfxml.xmlinput1.SAX2RDF; +import org.apache.jena.rdfxml.arp1.SAX2RDF; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.ErrorHandler; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/Taint.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/Taint.java similarity index 95% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/Taint.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/Taint.java index 83076f27c8..371d46c92a 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/Taint.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/Taint.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; public interface Taint { void taint(); diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/TaintImpl.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/TaintImpl.java similarity index 95% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/TaintImpl.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/TaintImpl.java index 05103c4eed..fec4ec68d8 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/TaintImpl.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/TaintImpl.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; /** * Minimal implementation of {@link Taint} */ diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/URIReference.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/URIReference.java similarity index 95% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/URIReference.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/URIReference.java index e211cd74bd..f3d45e0c8c 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/URIReference.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/URIReference.java @@ -22,13 +22,13 @@ * Created on June 25, 2001, 9:58 PM */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import org.apache.jena.irix.IRIException; import org.apache.jena.irix.IRIx; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; -import org.apache.jena.rdfxml.xmlinput1.ParseException; -import org.apache.jena.rdfxml.xmlinput1.states.Frame; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.ParseException; +import org.apache.jena.rdfxml.arp1.states.Frame; import org.xml.sax.SAXParseException; // TODO: not for 2.3 IRI spec conformance diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/UntaintableURIReference.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/UntaintableURIReference.java similarity index 95% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/UntaintableURIReference.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/UntaintableURIReference.java index 4ac860e5c0..68381137c0 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/UntaintableURIReference.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/UntaintableURIReference.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; class UntaintableURIReference extends URIReference { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/WrappedException.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/WrappedException.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/WrappedException.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/WrappedException.java index 5ffe478e1c..9807c7ffcd 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/WrappedException.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/WrappedException.java @@ -22,7 +22,7 @@ * Created on July 10, 2001, 11:44 AM */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import java.io.IOException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/XMLBaselessContext.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/XMLBaselessContext.java similarity index 96% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/XMLBaselessContext.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/XMLBaselessContext.java index 6a3420a12e..a67db2f098 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/XMLBaselessContext.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/XMLBaselessContext.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import org.apache.jena.irix.IRIx; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; import org.xml.sax.SAXParseException; public class XMLBaselessContext extends AbsXMLContext implements ARPErrorNumbers { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/XMLContext.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/XMLContext.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/XMLContext.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/XMLContext.java index 03fd5b68c2..8b9c719820 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/XMLContext.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/XMLContext.java @@ -22,10 +22,10 @@ * Created on July 10, 2001, 2:35 AM */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import org.apache.jena.irix.IRIx; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; import org.xml.sax.SAXParseException ; /** diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/XMLHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/XMLHandler.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/XMLHandler.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/XMLHandler.java index c2abd5120b..8b0a896779 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/XMLHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/XMLHandler.java @@ -21,7 +21,7 @@ * See end of file for BSD-style license. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import java.util.HashMap ; import java.util.Map ; @@ -30,11 +30,11 @@ import org.apache.jena.irix.IRIException; import org.apache.jena.irix.IRIProvider; import org.apache.jena.irix.IRIx; import org.apache.jena.irix.SystemIRIx; -import org.apache.jena.rdfxml.xmlinput1.*; -import org.apache.jena.rdfxml.xmlinput1.states.Frame; -import org.apache.jena.rdfxml.xmlinput1.states.FrameI; -import org.apache.jena.rdfxml.xmlinput1.states.LookingForRDF; -import org.apache.jena.rdfxml.xmlinput1.states.StartStateRDForDescription; +import org.apache.jena.rdfxml.arp1.*; +import org.apache.jena.rdfxml.arp1.states.Frame; +import org.apache.jena.rdfxml.arp1.states.FrameI; +import org.apache.jena.rdfxml.arp1.states.LookingForRDF; +import org.apache.jena.rdfxml.arp1.states.StartStateRDForDescription; import org.xml.sax.Attributes ; import org.xml.sax.Locator ; import org.xml.sax.SAXException ; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/package.html b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/package.html similarity index 100% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/package.html rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/package.html diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/AbsWantLiteralValueOrDescription.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/AbsWantLiteralValueOrDescription.java similarity index 94% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/AbsWantLiteralValueOrDescription.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/AbsWantLiteralValueOrDescription.java index 64df4e42fb..3f0ca7b72f 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/AbsWantLiteralValueOrDescription.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/AbsWantLiteralValueOrDescription.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; -import org.apache.jena.rdfxml.xmlinput1.impl.AttributeLexer; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.AttributeLexer; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/AbsXMLLiteral.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/AbsXMLLiteral.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/AbsXMLLiteral.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/AbsXMLLiteral.java index 0735262a8a..7b0e953552 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/AbsXMLLiteral.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/AbsXMLLiteral.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; import java.util.Iterator; import java.util.Map; import java.util.TreeMap; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/Collection.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/Collection.java similarity index 92% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/Collection.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/Collection.java index 5fda834e90..7585015399 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/Collection.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/Collection.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.ANode; -import org.apache.jena.rdfxml.xmlinput1.impl.ARPResource; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.ANode; +import org.apache.jena.rdfxml.arp1.impl.ARPResource; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/Frame.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/Frame.java similarity index 96% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/Frame.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/Frame.java index 1193c88293..3ad6c3d125 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/Frame.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/Frame.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; import org.apache.jena.irix.IRIException; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; -import org.apache.jena.rdfxml.xmlinput1.ParseException; -import org.apache.jena.rdfxml.xmlinput1.impl.*; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.ParseException; +import org.apache.jena.rdfxml.arp1.impl.*; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/FrameI.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/FrameI.java similarity index 90% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/FrameI.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/FrameI.java index d6702e7ccc..05fb1861ca 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/FrameI.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/FrameI.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/HasSubjectFrameI.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/HasSubjectFrameI.java similarity index 92% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/HasSubjectFrameI.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/HasSubjectFrameI.java index 6e5ff4e317..dbb66ea49f 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/HasSubjectFrameI.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/HasSubjectFrameI.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.ANode; +import org.apache.jena.rdfxml.arp1.impl.ANode; public interface HasSubjectFrameI extends FrameI { void aPredAndObj(ANode p, ANode o); diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/InnerXMLLiteral.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/InnerXMLLiteral.java similarity index 96% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/InnerXMLLiteral.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/InnerXMLLiteral.java index 75ea293e4e..5f28351e06 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/InnerXMLLiteral.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/InnerXMLLiteral.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; import java.util.Map; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/LookingForRDF.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/LookingForRDF.java similarity index 87% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/LookingForRDF.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/LookingForRDF.java index 865f53a909..ad7bffd051 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/LookingForRDF.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/LookingForRDF.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; -import org.apache.jena.rdfxml.xmlinput1.impl.AttributeLexer; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.AttributeLexer; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/OuterXMLLiteral.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/OuterXMLLiteral.java similarity index 89% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/OuterXMLLiteral.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/OuterXMLLiteral.java index 7fc2b1ee53..5289cfebd5 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/OuterXMLLiteral.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/OuterXMLLiteral.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.ARPString; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.ARPString; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/RDFCollection.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/RDFCollection.java similarity index 88% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/RDFCollection.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/RDFCollection.java index 2b76b7011b..2638df67ea 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/RDFCollection.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/RDFCollection.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.ANode; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.ANode; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; public class RDFCollection extends Collection { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/StartStateRDForDescription.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/StartStateRDForDescription.java similarity index 91% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/StartStateRDForDescription.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/StartStateRDForDescription.java index 24282ac288..f3188d85ec 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/StartStateRDForDescription.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/StartStateRDForDescription.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantDescription.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantDescription.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantDescription.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantDescription.java index 99809a82e0..311663a57f 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantDescription.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantDescription.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.*; +import org.apache.jena.rdfxml.arp1.impl.*; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantEmpty.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantEmpty.java similarity index 93% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantEmpty.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantEmpty.java index d152bf94fb..8614139731 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantEmpty.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantEmpty.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantLiteralValueOrDescription.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantLiteralValueOrDescription.java similarity index 95% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantLiteralValueOrDescription.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantLiteralValueOrDescription.java index d330529069..eae841ed66 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantLiteralValueOrDescription.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantLiteralValueOrDescription.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.ARPString; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.ARPString; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantPropertyElement.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantPropertyElement.java similarity index 99% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantPropertyElement.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantPropertyElement.java index 9408f831a6..04ac5f69ed 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantPropertyElement.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantPropertyElement.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; import java.util.ArrayList; -import org.apache.jena.rdfxml.xmlinput1.impl.*; +import org.apache.jena.rdfxml.arp1.impl.*; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantTopLevelDescription.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantTopLevelDescription.java similarity index 86% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantTopLevelDescription.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantTopLevelDescription.java index 1f68022efc..271afb5513 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantTopLevelDescription.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantTopLevelDescription.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; -import org.apache.jena.rdfxml.xmlinput1.impl.AttributeLexer; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.AttributeLexer; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; import org.xml.sax.SAXParseException; public class WantTopLevelDescription extends WantDescription { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantTypedLiteral.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantTypedLiteral.java similarity index 89% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantTypedLiteral.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantTypedLiteral.java index a122d2b336..e380cc09ac 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantTypedLiteral.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantTypedLiteral.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.ARPDatatypeLiteral; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; -import org.apache.jena.rdfxml.xmlinput1.impl.URIReference; +import org.apache.jena.rdfxml.arp1.impl.ARPDatatypeLiteral; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.URIReference; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantsObjectFrameI.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantsObjectFrameI.java similarity index 94% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantsObjectFrameI.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantsObjectFrameI.java index 49346cd5c9..c8e1ba2e0b 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantsObjectFrameI.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantsObjectFrameI.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; public interface WantsObjectFrameI extends WantsObjectI, FrameI { } diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantsObjectI.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantsObjectI.java similarity index 89% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantsObjectI.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantsObjectI.java index 6add418fbc..5c20ec0786 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantsObjectI.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantsObjectI.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.ANode; +import org.apache.jena.rdfxml.arp1.impl.ANode; interface WantsObjectI { void theObject(ANode a); diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleARP1.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleARP1.java index 654e4e8ed8..02728c9657 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleARP1.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleARP1.java @@ -35,7 +35,7 @@ import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.jena.rdfxml.xmlinput1.*; +import org.apache.jena.rdfxml.arp1.*; import org.xml.sax.ErrorHandler; import org.xml.sax.Locator; import org.xml.sax.SAXException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleTestSuite.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleTestSuite.java index b75f7ca1d1..674f7e2855 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleTestSuite.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleTestSuite.java @@ -25,11 +25,11 @@ import org.junit.Assert; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.RDFErrorHandler; -import org.apache.jena.rdfxml.xmlinput1.ALiteral; -import org.apache.jena.rdfxml.xmlinput1.ARPEventHandler; -import org.apache.jena.rdfxml.xmlinput1.AResource; -import org.apache.jena.rdfxml.xmlinput1.impl.ARPResource; -import org.apache.jena.rdfxml.xmlinput1.impl.ARPSaxErrorHandler; +import org.apache.jena.rdfxml.arp1.ALiteral; +import org.apache.jena.rdfxml.arp1.ARPEventHandler; +import org.apache.jena.rdfxml.arp1.AResource; +import org.apache.jena.rdfxml.arp1.impl.ARPResource; +import org.apache.jena.rdfxml.arp1.impl.ARPSaxErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestErrorMsg.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestErrorMsg.java index 61b6a37fa2..6ea7082818 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestErrorMsg.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestErrorMsg.java @@ -26,7 +26,7 @@ import java.util.regex.Pattern; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.jena.rdfxml.xmlinput1.ARP; +import org.apache.jena.rdfxml.arp1.ARP; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestPropEltErrorMsg.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestPropEltErrorMsg.java index f795c978f4..fc947cc589 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestPropEltErrorMsg.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestPropEltErrorMsg.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; import org.apache.jena.vocabulary.RDF; import org.xml.sax.Attributes; import org.xml.sax.ErrorHandler; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestRDFXML_URI.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestRDFXML_URI.java index c3a7a40006..9fe273305a 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestRDFXML_URI.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestRDFXML_URI.java @@ -30,8 +30,8 @@ import org.apache.jena.irix.IRIs; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFErrorHandler; -import org.apache.jena.rdfxml.xmlinput1.ParseException; -import org.apache.jena.rdfxml.xmlinput1.RDFXMLReader; +import org.apache.jena.rdfxml.arp1.ParseException; +import org.apache.jena.rdfxml.arp1.RDFXMLReader; import org.apache.jena.shared.JenaException; import org.junit.Test; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteException.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteException.java index 1f3ec76cf7..0beef06c48 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteException.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteException.java @@ -25,8 +25,8 @@ import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFErrorHandler; import org.apache.jena.rdf.model.RDFReaderI; import org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; -import org.apache.jena.rdfxml.xmlinput1.RDFXMLReader; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.RDFXMLReader; import org.apache.jena.shared.JenaException; @SuppressWarnings({"deprecated", "removal"}) diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsARP.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsARP.java index db5efc209e..3def6f5b6a 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsARP.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsARP.java @@ -28,7 +28,7 @@ import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFErrorHandler; import org.apache.jena.rdf.model.RDFReaderI; -import org.apache.jena.rdfxml.xmlinput1.*; +import org.apache.jena.rdfxml.arp1.*; import org.apache.jena.vocabulary.RDF; import org.junit.Assert; import org.slf4j.Logger; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsDOM2RDF.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsDOM2RDF.java index 103e564c9b..867305c466 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsDOM2RDF.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsDOM2RDF.java @@ -26,7 +26,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.apache.jena.rdf.model.Model; -import org.apache.jena.rdfxml.xmlinput1.DOM2Model; +import org.apache.jena.rdfxml.arp1.DOM2Model; import org.apache.jena.shared.JenaException; import org.apache.jena.util.JenaXMLInput; import org.w3c.dom.Document; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsMoreDOM2RDF.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsMoreDOM2RDF.java index 856ab8d2da..e7d5dca223 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsMoreDOM2RDF.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsMoreDOM2RDF.java @@ -27,10 +27,10 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import junit.framework.TestCase; -import org.apache.jena.rdfxml.xmlinput1.ALiteral; -import org.apache.jena.rdfxml.xmlinput1.AResource; -import org.apache.jena.rdfxml.xmlinput1.DOM2Model; -import org.apache.jena.rdfxml.xmlinput1.StatementHandler; +import org.apache.jena.rdfxml.arp1.ALiteral; +import org.apache.jena.rdfxml.arp1.AResource; +import org.apache.jena.rdfxml.arp1.DOM2Model; +import org.apache.jena.rdfxml.arp1.StatementHandler; import org.apache.jena.shared.JenaException; import org.apache.jena.util.JenaXMLInput; import org.w3c.dom.Document; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDF.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDF.java index cd043620b7..bc1f22d83f 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDF.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDF.java @@ -33,9 +33,9 @@ import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFErrorHandler; import org.apache.jena.rdf.model.RDFReaderI; -import org.apache.jena.rdfxml.xmlinput1.RDFXMLReader; -import org.apache.jena.rdfxml.xmlinput1.SAX2Model; -import org.apache.jena.rdfxml.xmlinput1.SAX2RDF; +import org.apache.jena.rdfxml.arp1.RDFXMLReader; +import org.apache.jena.rdfxml.arp1.SAX2Model; +import org.apache.jena.rdfxml.arp1.SAX2RDF; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.InputSource; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDFMore.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDFMore.java index 486e2d0571..791131ec9a 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDFMore.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDFMore.java @@ -28,10 +28,10 @@ import junit.framework.TestCase; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFReaderI; +import org.apache.jena.rdfxml.arp1.RDFXMLReader; +import org.apache.jena.rdfxml.arp1.SAX2Model; +import org.apache.jena.rdfxml.arp1.SAX2RDF; import org.apache.jena.rdfxml.arp1tests.TestsSAX2RDF.RDFEHArray; -import org.apache.jena.rdfxml.xmlinput1.RDFXMLReader; -import org.apache.jena.rdfxml.xmlinput1.SAX2Model; -import org.apache.jena.rdfxml.xmlinput1.SAX2RDF; import org.xml.sax.InputSource; import org.xml.sax.SAXParseException; import org.xml.sax.XMLReader; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsStAX2Model.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsStAX2Model.java index db1f5d8cee..470f528304 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsStAX2Model.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsStAX2Model.java @@ -28,7 +28,7 @@ import junit.framework.TestSuite; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler; -import org.apache.jena.rdfxml.xmlinput1.StAX2Model; +import org.apache.jena.rdfxml.arp1.StAX2Model; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsTainting.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsTainting.java index bbd3c6dfcc..e9758a608c 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsTainting.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsTainting.java @@ -31,8 +31,8 @@ import junit.framework.TestSuite; import org.apache.jena.ontology.OntDocumentManager; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; -import org.apache.jena.rdfxml.xmlinput1.ParseException; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.ParseException; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/WGTestSuite.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/WGTestSuite.java index 3b65303a8d..21ef97c0c4 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/WGTestSuite.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/WGTestSuite.java @@ -30,9 +30,9 @@ import org.apache.jena.irix.IRIx; import org.apache.jena.rdf.model.*; import org.apache.jena.rdf.model.impl.PropertyImpl; import org.apache.jena.rdf.model.impl.ResourceImpl; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; -import org.apache.jena.rdfxml.xmlinput1.ParseException; -import org.apache.jena.rdfxml.xmlinput1.RDFXMLReader; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.ParseException; +import org.apache.jena.rdfxml.arp1.RDFXMLReader; import org.apache.jena.rdfxml.xmloutput.impl.RDFXML_Abbrev; import org.apache.jena.reasoner.rulesys.RDFSRuleReasonerFactory; import org.apache.jena.reasoner.test.WGReasonerTester; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/AttrEvent.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/AttrEvent.java index 5ee58dd815..01b4c3d3c3 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/AttrEvent.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/AttrEvent.java @@ -18,8 +18,8 @@ package org.apache.jena.rdfxml.arp1tests.states; -import org.apache.jena.rdfxml.xmlinput1.impl.Names; -import org.apache.jena.rdfxml.xmlinput1.states.FrameI; +import org.apache.jena.rdfxml.arp1.impl.Names; +import org.apache.jena.rdfxml.arp1.states.FrameI; import org.xml.sax.Attributes; class AttrEvent extends Event { diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/ElementEvent.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/ElementEvent.java index 30215a63ae..70d4e5679d 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/ElementEvent.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/ElementEvent.java @@ -18,7 +18,7 @@ package org.apache.jena.rdfxml.arp1tests.states; -import org.apache.jena.rdfxml.xmlinput1.states.FrameI; +import org.apache.jena.rdfxml.arp1.states.FrameI; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/Event.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/Event.java index 8d0a26740a..282875ee90 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/Event.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/Event.java @@ -17,7 +17,7 @@ */ package org.apache.jena.rdfxml.arp1tests.states; -import org.apache.jena.rdfxml.xmlinput1.states.FrameI; +import org.apache.jena.rdfxml.arp1.states.FrameI; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/EventList.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/EventList.java index 1d7eb9be7f..f2454baceb 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/EventList.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/EventList.java @@ -19,10 +19,10 @@ package org.apache.jena.rdfxml.arp1tests.states; -import org.apache.jena.rdfxml.xmlinput1.impl.TaintImpl; -import org.apache.jena.rdfxml.xmlinput1.states.FrameI; - import org.junit.Assert; + +import org.apache.jena.rdfxml.arp1.impl.TaintImpl; +import org.apache.jena.rdfxml.arp1.states.FrameI; import org.xml.sax.Attributes; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/QName.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/QName.java index 984cceaf32..fe7e09b12e 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/QName.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/QName.java @@ -17,7 +17,7 @@ */ package org.apache.jena.rdfxml.arp1tests.states; -import org.apache.jena.rdfxml.xmlinput1.impl.Names; +import org.apache.jena.rdfxml.arp1.impl.Names; class QName implements Names { final String uri; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestData.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestData.java index 7eeffa4def..5c9b55f4b3 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestData.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestData.java @@ -23,9 +23,9 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.util.*; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; -import org.apache.jena.rdfxml.xmlinput1.impl.*; -import org.apache.jena.rdfxml.xmlinput1.states.*; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.impl.*; +import org.apache.jena.rdfxml.arp1.states.*; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestEventList.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestEventList.java index be56aadfa9..0009a781f2 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestEventList.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestEventList.java @@ -21,7 +21,7 @@ package org.apache.jena.rdfxml.arp1tests.states; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.jena.rdfxml.xmlinput1.states.FrameI; +import org.apache.jena.rdfxml.arp1.states.FrameI; public class TestEventList extends TestCase implements Test { diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestFrame.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestFrame.java index c7b48827e0..54bf05d059 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestFrame.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestFrame.java @@ -19,15 +19,15 @@ package org.apache.jena.rdfxml.arp1tests.states; -import org.apache.jena.rdfxml.xmlinput1.impl.ANode; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; -import org.apache.jena.rdfxml.xmlinput1.states.AbsXMLLiteral; -import org.apache.jena.rdfxml.xmlinput1.states.HasSubjectFrameI; -import org.apache.jena.rdfxml.xmlinput1.states.WantsObjectFrameI; - import org.junit.Assert; +import org.apache.jena.rdfxml.arp1.impl.ANode; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; +import org.apache.jena.rdfxml.arp1.states.AbsXMLLiteral; +import org.apache.jena.rdfxml.arp1.states.HasSubjectFrameI; +import org.apache.jena.rdfxml.arp1.states.WantsObjectFrameI; + class TestFrame extends AbsXMLLiteral implements WantsObjectFrameI, HasSubjectFrameI { diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestHandler.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestHandler.java index d366cc5602..8b0b5f4372 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestHandler.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestHandler.java @@ -21,11 +21,12 @@ package org.apache.jena.rdfxml.arp1tests.states; import java.util.HashMap; -import org.apache.jena.rdfxml.xmlinput1.impl.ANode; -import org.apache.jena.rdfxml.xmlinput1.impl.Taint; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; import org.junit.Assert; +import org.apache.jena.rdfxml.arp1.impl.ANode; +import org.apache.jena.rdfxml.arp1.impl.Taint; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; + class TestHandler extends XMLHandler { public void wrong(String msg) { wrong = true; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java index 218d88c8d6..56b8ff40cf 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java @@ -27,7 +27,7 @@ import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFReaderI; import org.apache.jena.rdf.model.RDFWriterI; import org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler; -import org.apache.jena.rdfxml.xmlinput1.RDFXMLReader; +import org.apache.jena.rdfxml.arp1.RDFXMLReader; import org.apache.jena.rdfxml.xmloutput.impl.BaseXMLWriter; import org.apache.jena.rdfxml.xmloutput.impl.SimpleLogger; import org.apache.jena.shared.InvalidPropertyURIException; diff --git a/jena-core/src/test/java/org/apache/jena/test/X_RDFReaderF.java b/jena-core/src/test/java/org/apache/jena/test/X_RDFReaderF.java index 2030d6ccbc..7d40538b37 100644 --- a/jena-core/src/test/java/org/apache/jena/test/X_RDFReaderF.java +++ b/jena-core/src/test/java/org/apache/jena/test/X_RDFReaderF.java @@ -25,7 +25,7 @@ import org.apache.jena.atlas.lib.Creator; import org.apache.jena.rdf.model.RDFReaderF; import org.apache.jena.rdf.model.RDFReaderI; import org.apache.jena.rdf.model.impl.NTripleReader; -import org.apache.jena.rdfxml.xmlinput1.RDFXMLReader; +import org.apache.jena.rdfxml.arp1.RDFXMLReader; import org.apache.jena.shared.JenaException; import org.apache.jena.shared.NoReaderForLangException; import org.apache.jena.ttl_test.turtle.TurtleReader;
