You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2014/08/29 20:23:57 UTC
svn commit: r1621354 [1/2] - in /jena/trunk:
jena-arq/src/main/java/org/apache/jena/riot/adapters/
jena-arq/src/main/java/org/apache/jena/riot/lang/
jena-arq/src/main/java/org/apache/jena/riot/system/
jena-core/src/main/java/com/hp/hpl/jena/datatypes/x...
Author: andy
Date: Fri Aug 29 18:23:54 2014
New Revision: 1621354
URL: http://svn.apache.org/r1621354
Log:
JENA-772 : Move ARP to com.hp.hpl.jena.rdfxml.xmlinput
Added:
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ALiteral.java
- copied, changed from r1621353, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ALiteral.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARP.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARP.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPConfig.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPConfig.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPErrorNumbers.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPErrorNumbers.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPEventHandler.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPEventHandler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPHandlers.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPHandlers.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPOptions.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPOptions.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/AResource.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/AResource.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/DOM2Model.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/DOM2Model.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ExtendedHandler.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ExtendedHandler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/FatalParsingErrorException.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/FatalParsingErrorException.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaHandler.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/JenaHandler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/JenaReader.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/NTriple.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/NTriple.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/NamespaceHandler.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/NamespaceHandler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ParseException.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ParseException.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/SAX2Model.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/SAX2Model.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/SAX2RDF.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/SAX2RDF.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/StAX2Model.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/StAX2Model.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/StAX2SAX.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/StAX2SAX.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/StatementHandler.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/StatementHandler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/
- copied from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/impl/
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/
- copied from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/lang/
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/package.html
- copied unchanged from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/package.html
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/
- copied from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/states/
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPTests.java
- copied, changed from r1620668, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/ARPTests.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/DOM2RDFTest.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/DOM2RDFTest.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/ExceptionTests.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/ExceptionTests.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/InFactoryX.java
- copied, changed from r1620668, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/InFactoryX.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/MemoryLeakTest.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MemoryLeakTest.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/MoreDOM2RDFTest.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreDOM2RDFTest.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/MoreTests.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/NTripleTestSuite.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/Performance.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/Performance.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/SAX2RDFMoreTests.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFMoreTests.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/SAX2RDFTest.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFTest.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/StAX2ModelTest.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/StAX2ModelTest.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TaintingTests.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TaintingTests.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestARPMain.java
- copied, changed from r1620668, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestARPMain.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestErrorMsg.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestErrorMsg.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestPackage.java
- copied, changed from r1620668, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestPackage.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestPropEltErrorMsg.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestPropEltErrorMsg.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestScope.java
- copied, changed from r1620668, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestScope.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/URITests.java
- copied, changed from r1620668, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/URITests.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/WGTestSuite.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/WGTestSuite.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/
- copied from r1620668, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/AttrEvent.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/AttrEvent.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/ElementEvent.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/ElementEvent.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/Event.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/Event.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/EventList.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/EventList.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/QName.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/QName.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/TestData.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestData.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/TestEventList.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestEventList.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/TestFrame.java
- copied, changed from r1621353, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestFrame.java
Removed:
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_ARP.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IO_JenaReaders.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XMLLiteralType.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/RDFReader.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFDefaultErrorHandler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFReaderFImpl.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ANode.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPDatatypeLiteral.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPLocation.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPResource.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPSaxErrorHandler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPString.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/AResourceInternal.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/AbsXMLContext.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/AttributeLexer.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/CharacterModel.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/DefaultErrorHandler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ElementLexer.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/LexicalHandlerImpl.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/Names.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ParserSupport.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/QNameLexer.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/RDFXMLParser.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/SAX2RDFImpl.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/Taint.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/TaintImpl.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/URIReference.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/UntaintableURIReference.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/WrappedException.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/XMLBaselessContext.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/XMLContext.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/XMLHandler.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/IanaLanguageTag.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/Iso3166.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/Iso639.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/LanguageTag.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/LanguageTagCodes.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/LanguageTagSyntaxException.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/AbsWantLiteralValueOrDescription.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/AbsXMLLiteral.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/Collection.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/Frame.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/FrameI.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/HasSubjectFrameI.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/InnerXMLLiteral.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/LookingForRDF.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/OuterXMLLiteral.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/RDFCollection.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/StartStateRDForDescription.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantDescription.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantEmpty.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantLiteralValueOrDescription.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantPropertyElement.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantTopLevelDescription.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantTypedLiteral.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantsObjectFrameI.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantsObjectI.java
jena/trunk/jena-core/src/main/java/jena/rdfparse.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/EventRecord.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/FullEventRecord.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/InternalEvent.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/TestARPStates.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/TestHandler.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestMacEncodings.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/WGReasonerTester.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/test/TestPackage.java
jena/trunk/jena-core/src/test/java/jena/test/rdfparse.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_ARP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_ARP.java?rev=1621354&r1=1621353&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_ARP.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_ARP.java Fri Aug 29 18:23:54 2014
@@ -24,10 +24,10 @@ import java.io.Reader ;
import org.apache.jena.riot.SysRIOT ;
import org.apache.jena.riot.system.IRILib ;
-import com.hp.hpl.jena.rdf.arp.JenaReader ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.RDFErrorHandler ;
import com.hp.hpl.jena.rdf.model.RDFReader ;
+import com.hp.hpl.jena.rdfxml.xmlinput.JenaReader ;
import com.hp.hpl.jena.util.FileManager ;
import com.hp.hpl.jena.util.FileUtils ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java?rev=1621354&r1=1621353&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java Fri Aug 29 18:23:54 2014
@@ -39,9 +39,9 @@ import com.hp.hpl.jena.datatypes.TypeMap
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.rdf.arp.* ;
-import com.hp.hpl.jena.rdf.arp.impl.ARPSaxErrorHandler ;
import com.hp.hpl.jena.rdf.model.RDFErrorHandler ;
+import com.hp.hpl.jena.rdfxml.xmlinput.* ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.ARPSaxErrorHandler ;
public class LangRDFXML implements LangRIOT
{
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IO_JenaReaders.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IO_JenaReaders.java?rev=1621354&r1=1621353&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IO_JenaReaders.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IO_JenaReaders.java Fri Aug 29 18:23:54 2014
@@ -47,10 +47,10 @@ public class IO_JenaReaders
registerForModelRead("RDF/JSON", JenaReadersWriters.RDFReaderRIOT_RDFJSON.class) ;
}
- static String jenaNTriplesReader = "com.hp.hpl.jena.rdf.model.impl.NTripleReader" ;
- static String jenaTurtleReader = "com.hp.hpl.jena.n3.turtle.TurtleReader" ;
+ static String jenaNTriplesReader = com.hp.hpl.jena.rdf.model.impl.NTripleReader.class.getName();
+ static String jenaTurtleReader = com.hp.hpl.jena.n3.turtle.TurtleReader.class.getName();
static String jenaN3Reader = jenaTurtleReader ;
- static String jenaRDFReader = "com.hp.hpl.jena.rdf.arp.JenaReader";
+ static String jenaRDFReader = com.hp.hpl.jena.rdfxml.xmlinput.JenaReader.class.getName();
public static void resetJena() {
RDFReaderFImpl.setBaseReaderClassName("RDF", jenaRDFReader) ;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XMLLiteralType.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XMLLiteralType.java?rev=1621354&r1=1621353&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XMLLiteralType.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XMLLiteralType.java Fri Aug 29 18:23:54 2014
@@ -28,10 +28,10 @@ import org.xml.sax.SAXParseException ;
import com.hp.hpl.jena.datatypes.BaseDatatype ;
import com.hp.hpl.jena.datatypes.DatatypeFormatException ;
import com.hp.hpl.jena.datatypes.RDFDatatype ;
-import com.hp.hpl.jena.rdf.arp.ALiteral ;
-import com.hp.hpl.jena.rdf.arp.ARP ;
-import com.hp.hpl.jena.rdf.arp.AResource ;
-import com.hp.hpl.jena.rdf.arp.StatementHandler ;
+import com.hp.hpl.jena.rdfxml.xmlinput.ALiteral ;
+import com.hp.hpl.jena.rdfxml.xmlinput.ARP ;
+import com.hp.hpl.jena.rdfxml.xmlinput.AResource ;
+import com.hp.hpl.jena.rdfxml.xmlinput.StatementHandler ;
import com.hp.hpl.jena.shared.BrokenException ;
import com.hp.hpl.jena.vocabulary.RDF ;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/RDFReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/RDFReader.java?rev=1621354&r1=1621353&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/RDFReader.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/RDFReader.java Fri Aug 29 18:23:54 2014
@@ -77,7 +77,7 @@ public interface RDFReader {
* <dt>N3</dt><dt>N-TRIPLE</dt>
* <dd>No properties.</dd>
* <dt>RDF/XML</dt><dt>RDF/XML-ABBREV</dt>
- * <dd>See {@link com.hp.hpl.jena.rdf.arp.JenaReader#setProperty(String,Object)}
+ * <dd>See {@link com.hp.hpl.jena.rdfxml.xmlinput.JenaReader#setProperty(String,Object)}
* </dl>
* @param propName the name of the property
* @param propValue the value of the property
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFDefaultErrorHandler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFDefaultErrorHandler.java?rev=1621354&r1=1621353&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFDefaultErrorHandler.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFDefaultErrorHandler.java Fri Aug 29 18:23:54 2014
@@ -18,8 +18,8 @@
package com.hp.hpl.jena.rdf.model.impl;
-import com.hp.hpl.jena.rdf.arp.ParseException;
import com.hp.hpl.jena.rdf.model.*;
+import com.hp.hpl.jena.rdfxml.xmlinput.ParseException ;
import com.hp.hpl.jena.shared.*;
import org.slf4j.Logger;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFReaderFImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFReaderFImpl.java?rev=1621354&r1=1621353&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFReaderFImpl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFReaderFImpl.java Fri Aug 29 18:23:54 2014
@@ -51,9 +51,9 @@ public class RDFReaderFImpl extends Obje
// default readers for each language
protected static final String DEFAULTREADERS[] = {
- com.hp.hpl.jena.rdf.arp.JenaReader.class.getName(),
- com.hp.hpl.jena.rdf.arp.JenaReader.class.getName(),
- com.hp.hpl.jena.rdf.arp.JenaReader.class.getName(),
+ com.hp.hpl.jena.rdfxml.xmlinput.JenaReader.class.getName(),
+ com.hp.hpl.jena.rdfxml.xmlinput.JenaReader.class.getName(),
+ com.hp.hpl.jena.rdfxml.xmlinput.JenaReader.class.getName(),
com.hp.hpl.jena.rdf.model.impl.NTripleReader.class.getName(),
com.hp.hpl.jena.rdf.model.impl.NTripleReader.class.getName(),
com.hp.hpl.jena.rdf.model.impl.NTripleReader.class.getName(),
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ALiteral.java (from r1621353, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ALiteral.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ALiteral.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ALiteral.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ALiteral.java&r1=1621353&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ALiteral.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ALiteral.java Fri Aug 29 18:23:54 2014
@@ -22,9 +22,9 @@
* Created on June 26, 2001, 9:27 AM
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
-import com.hp.hpl.jena.rdf.arp.impl.ANode;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.ANode ;
/**
* A string literal property value from an RDF/XML file.
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARP.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARP.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARP.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARP.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARP.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARP.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARP.java Fri Aug 29 18:23:54 2014
@@ -21,7 +21,7 @@
* See end of file for BSD-style license.
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
@@ -31,7 +31,7 @@ import org.xml.sax.InputSource;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-import com.hp.hpl.jena.rdf.arp.impl.RDFXMLParser;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.RDFXMLParser ;
/** Another RDF Parser.
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPConfig.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPConfig.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPConfig.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPConfig.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPConfig.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPConfig.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPConfig.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
import org.xml.sax.ErrorHandler;
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPErrorNumbers.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPErrorNumbers.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPErrorNumbers.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPErrorNumbers.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPErrorNumbers.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPErrorNumbers.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPErrorNumbers.java Fri Aug 29 18:23:54 2014
@@ -22,7 +22,7 @@
* Created on July 10, 2001, 8:34 AM
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
/**
* Error numbers used by ARP.
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPEventHandler.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPEventHandler.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPEventHandler.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPEventHandler.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPEventHandler.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPEventHandler.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPEventHandler.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
/**
* Convenience generalization of all ARP handler interfaces.
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPHandlers.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPHandlers.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPHandlers.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPHandlers.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPHandlers.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPHandlers.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPHandlers.java Fri Aug 29 18:23:54 2014
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
import org.xml.sax.ErrorHandler;
-import com.hp.hpl.jena.rdf.arp.impl.DefaultErrorHandler;
-import com.hp.hpl.jena.rdf.arp.impl.XMLHandler;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.DefaultErrorHandler ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.XMLHandler ;
/**
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPOptions.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPOptions.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPOptions.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPOptions.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPOptions.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ARPOptions.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPOptions.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
import org.apache.jena.iri.IRIFactory;
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/AResource.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/AResource.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/AResource.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/AResource.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/AResource.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/AResource.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/AResource.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
/**
* A URI or blank node reported to a {@link StatementHandler}.
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/DOM2Model.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/DOM2Model.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/DOM2Model.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/DOM2Model.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/DOM2Model.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/DOM2Model.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/DOM2Model.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ExtendedHandler.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ExtendedHandler.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ExtendedHandler.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ExtendedHandler.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ExtendedHandler.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ExtendedHandler.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ExtendedHandler.java Fri Aug 29 18:23:54 2014
@@ -21,7 +21,7 @@
* See end of file for BSD-style license.
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
/**Extended callbacks from a reader to an RDF application.
* This reports:
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/FatalParsingErrorException.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/FatalParsingErrorException.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/FatalParsingErrorException.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/FatalParsingErrorException.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/FatalParsingErrorException.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/FatalParsingErrorException.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/FatalParsingErrorException.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
/**
* This exception should only be seen in user code when using
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaHandler.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/JenaHandler.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaHandler.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaHandler.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/JenaHandler.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/JenaHandler.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaHandler.java Fri Aug 29 18:23:54 2014
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.rdf.arp.impl.ARPSaxErrorHandler ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.RDFErrorHandler ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.ARPSaxErrorHandler ;
import com.hp.hpl.jena.shared.JenaException ;
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.shared.impl.PrefixMappingImpl ;
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/JenaReader.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/JenaReader.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/JenaReader.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -35,13 +35,14 @@ import org.xml.sax.SAXNotSupportedExcept
import com.hp.hpl.jena.datatypes.RDFDatatype;
import com.hp.hpl.jena.datatypes.TypeMapper;
import com.hp.hpl.jena.graph.* ;
+
import org.apache.jena.iri.IRIFactory;
-import com.hp.hpl.jena.rdf.arp.impl.RDFXMLParser;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.RDFErrorHandler;
import com.hp.hpl.jena.rdf.model.RDFReader;
import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.RDFXMLParser ;
import com.hp.hpl.jena.shared.DoesNotExistException;
import com.hp.hpl.jena.shared.JenaException;
import com.hp.hpl.jena.shared.UnknownPropertyException;
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/NTriple.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/NTriple.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/NTriple.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/NTriple.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/NTriple.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/NTriple.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/NTriple.java Fri Aug 29 18:23:54 2014
@@ -22,7 +22,7 @@
* Created on July 13, 2001, 10:06 PM
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
import java.io.File;
import java.io.FileInputStream;
@@ -535,7 +535,7 @@ int debugC = 0;
* @param anonymousID Is something that corresponds to an XMLName
* @return an ascii string that is legal NTriple
*/
- static String escapeNTriple(String anonymousID) {
+ public static String escapeNTriple(String anonymousID) {
Matcher matcher = ntripleBnode.matcher(anonymousID);
if (matcher.matches())
return anonymousID;
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/NamespaceHandler.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/NamespaceHandler.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/NamespaceHandler.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/NamespaceHandler.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/NamespaceHandler.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/NamespaceHandler.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/NamespaceHandler.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
/**
* The interface for being notified about namespace use in an RDF/XML
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ParseException.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ParseException.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ParseException.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ParseException.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ParseException.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/ParseException.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/ParseException.java Fri Aug 29 18:23:54 2014
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
import org.xml.sax.SAXParseException;
-import com.hp.hpl.jena.rdf.arp.impl.ARPLocation;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.ARPLocation ;
import java.lang.reflect.Field;
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/SAX2Model.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/SAX2Model.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/SAX2Model.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/SAX2Model.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/SAX2Model.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/SAX2Model.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/SAX2Model.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
import org.xml.sax.SAXParseException;
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/SAX2RDF.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/SAX2RDF.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/SAX2RDF.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/SAX2RDF.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/SAX2RDF.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/SAX2RDF.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/SAX2RDF.java Fri Aug 29 18:23:54 2014
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
-import com.hp.hpl.jena.rdf.arp.impl.SAX2RDFImpl;
-import com.hp.hpl.jena.rdf.arp.impl.XMLHandler;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.SAX2RDFImpl ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.XMLHandler ;
/**
* <p>
@@ -129,7 +129,7 @@ implements ARPConfig {
/**The handlers used for processing ARP events.
* Do not use with a {@link SAX2Model}.
- * @see com.hp.hpl.jena.rdf.arp.ARPConfig#getHandlers()
+ * @see com.hp.hpl.jena.rdfxml.xmlinput.ARPConfig#getHandlers()
*/
@Override
public ARPHandlers getHandlers() {
@@ -138,7 +138,7 @@ implements ARPConfig {
/**Copys handlers used for processing ARP events.
* Do not use with a {@link SAX2Model}.
- * @see com.hp.hpl.jena.rdf.arp.ARPConfig#setHandlersWith(ARPHandlers)
+ * @see com.hp.hpl.jena.rdfxml.xmlinput.ARPConfig#setHandlersWith(ARPHandlers)
*/
@Override
public void setHandlersWith(ARPHandlers handlers) {
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/StAX2Model.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/StAX2Model.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/StAX2Model.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/StAX2Model.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/StAX2Model.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/StAX2Model.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/StAX2Model.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
import com.hp.hpl.jena.rdf.model.Model;
import javax.xml.stream.XMLEventReader;
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/StAX2SAX.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/StAX2SAX.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/StAX2SAX.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/StAX2SAX.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/StAX2SAX.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/StAX2SAX.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/StAX2SAX.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
import java.util.Iterator;
import javax.xml.namespace.QName;
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/StatementHandler.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/StatementHandler.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/StatementHandler.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/StatementHandler.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/StatementHandler.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/StatementHandler.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/StatementHandler.java Fri Aug 29 18:23:54 2014
@@ -22,7 +22,7 @@
* Created on June 26, 2001, 9:30 AM
*/
-package com.hp.hpl.jena.rdf.arp;
+package com.hp.hpl.jena.rdfxml.xmlinput;
/** The callback from a reader to an RDF application.
* Each triple in the input file causes a call on one of the statement methods.
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ANode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ANode.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ANode.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ANode.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
public interface ANode extends Taint {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPDatatypeLiteral.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPDatatypeLiteral.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPDatatypeLiteral.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPDatatypeLiteral.java Fri Aug 29 18:23:54 2014
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
import org.xml.sax.SAXParseException;
-import com.hp.hpl.jena.rdf.arp.ALiteral;
-import com.hp.hpl.jena.rdf.arp.states.Frame;
+import com.hp.hpl.jena.rdfxml.xmlinput.ALiteral ;
+import com.hp.hpl.jena.rdfxml.xmlinput.states.Frame ;
public class ARPDatatypeLiteral extends TaintImpl implements ALiteral {
@@ -37,14 +37,14 @@ public class ARPDatatypeLiteral extends
taint();
}
/**
- * @see com.hp.hpl.jena.rdf.arp.ALiteral#isWellFormedXML()
+ * @see com.hp.hpl.jena.rdfxml.xmlinput.ALiteral#isWellFormedXML()
*/
@Override
public boolean isWellFormedXML() {
return false; //datatype.equals(ARPString.RDFXMLLiteral);
}
/**
- * @see com.hp.hpl.jena.rdf.arp.ALiteral#getParseType()
+ * @see com.hp.hpl.jena.rdfxml.xmlinput.ALiteral#getParseType()
* @deprecated
*/
@Override
@@ -58,7 +58,7 @@ public class ARPDatatypeLiteral extends
}
/**
- * @see com.hp.hpl.jena.rdf.arp.ALiteral#getDatatypeURI()
+ * @see com.hp.hpl.jena.rdfxml.xmlinput.ALiteral#getDatatypeURI()
*/
@Override
public String getDatatypeURI() {
@@ -66,7 +66,7 @@ public class ARPDatatypeLiteral extends
}
/**
- * @see com.hp.hpl.jena.rdf.arp.ALiteral#getLang()
+ * @see com.hp.hpl.jena.rdfxml.xmlinput.ALiteral#getLang()
*/
@Override
public String getLang() {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPLocation.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPLocation.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPLocation.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPLocation.java Fri Aug 29 18:23:54 2014
@@ -22,7 +22,7 @@
* Created on July 14, 2001, 11:47 AM
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
import org.xml.sax.Locator;
public class ARPLocation implements Locator {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPResource.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPResource.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPResource.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPResource.java Fri Aug 29 18:23:54 2014
@@ -22,7 +22,7 @@
* Created on June 25, 2001, 9:57 PM
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
public class ARPResource extends TaintImpl implements AResourceInternal {
// Constants cribbed from com.megginson.sax.rdf.RDFFilter
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPSaxErrorHandler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPSaxErrorHandler.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPSaxErrorHandler.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPSaxErrorHandler.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPString.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPString.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPString.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ARPString.java Fri Aug 29 18:23:54 2014
@@ -22,12 +22,12 @@
* Created on June 22, 2001, 9:44 AM
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
import org.xml.sax.SAXParseException;
-import com.hp.hpl.jena.rdf.arp.ALiteral;
-import com.hp.hpl.jena.rdf.arp.states.Frame;
+import com.hp.hpl.jena.rdfxml.xmlinput.ALiteral ;
+import com.hp.hpl.jena.rdfxml.xmlinput.states.Frame ;
public class ARPString extends TaintImpl implements ALiteral {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/AResourceInternal.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/AResourceInternal.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/AResourceInternal.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/AResourceInternal.java Fri Aug 29 18:23:54 2014
@@ -22,9 +22,9 @@
* Created on June 26, 2001, 9:26 AM
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
-import com.hp.hpl.jena.rdf.arp.AResource;
+import com.hp.hpl.jena.rdfxml.xmlinput.AResource ;
/** A resource from the input file.
*/
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/AbsXMLContext.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/AbsXMLContext.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/AbsXMLContext.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/AbsXMLContext.java Fri Aug 29 18:23:54 2014
@@ -16,20 +16,20 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
import java.util.Iterator;
import org.xml.sax.SAXParseException;
-
import org.apache.jena.iri.IRI;
import org.apache.jena.iri.IRIComponents;
import org.apache.jena.iri.Violation;
import org.apache.jena.iri.ViolationCodes;
-import com.hp.hpl.jena.rdf.arp.ARPErrorNumbers;
-import com.hp.hpl.jena.rdf.arp.lang.LanguageTag;
-import com.hp.hpl.jena.rdf.arp.lang.LanguageTagCodes;
-import com.hp.hpl.jena.rdf.arp.lang.LanguageTagSyntaxException;
+
+import com.hp.hpl.jena.rdfxml.xmlinput.ARPErrorNumbers ;
+import com.hp.hpl.jena.rdfxml.xmlinput.lang.LanguageTag ;
+import com.hp.hpl.jena.rdfxml.xmlinput.lang.LanguageTagCodes ;
+import com.hp.hpl.jena.rdfxml.xmlinput.lang.LanguageTagSyntaxException ;
public abstract class AbsXMLContext implements ARPErrorNumbers,
LanguageTagCodes {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/AttributeLexer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/AttributeLexer.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/AttributeLexer.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/AttributeLexer.java Fri Aug 29 18:23:54 2014
@@ -16,15 +16,15 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
import java.util.BitSet;
import org.xml.sax.Attributes;
import org.xml.sax.SAXParseException;
-import com.hp.hpl.jena.rdf.arp.ARPErrorNumbers;
-import com.hp.hpl.jena.rdf.arp.states.Frame;
+import com.hp.hpl.jena.rdfxml.xmlinput.ARPErrorNumbers ;
+import com.hp.hpl.jena.rdfxml.xmlinput.states.Frame ;
public class AttributeLexer extends QNameLexer implements ARPErrorNumbers {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/CharacterModel.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/CharacterModel.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/CharacterModel.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/CharacterModel.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
import java.text.Normalizer;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/DefaultErrorHandler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/DefaultErrorHandler.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/DefaultErrorHandler.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/DefaultErrorHandler.java Fri Aug 29 18:23:54 2014
@@ -22,9 +22,9 @@
* Created on July 10, 2001, 11:23 AM
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
-import com.hp.hpl.jena.rdf.arp.ParseException;
+import com.hp.hpl.jena.rdfxml.xmlinput.ParseException ;
/**
*/
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ElementLexer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ElementLexer.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ElementLexer.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ElementLexer.java Fri Aug 29 18:23:54 2014
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
import org.xml.sax.SAXParseException;
-import com.hp.hpl.jena.rdf.arp.states.Frame;
+import com.hp.hpl.jena.rdfxml.xmlinput.states.Frame ;
public class ElementLexer extends QNameLexer {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/LexicalHandlerImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/LexicalHandlerImpl.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/LexicalHandlerImpl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/LexicalHandlerImpl.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/Names.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/Names.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/Names.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/Names.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
public interface Names {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ParserSupport.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ParserSupport.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ParserSupport.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/ParserSupport.java Fri Aug 29 18:23:54 2014
@@ -22,17 +22,17 @@
* Created on July 15, 2001, 7:13 AM
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
import java.util.HashMap;
import java.util.Map;
import org.apache.xerces.util.XMLChar;
import org.xml.sax.SAXParseException;
-
import org.apache.jena.iri.IRI;
-import com.hp.hpl.jena.rdf.arp.ARPErrorNumbers;
-import com.hp.hpl.jena.rdf.arp.lang.LanguageTagCodes;
+
+import com.hp.hpl.jena.rdfxml.xmlinput.ARPErrorNumbers ;
+import com.hp.hpl.jena.rdfxml.xmlinput.lang.LanguageTagCodes ;
/**
*/
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/QNameLexer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/QNameLexer.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/QNameLexer.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/QNameLexer.java Fri Aug 29 18:23:54 2014
@@ -16,15 +16,15 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
import java.util.HashSet;
import java.util.Set;
import org.xml.sax.SAXParseException;
-import com.hp.hpl.jena.rdf.arp.ARPErrorNumbers;
-import com.hp.hpl.jena.rdf.arp.states.Frame;
+import com.hp.hpl.jena.rdfxml.xmlinput.ARPErrorNumbers ;
+import com.hp.hpl.jena.rdfxml.xmlinput.states.Frame ;
abstract public class QNameLexer implements Names, ARPErrorNumbers {
final int bad;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/RDFXMLParser.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/RDFXMLParser.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/RDFXMLParser.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/RDFXMLParser.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -30,8 +30,8 @@ import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import com.hp.hpl.jena.rdf.arp.FatalParsingErrorException;
-import com.hp.hpl.jena.rdf.arp.SAX2RDF;
+import com.hp.hpl.jena.rdfxml.xmlinput.FatalParsingErrorException ;
+import com.hp.hpl.jena.rdfxml.xmlinput.SAX2RDF ;
import com.hp.hpl.jena.util.CharEncoding;
/**
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/SAX2RDFImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/SAX2RDFImpl.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/SAX2RDFImpl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/SAX2RDFImpl.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
@@ -25,7 +25,7 @@ import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.ext.LexicalHandler;
-import com.hp.hpl.jena.rdf.arp.SAX2RDF;
+import com.hp.hpl.jena.rdfxml.xmlinput.SAX2RDF ;
/**
* This class is public merely to reduce the amount of irrelevant documentation
* generated by Javadoc for {@link SAX2RDF}.
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/Taint.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/Taint.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/Taint.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/Taint.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
public interface Taint {
void taint();
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/TaintImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/TaintImpl.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/TaintImpl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/TaintImpl.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
/**
* Minimal implemantation of {@link Taint}
*/
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/URIReference.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/URIReference.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/URIReference.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/URIReference.java Fri Aug 29 18:23:54 2014
@@ -22,13 +22,13 @@
* Created on June 25, 2001, 9:58 PM
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
import org.xml.sax.SAXParseException;
-
import org.apache.jena.iri.IRI;
-import com.hp.hpl.jena.rdf.arp.ARPErrorNumbers;
-import com.hp.hpl.jena.rdf.arp.states.Frame;
+
+import com.hp.hpl.jena.rdfxml.xmlinput.ARPErrorNumbers ;
+import com.hp.hpl.jena.rdfxml.xmlinput.states.Frame ;
// TODO: not for 2.3 IRI spec conformance
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/UntaintableURIReference.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/UntaintableURIReference.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/UntaintableURIReference.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/UntaintableURIReference.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
class UntaintableURIReference extends URIReference {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/WrappedException.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/WrappedException.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/WrappedException.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/WrappedException.java Fri Aug 29 18:23:54 2014
@@ -22,7 +22,7 @@
* Created on July 10, 2001, 11:44 AM
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
import java.io.IOException;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/XMLBaselessContext.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/XMLBaselessContext.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/XMLBaselessContext.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/XMLBaselessContext.java Fri Aug 29 18:23:54 2014
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
import org.xml.sax.SAXParseException;
-
import org.apache.jena.iri.IRI;
-import com.hp.hpl.jena.rdf.arp.ARPErrorNumbers;
+
+import com.hp.hpl.jena.rdfxml.xmlinput.ARPErrorNumbers ;
public class XMLBaselessContext extends AbsXMLContext implements ARPErrorNumbers {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/XMLContext.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/XMLContext.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/XMLContext.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/XMLContext.java Fri Aug 29 18:23:54 2014
@@ -22,13 +22,13 @@
* Created on July 10, 2001, 2:35 AM
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
import org.xml.sax.SAXParseException;
-
import org.apache.jena.iri.IRI;
-import com.hp.hpl.jena.rdf.arp.ARPErrorNumbers;
-import com.hp.hpl.jena.rdf.arp.lang.LanguageTagCodes;
+
+import com.hp.hpl.jena.rdfxml.xmlinput.ARPErrorNumbers ;
+import com.hp.hpl.jena.rdfxml.xmlinput.lang.LanguageTagCodes ;
/**
*
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/XMLHandler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/XMLHandler.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/XMLHandler.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/impl/XMLHandler.java Fri Aug 29 18:23:54 2014
@@ -21,7 +21,7 @@
* See end of file for BSD-style license.
*/
-package com.hp.hpl.jena.rdf.arp.impl;
+package com.hp.hpl.jena.rdfxml.xmlinput.impl;
import java.net.MalformedURLException ;
import java.util.HashMap ;
@@ -34,11 +34,11 @@ import org.xml.sax.Locator ;
import org.xml.sax.SAXException ;
import org.xml.sax.SAXParseException ;
-import com.hp.hpl.jena.rdf.arp.* ;
-import com.hp.hpl.jena.rdf.arp.states.Frame ;
-import com.hp.hpl.jena.rdf.arp.states.FrameI ;
-import com.hp.hpl.jena.rdf.arp.states.LookingForRDF ;
-import com.hp.hpl.jena.rdf.arp.states.StartStateRDForDescription ;
+import com.hp.hpl.jena.rdfxml.xmlinput.* ;
+import com.hp.hpl.jena.rdfxml.xmlinput.states.Frame ;
+import com.hp.hpl.jena.rdfxml.xmlinput.states.FrameI ;
+import com.hp.hpl.jena.rdfxml.xmlinput.states.LookingForRDF ;
+import com.hp.hpl.jena.rdfxml.xmlinput.states.StartStateRDForDescription ;
/**
* This class converts SAX events into a stream of encapsulated events suitable
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/IanaLanguageTag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/IanaLanguageTag.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/IanaLanguageTag.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/IanaLanguageTag.java Fri Aug 29 18:23:54 2014
@@ -22,7 +22,7 @@
* Created on July 24, 2001, 11:47 PM
*/
-package com.hp.hpl.jena.rdf.arp.lang;
+package com.hp.hpl.jena.rdfxml.xmlinput.lang;
import java.util.HashMap;
import java.util.Map;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/Iso3166.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/Iso3166.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/Iso3166.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/Iso3166.java Fri Aug 29 18:23:54 2014
@@ -22,7 +22,7 @@
* Created on July 24, 2001, 11:46 PM
*/
-package com.hp.hpl.jena.rdf.arp.lang;
+package com.hp.hpl.jena.rdfxml.xmlinput.lang;
import java.util.HashMap;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/Iso639.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/Iso639.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/Iso639.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/Iso639.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.lang;
+package com.hp.hpl.jena.rdfxml.xmlinput.lang;
import java.util.HashMap;
import java.util.Map;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/LanguageTag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/LanguageTag.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/LanguageTag.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/LanguageTag.java Fri Aug 29 18:23:54 2014
@@ -22,7 +22,7 @@
* Created on July 24, 2001, 11:45 PM
*/
-package com.hp.hpl.jena.rdf.arp.lang;
+package com.hp.hpl.jena.rdfxml.xmlinput.lang;
import java.util.Locale ;
import java.util.Vector;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/LanguageTagCodes.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/LanguageTagCodes.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/LanguageTagCodes.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/LanguageTagCodes.java Fri Aug 29 18:23:54 2014
@@ -22,7 +22,7 @@
* Created on July 25, 2001, 10:09 AM
*/
-package com.hp.hpl.jena.rdf.arp.lang;
+package com.hp.hpl.jena.rdfxml.xmlinput.lang;
/** Informational values about language codes.
* Values to be OR-ed together.
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/LanguageTagSyntaxException.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/LanguageTagSyntaxException.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/LanguageTagSyntaxException.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/lang/LanguageTagSyntaxException.java Fri Aug 29 18:23:54 2014
@@ -22,7 +22,7 @@
* Created on July 25, 2001, 9:32 AM
*/
-package com.hp.hpl.jena.rdf.arp.lang;
+package com.hp.hpl.jena.rdfxml.xmlinput.lang;
/**
* A LanguageTag did not conform to RFC3066.
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/AbsWantLiteralValueOrDescription.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/AbsWantLiteralValueOrDescription.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/AbsWantLiteralValueOrDescription.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/AbsWantLiteralValueOrDescription.java Fri Aug 29 18:23:54 2014
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.states;
+package com.hp.hpl.jena.rdfxml.xmlinput.states;
import org.xml.sax.Attributes;
import org.xml.sax.SAXParseException;
-import com.hp.hpl.jena.rdf.arp.impl.AbsXMLContext;
-import com.hp.hpl.jena.rdf.arp.impl.AttributeLexer;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.AbsXMLContext ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.AttributeLexer ;
abstract class AbsWantLiteralValueOrDescription extends
WantDescription {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/AbsXMLLiteral.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/AbsXMLLiteral.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/AbsXMLLiteral.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/AbsXMLLiteral.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.states;
+package com.hp.hpl.jena.rdfxml.xmlinput.states;
import java.util.Iterator;
import java.util.Map;
@@ -25,8 +25,8 @@ import java.util.TreeMap;
import org.xml.sax.Attributes;
import org.xml.sax.SAXParseException;
-import com.hp.hpl.jena.rdf.arp.impl.AbsXMLContext;
-import com.hp.hpl.jena.rdf.arp.impl.XMLHandler;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.AbsXMLContext ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.XMLHandler ;
public abstract class AbsXMLLiteral extends Frame {
boolean checkComposingChar = true;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/Collection.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/Collection.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/Collection.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/Collection.java Fri Aug 29 18:23:54 2014
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.states;
+package com.hp.hpl.jena.rdfxml.xmlinput.states;
import org.xml.sax.Attributes;
import org.xml.sax.SAXParseException;
-import com.hp.hpl.jena.rdf.arp.impl.ANode;
-import com.hp.hpl.jena.rdf.arp.impl.ARPResource;
-import com.hp.hpl.jena.rdf.arp.impl.AbsXMLContext;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.ANode ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.ARPResource ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.AbsXMLContext ;
abstract class Collection extends WantDescription {
// TODO: not for 2.3. document this carefully.
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/Frame.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/Frame.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/Frame.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/Frame.java Fri Aug 29 18:23:54 2014
@@ -16,23 +16,13 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.states;
+package com.hp.hpl.jena.rdfxml.xmlinput.states;
import org.xml.sax.Attributes;
import org.xml.sax.SAXParseException;
-import com.hp.hpl.jena.rdf.arp.ARPErrorNumbers;
-import com.hp.hpl.jena.rdf.arp.impl.ARPString;
-import com.hp.hpl.jena.rdf.arp.impl.AbsXMLContext;
-import com.hp.hpl.jena.rdf.arp.impl.AttributeLexer;
-import com.hp.hpl.jena.rdf.arp.impl.ElementLexer;
-import com.hp.hpl.jena.rdf.arp.impl.Names;
-import com.hp.hpl.jena.rdf.arp.impl.ParserSupport;
-import com.hp.hpl.jena.rdf.arp.impl.QNameLexer;
-import com.hp.hpl.jena.rdf.arp.impl.Taint;
-import com.hp.hpl.jena.rdf.arp.impl.TaintImpl;
-import com.hp.hpl.jena.rdf.arp.impl.URIReference;
-import com.hp.hpl.jena.rdf.arp.impl.XMLHandler;
+import com.hp.hpl.jena.rdfxml.xmlinput.ARPErrorNumbers ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.* ;
public abstract class Frame extends ParserSupport implements Names, FrameI,
ARPErrorNumbers {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/FrameI.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/FrameI.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/FrameI.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/FrameI.java Fri Aug 29 18:23:54 2014
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.states;
+package com.hp.hpl.jena.rdfxml.xmlinput.states;
import org.xml.sax.Attributes;
import org.xml.sax.SAXParseException;
-import com.hp.hpl.jena.rdf.arp.impl.AbsXMLContext;
-import com.hp.hpl.jena.rdf.arp.impl.XMLHandler;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.AbsXMLContext ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.XMLHandler ;
public interface FrameI {
FrameI getParent();
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/HasSubjectFrameI.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/HasSubjectFrameI.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/HasSubjectFrameI.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/HasSubjectFrameI.java Fri Aug 29 18:23:54 2014
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.states;
+package com.hp.hpl.jena.rdfxml.xmlinput.states;
-import com.hp.hpl.jena.rdf.arp.impl.ANode;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.ANode ;
public interface HasSubjectFrameI extends FrameI {
void aPredAndObj(ANode p, ANode o);
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/InnerXMLLiteral.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/InnerXMLLiteral.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/InnerXMLLiteral.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/InnerXMLLiteral.java Fri Aug 29 18:23:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.states;
+package com.hp.hpl.jena.rdfxml.xmlinput.states;
import java.util.Map;