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 19:59:56 UTC
svn commit: r1621353 - in /jena/trunk:
jena-arq/src/main/java/org/apache/jena/riot/lang/
jena-arq/src/main/java/org/apache/jena/riot/system/
jena-arq/src/main/java/org/apache/jena/riot/writer/
jena-arq/src/test/java/org/apache/jena/riot/system/ jena-co...
Author: andy
Date: Fri Aug 29 17:59:54 2014
New Revision: 1621353
URL: http://svn.apache.org/r1621353
Log:
JENA-773 : Move RDF/XML writer into com.hp.hpl.jena.rdfxml.xmloutput
Added:
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/RDFXMLWriterI.java
- copied, changed from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/RDFXMLWriterI.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/
- copied from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/impl/
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/package.html
- copied unchanged from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/package.html
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/
- copied from r1620668, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/
Removed:
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/
Modified:
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_JenaWriters.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLAbbrevWriter.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLPlainWriter.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.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/impl/RDFReaderFImpl.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFWriterFImpl.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Abbreviated.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/BaseXMLWriter.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Basic.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/PairEntry.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Relation.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/SimpleLogger.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Unparser.java
jena/trunk/jena-core/src/main/java/jena/rdfparse.java
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/rdf/arp/ExceptionTests.java
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/rdf/arp/MoreDOM2RDFTest.java
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/rdf/arp/NTripleTestSuite.java
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/rdf/arp/SAX2RDFMoreTests.java
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/rdf/arp/StAX2ModelTest.java
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/rdf/arp/TestErrorMsg.java
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/rdf/arp/WGTestSuite.java
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/rdf/arp/states/ElementEvent.java
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/rdf/arp/states/EventList.java
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/rdf/arp/states/TestData.java
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/rdf/arp/states/TestFrame.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFWriterMap.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/BigAbbrevTestPackage.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/PrettyWriterTest.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestEntityOutput.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestLiteralEncoding.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/rdfxml/xmloutput/TestPackage.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestWriterFeatures.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestWriterInterface.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestXMLAbbrev.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestXMLFeatures.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/XMLOutputTestBase.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/testWriterAndReader.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/test/TestPackage.java
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=1621353&r1=1621352&r2=1621353&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 17:59:54 2014
@@ -18,9 +18,6 @@
package org.apache.jena.riot.lang;
-import static com.hp.hpl.jena.rdf.arp.ARPErrorNumbers.EM_FATAL ;
-import static com.hp.hpl.jena.rdf.arp.ARPErrorNumbers.WARN_MALFORMED_XMLLANG ;
-
import java.io.IOException ;
import java.io.InputStream ;
import java.io.Reader ;
@@ -112,8 +109,8 @@ public class LangRDFXML implements LangR
// non-XML-based languages. e.g. language tags should be
// syntactically valid.
private static int[] additionalErrors = new int[] {
- WARN_MALFORMED_XMLLANG
- //, WARN_STRING_NOT_NORMAL_FORM_C
+ ARPErrorNumbers.WARN_MALFORMED_XMLLANG
+ //, ARPErrorNumbers.WARN_STRING_NOT_NORMAL_FORM_C
} ;
@Override
@@ -131,7 +128,7 @@ public class LangRDFXML implements LangR
ARPOptions options = arp.getOptions() ;
// Convert some warnings to errors for compatible behaviour for all parsers.
for ( int code : additionalErrors )
- options.setErrorMode(code, EM_FATAL) ;
+ options.setErrorMode(code, ARPErrorNumbers.EM_FATAL) ;
arp.setOptionsWith(options) ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IO_JenaWriters.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IO_JenaWriters.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IO_JenaWriters.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IO_JenaWriters.java Fri Aug 29 17:59:54 2014
@@ -23,13 +23,21 @@ import java.util.HashMap ;
import java.util.Map ;
import org.apache.jena.riot.RDFFormat ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_JSONLD ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_N3 ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_N3Plain ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_N3Triples ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_N3TriplesAlt ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_N3_PP ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_NTriples ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_RDFJSON ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_Turtle ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_Turtle1 ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFWriterRIOT_Turtle2 ;
-import com.hp.hpl.jena.Jena ;
import com.hp.hpl.jena.n3.N3JenaWriter ;
import com.hp.hpl.jena.rdf.model.impl.RDFWriterFImpl ;
-import static org.apache.jena.riot.adapters.JenaReadersWriters.* ;
-
public class IO_JenaWriters
{
private static Map<String, RDFFormat> mapJenaNameToFormat = new HashMap<>() ;
@@ -70,8 +78,8 @@ public class IO_JenaWriters
//registerForModelWrite("RDF/XML-ABBREV", RDFWriterRIOT_RDFXMLAbbrev.class) ;
// Use the original classes so that setting properties works transparently.
- registerForModelWrite("RDF/XML", com.hp.hpl.jena.xmloutput.impl.Basic.class) ;
- registerForModelWrite("RDF/XML-ABBREV", com.hp.hpl.jena.xmloutput.impl.Abbreviated.class) ;
+ registerForModelWrite("RDF/XML", com.hp.hpl.jena.rdfxml.xmloutput.impl.Basic.class) ;
+ registerForModelWrite("RDF/XML-ABBREV", com.hp.hpl.jena.rdfxml.xmloutput.impl.Abbreviated.class) ;
registerForModelWrite("N-TRIPLE", RDFWriterRIOT_NTriples.class) ;
registerForModelWrite("N-TRIPLES", RDFWriterRIOT_NTriples.class) ;
@@ -98,22 +106,22 @@ public class IO_JenaWriters
public static void resetJena()
{
// This is the old Jena configuration (bugs and all)
- RDFWriterFImpl.setBaseWriterClassName("RDF/XML", Jena.PATH + ".xmloutput.impl.Basic") ;
- RDFWriterFImpl.setBaseWriterClassName("RDF/XML-ABBREV", Jena.PATH + ".xmloutput.impl.Abbreviated") ;
+ RDFWriterFImpl.setBaseWriterClassName("RDF/XML", com.hp.hpl.jena.rdfxml.xmloutput.impl.Basic.class.getName()) ;
+ RDFWriterFImpl.setBaseWriterClassName("RDF/XML-ABBREV", com.hp.hpl.jena.rdfxml.xmloutput.impl.Abbreviated.class.getName()) ;
- RDFWriterFImpl.setBaseWriterClassName("N-TRIPLE", Jena.PATH + ".rdf.model.impl.NTripleWriter") ;
+ RDFWriterFImpl.setBaseWriterClassName("N-TRIPLE", com.hp.hpl.jena.rdf.model.impl.NTripleWriter.class.getName()) ;
RDFWriterFImpl.setBaseWriterClassName("NT", "") ;
- RDFWriterFImpl.setBaseWriterClassName("N-TRIPLES", Jena.PATH + ".rdf.model.impl.NTripleWriter") ;
- RDFWriterFImpl.setBaseWriterClassName("N-Triples", Jena.PATH + ".rdf.model.impl.NTripleWriter") ;
+ RDFWriterFImpl.setBaseWriterClassName("N-TRIPLES", com.hp.hpl.jena.rdf.model.impl.NTripleWriter.class.getName()) ;
+ RDFWriterFImpl.setBaseWriterClassName("N-Triples", com.hp.hpl.jena.rdf.model.impl.NTripleWriter.class.getName()) ;
- RDFWriterFImpl.setBaseWriterClassName("N3", Jena.PATH + ".n3.N3JenaWriter") ;
- RDFWriterFImpl.setBaseWriterClassName(N3JenaWriter.n3WriterPrettyPrinter, Jena.PATH + ".n3.N3JenaWriterPP") ;
- RDFWriterFImpl.setBaseWriterClassName(N3JenaWriter.n3WriterPlain, Jena.PATH + ".n3.N3TurtleJenaWriter") ;
- RDFWriterFImpl.setBaseWriterClassName(N3JenaWriter.n3WriterTriples, Jena.PATH + ".n3.N3TurtleJenaWriter") ;
- RDFWriterFImpl.setBaseWriterClassName(N3JenaWriter.n3WriterTriplesAlt, Jena.PATH + ".n3.N3JenaWriterTriples") ;
- RDFWriterFImpl.setBaseWriterClassName(N3JenaWriter.turtleWriter, Jena.PATH + ".n3.N3TurtleJenaWriter") ;
- RDFWriterFImpl.setBaseWriterClassName(N3JenaWriter.turtleWriterAlt1, Jena.PATH + ".n3.N3TurtleJenaWriter") ;
- RDFWriterFImpl.setBaseWriterClassName(N3JenaWriter.turtleWriterAlt2, Jena.PATH + ".n3.N3TurtleJenaWriter") ;
+ RDFWriterFImpl.setBaseWriterClassName("N3", com.hp.hpl.jena.n3.N3JenaWriter.class.getName()) ;
+ RDFWriterFImpl.setBaseWriterClassName(N3JenaWriter.n3WriterPrettyPrinter, com.hp.hpl.jena.n3.N3JenaWriterPP.class.getName()) ;
+ RDFWriterFImpl.setBaseWriterClassName(N3JenaWriter.n3WriterPlain, com.hp.hpl.jena.n3.N3TurtleJenaWriter.class.getName()) ;
+ RDFWriterFImpl.setBaseWriterClassName(N3JenaWriter.n3WriterTriples, com.hp.hpl.jena.n3.N3TurtleJenaWriter.class.getName()) ;
+ RDFWriterFImpl.setBaseWriterClassName(N3JenaWriter.n3WriterTriplesAlt, com.hp.hpl.jena.n3.N3JenaWriterTriples.class.getName()) ;
+ RDFWriterFImpl.setBaseWriterClassName(N3JenaWriter.turtleWriter, com.hp.hpl.jena.n3.N3TurtleJenaWriter.class.getName()) ;
+ RDFWriterFImpl.setBaseWriterClassName(N3JenaWriter.turtleWriterAlt1, com.hp.hpl.jena.n3.N3TurtleJenaWriter.class.getName()) ;
+ RDFWriterFImpl.setBaseWriterClassName(N3JenaWriter.turtleWriterAlt2, com.hp.hpl.jena.n3.N3TurtleJenaWriter.class.getName()) ;
RDFWriterFImpl.setBaseWriterClassName("JSON-LD", "");
RDFWriterFImpl.setBaseWriterClassName("JSON", "");
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java Fri Aug 29 17:59:54 2014
@@ -73,14 +73,14 @@ public class StreamRDFLib
public static StreamRDF dataset(DatasetGraph dataset) { return new ParserOutputDataset(dataset) ; }
/** Set triples to a StreamRDF - does not call .start/.finish
- * @deprecated Use {@link StreamOps#triplesToStream(Iterator<Triple>, StreamRDF,)} instead*/
+ * @deprecated Use {@link StreamOps#triplesToStream} instead*/
@SuppressWarnings("javadoc")
@Deprecated
public static void triplesToStream(StreamRDF dest, Iterator<Triple> iter)
{ StreamOps.sendTriplesToStream(iter, dest) ; }
/** Set quads to a StreamRDF - does not call .start/.finish
- * @deprecated Use {@link StreamOps#quadsToStream(Iterator<Quad>, StreamRDF)} instead*/
+ * @deprecated Use {@link StreamOps#quadsToStream} instead*/
@SuppressWarnings("javadoc")
@Deprecated
public static void quadsToStream(StreamRDF dest, Iterator<Quad> iter)
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLAbbrevWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLAbbrevWriter.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLAbbrevWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLAbbrevWriter.java Fri Aug 29 17:59:54 2014
@@ -22,7 +22,7 @@ import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.adapters.AdapterRDFWriter ;
import com.hp.hpl.jena.rdf.model.RDFWriter ;
-import com.hp.hpl.jena.xmloutput.impl.Abbreviated ;
+import com.hp.hpl.jena.rdfxml.xmloutput.impl.Abbreviated ;
/** Wrapper to the RDF/XML writer (preRIOT). */
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLPlainWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLPlainWriter.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLPlainWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLPlainWriter.java Fri Aug 29 17:59:54 2014
@@ -22,7 +22,7 @@ import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.adapters.AdapterRDFWriter ;
import com.hp.hpl.jena.rdf.model.RDFWriter ;
-import com.hp.hpl.jena.xmloutput.impl.Basic ;
+import com.hp.hpl.jena.rdfxml.xmloutput.impl.Basic ;
/** Wrapper to the RDF/XML writer (preRIOT). */
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java Fri Aug 29 17:59:54 2014
@@ -41,8 +41,8 @@ import org.junit.Test ;
import com.hp.hpl.jena.n3.N3JenaWriter ;
import com.hp.hpl.jena.rdf.model.impl.RDFWriterFImpl ;
-import com.hp.hpl.jena.xmloutput.impl.Abbreviated ;
-import com.hp.hpl.jena.xmloutput.impl.Basic ;
+import com.hp.hpl.jena.rdfxml.xmloutput.impl.Abbreviated ;
+import com.hp.hpl.jena.rdfxml.xmloutput.impl.Basic ;
public class TestIO_JenaWriters {
@@ -97,7 +97,6 @@ public class TestIO_JenaWriters {
assertFalse(defaults.isEmpty());
for (String lang : defaults.keySet()) {
assertEquals(defaults.get(lang), writerF.getLangToClassName().get(lang));
- // Disabled as it does not handle GRDLL reader
assertEquals(defaults.get(lang), writerF.getWriter(lang).getClass().getName());
}
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=1621353&r1=1621352&r2=1621353&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 17:59:54 2014
@@ -18,14 +18,22 @@
package com.hp.hpl.jena.datatypes.xsd.impl;
-import com.hp.hpl.jena.datatypes.*;
-import com.hp.hpl.jena.vocabulary.RDF;
-import com.hp.hpl.jena.rdf.arp.*;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.SAXException;
-import com.hp.hpl.jena.shared.BrokenException;
-import java.io.*;
+import java.io.IOException ;
+import java.io.StringReader ;
+
+import org.xml.sax.ErrorHandler ;
+import org.xml.sax.SAXException ;
+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.shared.BrokenException ;
+import com.hp.hpl.jena.vocabulary.RDF ;
/**
* Builtin data type to represent XMLLiteral (i.e. items created
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=1621353&r1=1621352&r2=1621353&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 17:59:54 2014
@@ -30,7 +30,7 @@ import java.util.Properties;
public class RDFReaderFImpl extends Object implements RDFReaderF {
// ** The setting in this class are overrided by RIOT **
private static final String GRDDLREADER = "com.hp.hpl.jena.grddl.GRDDLReader";
- private static final String TURTLEREADER = "com.hp.hpl.jena.n3.turtle.TurtleReader" ;
+ private static final String TURTLEREADER = com.hp.hpl.jena.n3.turtle.TurtleReader.class.getName() ;
protected static Properties langToClassName = null;
@@ -51,12 +51,12 @@ public class RDFReaderFImpl extends Obje
// default readers for each language
protected static final String DEFAULTREADERS[] = {
- "com.hp.hpl.jena.rdf.arp.JenaReader",
- "com.hp.hpl.jena.rdf.arp.JenaReader",
- "com.hp.hpl.jena.rdf.arp.JenaReader",
- Jena.PATH + ".rdf.model.impl.NTripleReader",
- Jena.PATH + ".rdf.model.impl.NTripleReader",
- Jena.PATH + ".rdf.model.impl.NTripleReader",
+ 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.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(),
TURTLEREADER, // N3 replaced by a Turtle-based parser
TURTLEREADER,
TURTLEREADER,
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFWriterFImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFWriterFImpl.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFWriterFImpl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFWriterFImpl.java Fri Aug 29 17:59:54 2014
@@ -38,14 +38,17 @@ public class RDFWriterFImpl extends Obje
protected static final String LANGS[] =
{ "RDF/XML",
"RDF/XML-ABBREV",
+
"N-TRIPLE",
"N-TRIPLES",
"N-Triples",
+
"N3",
N3JenaWriter.n3WriterPrettyPrinter,
N3JenaWriter.n3WriterPlain,
N3JenaWriter.n3WriterTriples,
N3JenaWriter.n3WriterTriplesAlt,
+
N3JenaWriter.turtleWriter,
N3JenaWriter.turtleWriterAlt1,
N3JenaWriter.turtleWriterAlt2
@@ -54,24 +57,39 @@ public class RDFWriterFImpl extends Obje
protected static final String DEFAULTWRITERS[] =
{
- Jena.PATH + ".xmloutput.impl.Basic",
- Jena.PATH + ".xmloutput.impl.Abbreviated",
- Jena.PATH + ".rdf.model.impl.NTripleWriter",
- Jena.PATH + ".rdf.model.impl.NTripleWriter",
- Jena.PATH + ".rdf.model.impl.NTripleWriter",
- Jena.PATH + ".n3.N3JenaWriter",
- Jena.PATH + ".n3.N3JenaWriterPP",
-
- Jena.PATH + ".n3.N3TurtleJenaWriter", // Write Turtle to ensure safe round tripping.
- Jena.PATH + ".n3.N3TurtleJenaWriter", // Ditto.
-
-// Jena.PATH + ".n3.N3JenaWriterPlain", // Keep as N3 for now - a test fails.
-// Jena.PATH + ".n3.N3JenaWriterTriples",
+
+
+ com.hp.hpl.jena.rdfxml.xmloutput.impl.Basic.class.getName(),
+ com.hp.hpl.jena.rdfxml.xmloutput.impl.Abbreviated.class.getName(),
+
+ com.hp.hpl.jena.rdf.model.impl.NTripleWriter.class.getName(),
+ com.hp.hpl.jena.rdf.model.impl.NTripleWriter.class.getName(),
+ com.hp.hpl.jena.rdf.model.impl.NTripleWriter.class.getName(),
- Jena.PATH + ".n3.N3JenaWriterTriples", // Same writer, different writer name
- Jena.PATH + ".n3.N3TurtleJenaWriter", // Alternative names for Turtle
- Jena.PATH + ".n3.N3TurtleJenaWriter",
- Jena.PATH + ".n3.N3TurtleJenaWriter",
+// /*
+// Jena.PATH + ".n3.N3JenaWriter",
+// Jena.PATH + ".n3.N3JenaWriterPP",
+//
+// Jena.PATH + ".n3.N3TurtleJenaWriter", // Write Turtle to ensure safe round tripping.
+// Jena.PATH + ".n3.N3TurtleJenaWriter", // Ditto.
+//
+//// Jena.PATH + ".n3.N3JenaWriterPlain", // Keep as N3 for now - a test fails.
+//// Jena.PATH + ".n3.N3JenaWriterTriples",
+//
+// Jena.PATH + ".n3.N3JenaWriterTriples", // Same writer, different writer name
+// Jena.PATH + ".n3.N3TurtleJenaWriter", // Alternative names for Turtle
+// Jena.PATH + ".n3.N3TurtleJenaWriter",
+// Jena.PATH + ".n3.N3TurtleJenaWriter", */
+//
+ com.hp.hpl.jena.n3.N3JenaWriter.class.getName(),
+ com.hp.hpl.jena.n3.N3JenaWriterPP.class.getName(),
+ com.hp.hpl.jena.n3.N3TurtleJenaWriter.class.getName(), // Write Turtle to ensure safe round tripping.
+ com.hp.hpl.jena.n3.N3TurtleJenaWriter.class.getName(), // Ditto.
+ com.hp.hpl.jena.n3.N3JenaWriterTriples.class.getName(),
+
+ com.hp.hpl.jena.n3.N3TurtleJenaWriter.class.getName(), // Alternative names for Turtle
+ com.hp.hpl.jena.n3.N3TurtleJenaWriter.class.getName(),
+ com.hp.hpl.jena.n3.N3TurtleJenaWriter.class.getName()
};
protected static final String DEFAULTLANG = LANGS[0];
Copied: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/RDFXMLWriterI.java (from r1620668, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/RDFXMLWriterI.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/RDFXMLWriterI.java?p2=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/RDFXMLWriterI.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/RDFXMLWriterI.java&r1=1620668&r2=1621353&rev=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/RDFXMLWriterI.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/RDFXMLWriterI.java Fri Aug 29 17:59:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.xmloutput;
+package com.hp.hpl.jena.rdfxml.xmloutput;
import com.hp.hpl.jena.rdf.model.RDFWriter;
import com.hp.hpl.jena.vocabulary.RDFSyntax;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Abbreviated.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Abbreviated.java?rev=1621353&r1=1620668&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Abbreviated.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Abbreviated.java Fri Aug 29 17:59:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.xmloutput.impl;
+package com.hp.hpl.jena.rdfxml.xmloutput.impl;
import java.io.PrintWriter;
import java.io.Writer;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/BaseXMLWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/BaseXMLWriter.java?rev=1621353&r1=1620668&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/BaseXMLWriter.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/BaseXMLWriter.java Fri Aug 29 17:59:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.xmloutput.impl;
+package com.hp.hpl.jena.rdfxml.xmloutput.impl;
import java.io.OutputStream ;
import java.io.OutputStreamWriter ;
@@ -37,12 +37,11 @@ import com.hp.hpl.jena.rdf.model.* ;
import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler ;
import com.hp.hpl.jena.rdf.model.impl.ResourceImpl ;
import com.hp.hpl.jena.rdf.model.impl.Util ;
+import com.hp.hpl.jena.rdfxml.xmloutput.RDFXMLWriterI ;
import com.hp.hpl.jena.shared.* ;
import com.hp.hpl.jena.util.CharEncoding ;
import com.hp.hpl.jena.util.FileUtils ;
import com.hp.hpl.jena.vocabulary.* ;
-import com.hp.hpl.jena.xmloutput.RDFXMLWriterI ;
-//import com.hp.hpl.jena.vocabulary.DAML_OIL;
/**
* This is not part of the public API.
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Basic.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Basic.java?rev=1621353&r1=1620668&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Basic.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Basic.java Fri Aug 29 17:59:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.xmloutput.impl;
+package com.hp.hpl.jena.rdfxml.xmloutput.impl;
import java.io.PrintWriter;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/PairEntry.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/PairEntry.java?rev=1621353&r1=1620668&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/PairEntry.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/PairEntry.java Fri Aug 29 17:59:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.xmloutput.impl;
+package com.hp.hpl.jena.rdfxml.xmloutput.impl;
class PairEntry<K,V> implements java.util.Map.Entry<K,V> {
K a;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Relation.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Relation.java?rev=1621353&r1=1620668&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Relation.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Relation.java Fri Aug 29 17:59:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.xmloutput.impl;
+package com.hp.hpl.jena.rdfxml.xmloutput.impl;
import java.util.HashMap;
import java.util.HashSet;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/SimpleLogger.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/SimpleLogger.java?rev=1621353&r1=1620668&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/SimpleLogger.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/SimpleLogger.java Fri Aug 29 17:59:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.xmloutput.impl;
+package com.hp.hpl.jena.rdfxml.xmloutput.impl;
public interface SimpleLogger
{
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Unparser.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Unparser.java?rev=1621353&r1=1620668&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Unparser.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Unparser.java Fri Aug 29 17:59:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.xmloutput.impl;
+package com.hp.hpl.jena.rdfxml.xmloutput.impl;
/*
* Want todo List - easy efficiency gains in listSubjects() and
Modified: jena/trunk/jena-core/src/main/java/jena/rdfparse.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/rdfparse.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/rdfparse.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/rdfparse.java Fri Aug 29 17:59:54 2014
@@ -18,12 +18,12 @@
package jena;
-import static jena.cmdline.CmdLineUtils.setLog4jConfiguration;
+import static jena.cmdline.CmdLineUtils.setLog4jConfiguration ;
-import java.lang.reflect.Constructor;
+import java.lang.reflect.Constructor ;
-import com.hp.hpl.jena.rdf.arp.NTriple;
-import com.hp.hpl.jena.shared.Command;
+import com.hp.hpl.jena.rdf.arp.NTriple ;
+import com.hp.hpl.jena.shared.Command ;
/** A command line interface into ARP.
* Creates NTriple's or just error messages.
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/DOM2RDFTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/DOM2RDFTest.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/DOM2RDFTest.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/DOM2RDFTest.java Fri Aug 29 17:59:54 2014
@@ -28,8 +28,8 @@ import javax.xml.parsers.ParserConfigura
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
-import com.hp.hpl.jena.rdf.arp.DOM2Model;
import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.arp.DOM2Model ;
import com.hp.hpl.jena.shared.JenaException;
class DOM2RDFTest extends SAX2RDFTest {
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/ExceptionTests.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/ExceptionTests.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/ExceptionTests.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/ExceptionTests.java Fri Aug 29 17:59:54 2014
@@ -21,12 +21,12 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.hp.hpl.jena.rdf.arp.ARPErrorNumbers;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
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.rdf.arp.ARPErrorNumbers ;
import com.hp.hpl.jena.shared.JenaException;
public class ExceptionTests
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MemoryLeakTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MemoryLeakTest.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MemoryLeakTest.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MemoryLeakTest.java Fri Aug 29 17:59:54 2014
@@ -26,7 +26,7 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.hp.hpl.jena.rdf.arp.NTriple;
+import com.hp.hpl.jena.rdf.arp.NTriple ;
public class MemoryLeakTest extends TestCase {
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreDOM2RDFTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreDOM2RDFTest.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreDOM2RDFTest.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreDOM2RDFTest.java Fri Aug 29 17:59:54 2014
@@ -27,14 +27,13 @@ import javax.xml.parsers.DocumentBuilder
import javax.xml.parsers.ParserConfigurationException;
import junit.framework.TestCase;
-
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
-import com.hp.hpl.jena.rdf.arp.ALiteral;
-import com.hp.hpl.jena.rdf.arp.AResource;
-import com.hp.hpl.jena.rdf.arp.DOM2Model;
-import com.hp.hpl.jena.rdf.arp.StatementHandler;
+import com.hp.hpl.jena.rdf.arp.ALiteral ;
+import com.hp.hpl.jena.rdf.arp.AResource ;
+import com.hp.hpl.jena.rdf.arp.DOM2Model ;
+import com.hp.hpl.jena.rdf.arp.StatementHandler ;
public class MoreDOM2RDFTest extends TestCase implements StatementHandler {
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java Fri Aug 29 17:59:54 2014
@@ -18,26 +18,26 @@
package com.hp.hpl.jena.rdf.arp;
-import java.io.*;
-import java.nio.charset.Charset;
+import java.io.* ;
+import java.nio.charset.Charset ;
-import org.junit.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-import org.apache.jena.iri.IRIFactory;
-import com.hp.hpl.jena.ontology.OntDocumentManager;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.RDFErrorHandler;
-import com.hp.hpl.jena.rdf.model.RDFReader;
-import com.hp.hpl.jena.vocabulary.RDF;
+import junit.framework.Test ;
+import junit.framework.TestCase ;
+import junit.framework.TestSuite ;
+import org.apache.jena.iri.IRIFactory ;
+import org.junit.Assert ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
+import org.xml.sax.ErrorHandler ;
+import org.xml.sax.SAXException ;
+import org.xml.sax.SAXParseException ;
+
+import com.hp.hpl.jena.ontology.OntDocumentManager ;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.rdf.model.RDFErrorHandler ;
+import com.hp.hpl.jena.rdf.model.RDFReader ;
+import com.hp.hpl.jena.vocabulary.RDF ;
public class MoreTests extends TestCase implements RDFErrorHandler,
ARPErrorNumbers {
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java Fri Aug 29 17:59:54 2014
@@ -27,10 +27,14 @@ import org.junit.Assert ;
import org.xml.sax.SAXException ;
import org.xml.sax.SAXParseException ;
-import com.hp.hpl.jena.rdf.arp.impl.ARPResource ;
-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.rdf.arp.ALiteral ;
+import com.hp.hpl.jena.rdf.arp.ARPEventHandler ;
+import com.hp.hpl.jena.rdf.arp.AResource ;
+import com.hp.hpl.jena.rdf.arp.NTriple ;
+import com.hp.hpl.jena.rdf.arp.impl.ARPResource ;
+import com.hp.hpl.jena.rdf.arp.impl.ARPSaxErrorHandler ;
import com.hp.hpl.jena.shared.wg.TestInputStreamFactory ;
/**
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/Performance.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/Performance.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/Performance.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/Performance.java Fri Aug 29 17:59:54 2014
@@ -26,7 +26,7 @@ import java.io.InputStream;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXParseException;
-import com.hp.hpl.jena.rdf.arp.NTriple;
+import com.hp.hpl.jena.rdf.arp.NTriple ;
class Performance {
static String allFiles[][] =
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFMoreTests.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFMoreTests.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFMoreTests.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFMoreTests.java Fri Aug 29 17:59:54 2014
@@ -23,18 +23,17 @@ import java.io.InputStream;
import java.util.Arrays;
import junit.framework.TestCase;
-
import org.apache.xerces.parsers.SAXParser;
import org.xml.sax.InputSource;
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
-import com.hp.hpl.jena.rdf.arp.SAX2Model;
-import com.hp.hpl.jena.rdf.arp.SAX2RDF;
import com.hp.hpl.jena.rdf.arp.SAX2RDFTest.RDFEHArray;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.RDFReader;
+import com.hp.hpl.jena.rdf.arp.SAX2Model ;
+import com.hp.hpl.jena.rdf.arp.SAX2RDF ;
public class SAX2RDFMoreTests extends TestCase {
public SAX2RDFMoreTests(String nm) {
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFTest.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFTest.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFTest.java Fri Aug 29 17:59:54 2014
@@ -26,7 +26,6 @@ import java.util.Vector;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.xerces.parsers.SAXParser;
@@ -35,12 +34,12 @@ import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
-import com.hp.hpl.jena.rdf.arp.SAX2Model;
-import com.hp.hpl.jena.rdf.arp.SAX2RDF;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.RDFErrorHandler;
import com.hp.hpl.jena.rdf.model.RDFReader;
+import com.hp.hpl.jena.rdf.arp.SAX2Model ;
+import com.hp.hpl.jena.rdf.arp.SAX2RDF ;
public class SAX2RDFTest extends TestCase {
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/StAX2ModelTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/StAX2ModelTest.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/StAX2ModelTest.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/StAX2ModelTest.java Fri Aug 29 17:59:54 2014
@@ -22,15 +22,17 @@ import java.io.FileInputStream;
import java.io.InputStream;
import javax.xml.stream.XMLEventReader;
+
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler;
+import com.hp.hpl.jena.rdf.arp.StAX2Model ;
+
import javax.xml.stream.XMLInputFactory;
/**
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TaintingTests.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TaintingTests.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TaintingTests.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TaintingTests.java Fri Aug 29 17:59:54 2014
@@ -28,16 +28,15 @@ import java.io.PrintStream;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXParseException;
import com.hp.hpl.jena.ontology.OntDocumentManager;
-import com.hp.hpl.jena.rdf.arp.ARPErrorNumbers;
-import com.hp.hpl.jena.rdf.arp.NTriple;
-import com.hp.hpl.jena.rdf.arp.ParseException;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.arp.ARPErrorNumbers ;
+import com.hp.hpl.jena.rdf.arp.NTriple ;
+import com.hp.hpl.jena.rdf.arp.ParseException ;
public class TaintingTests extends TestCase implements ErrorHandler,
ARPErrorNumbers {
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestErrorMsg.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestErrorMsg.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestErrorMsg.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestErrorMsg.java Fri Aug 29 17:59:54 2014
@@ -26,12 +26,11 @@ import java.util.regex.Pattern;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import com.hp.hpl.jena.rdf.arp.ARP;
+import com.hp.hpl.jena.rdf.arp.ARP ;
public class TestErrorMsg extends TestCase {
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestPropEltErrorMsg.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestPropEltErrorMsg.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestPropEltErrorMsg.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestPropEltErrorMsg.java Fri Aug 29 17:59:54 2014
@@ -23,13 +23,12 @@ import java.util.ArrayList;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
import org.xml.sax.Attributes;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import com.hp.hpl.jena.rdf.arp.impl.XMLHandler;
+import com.hp.hpl.jena.rdf.arp.impl.XMLHandler ;
import com.hp.hpl.jena.vocabulary.RDF;
public class TestPropEltErrorMsg extends TestCase {
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/WGTestSuite.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/WGTestSuite.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/WGTestSuite.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/WGTestSuite.java Fri Aug 29 17:59:54 2014
@@ -32,14 +32,10 @@ import java.util.Set;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
import org.xml.sax.SAXException;
-
import org.apache.jena.iri.IRI;
import org.apache.jena.iri.IRIFactory;
-import com.hp.hpl.jena.rdf.arp.ARPErrorNumbers;
-import com.hp.hpl.jena.rdf.arp.JenaReader;
-import com.hp.hpl.jena.rdf.arp.ParseException;
+
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Property;
@@ -51,6 +47,9 @@ import com.hp.hpl.jena.rdf.model.Stateme
import com.hp.hpl.jena.rdf.model.StmtIterator;
import com.hp.hpl.jena.rdf.model.impl.PropertyImpl;
import com.hp.hpl.jena.rdf.model.impl.ResourceImpl;
+import com.hp.hpl.jena.rdf.arp.ARPErrorNumbers ;
+import com.hp.hpl.jena.rdf.arp.JenaReader ;
+import com.hp.hpl.jena.rdf.arp.ParseException ;
import com.hp.hpl.jena.reasoner.rulesys.RDFSRuleReasonerFactory;
import com.hp.hpl.jena.reasoner.test.WGReasonerTester;
import com.hp.hpl.jena.shared.BrokenException;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/AttrEvent.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/AttrEvent.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/AttrEvent.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/AttrEvent.java Fri Aug 29 17:59:54 2014
@@ -18,10 +18,9 @@
package com.hp.hpl.jena.rdf.arp.states;
-import org.xml.sax.Attributes;
+import org.xml.sax.Attributes ;
-import com.hp.hpl.jena.rdf.arp.impl.Names;
-import com.hp.hpl.jena.rdf.arp.states.FrameI;
+import com.hp.hpl.jena.rdf.arp.impl.Names ;
class AttrEvent extends Event {
final QName q;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/ElementEvent.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/ElementEvent.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/ElementEvent.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/ElementEvent.java Fri Aug 29 17:59:54 2014
@@ -18,10 +18,8 @@
package com.hp.hpl.jena.rdf.arp.states;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
-import com.hp.hpl.jena.rdf.arp.states.FrameI;
+import org.xml.sax.Attributes ;
+import org.xml.sax.SAXParseException ;
class ElementEvent extends Event {
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/Event.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/Event.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/Event.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/Event.java Fri Aug 29 17:59:54 2014
@@ -20,7 +20,7 @@ package com.hp.hpl.jena.rdf.arp.states;
import org.xml.sax.Attributes;
import org.xml.sax.SAXParseException;
-import com.hp.hpl.jena.rdf.arp.states.FrameI;
+import com.hp.hpl.jena.rdf.arp.states.FrameI ;
abstract class Event {
// TODO: not for 2.3. get rid of short names all together, not good idea.
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/EventList.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/EventList.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/EventList.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/EventList.java Fri Aug 29 17:59:54 2014
@@ -20,11 +20,10 @@ package com.hp.hpl.jena.rdf.arp.states;
import org.junit.Assert;
-
import org.xml.sax.Attributes;
-import com.hp.hpl.jena.rdf.arp.impl.TaintImpl;
-import com.hp.hpl.jena.rdf.arp.states.FrameI;
+import com.hp.hpl.jena.rdf.arp.impl.TaintImpl ;
+import com.hp.hpl.jena.rdf.arp.states.FrameI ;
class EventList implements Attributes, Cloneable {
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/QName.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/QName.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/QName.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/QName.java Fri Aug 29 17:59:54 2014
@@ -17,7 +17,7 @@
*/
package com.hp.hpl.jena.rdf.arp.states;
-import com.hp.hpl.jena.rdf.arp.impl.Names;
+import com.hp.hpl.jena.rdf.arp.impl.Names ;
class QName implements Names {
final String uri;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestData.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestData.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestData.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestData.java Fri Aug 29 17:59:54 2014
@@ -18,28 +18,16 @@
package com.hp.hpl.jena.rdf.arp.states;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import java.util.TreeSet;
-
-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.AbsXMLContext;
-import com.hp.hpl.jena.rdf.arp.impl.AttributeLexer;
-import com.hp.hpl.jena.rdf.arp.impl.Names;
-import com.hp.hpl.jena.rdf.arp.impl.URIReference;
-import com.hp.hpl.jena.rdf.arp.impl.XMLBaselessContext;
-import com.hp.hpl.jena.rdf.arp.impl.XMLContext;
-import com.hp.hpl.jena.rdf.arp.impl.XMLHandler;
+import java.io.FileWriter ;
+import java.io.IOException ;
+import java.lang.reflect.InvocationTargetException ;
+import java.util.* ;
+
+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.* ;
/**
* For each state s, for each element-attribute event e1, - test s, e1 - if s,
@@ -48,9 +36,6 @@ import com.hp.hpl.jena.rdf.arp.impl.XMLH
* an error
*/
public class TestData implements ARPErrorNumbers{
-
- // TODO: not for 2.3. get rid of short names all together, not good idea.
-
private static final URIReference foo = URIReference.createNoChecks("http://foo/");
private static final URIReference bar = URIReference.createNoChecks("http://bar/");
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestEventList.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestEventList.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestEventList.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestEventList.java Fri Aug 29 17:59:54 2014
@@ -18,7 +18,7 @@
package com.hp.hpl.jena.rdf.arp.states;
-import com.hp.hpl.jena.rdf.arp.states.FrameI;
+import com.hp.hpl.jena.rdf.arp.states.FrameI ;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestFrame.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestFrame.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestFrame.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestFrame.java Fri Aug 29 17:59:54 2014
@@ -19,14 +19,11 @@
package com.hp.hpl.jena.rdf.arp.states;
-import org.junit.Assert;
+import org.junit.Assert ;
-import com.hp.hpl.jena.rdf.arp.impl.ANode;
-import com.hp.hpl.jena.rdf.arp.impl.AbsXMLContext;
-import com.hp.hpl.jena.rdf.arp.impl.XMLHandler;
-import com.hp.hpl.jena.rdf.arp.states.AbsXMLLiteral;
-import com.hp.hpl.jena.rdf.arp.states.HasSubjectFrameI;
-import com.hp.hpl.jena.rdf.arp.states.WantsObjectFrameI;
+import com.hp.hpl.jena.rdf.arp.impl.ANode ;
+import com.hp.hpl.jena.rdf.arp.impl.AbsXMLContext ;
+import com.hp.hpl.jena.rdf.arp.impl.XMLHandler ;
class TestFrame extends AbsXMLLiteral implements WantsObjectFrameI,
HasSubjectFrameI {
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFWriterMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFWriterMap.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFWriterMap.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestRDFWriterMap.java Fri Aug 29 17:59:54 2014
@@ -27,11 +27,11 @@ import com.hp.hpl.jena.n3.N3TurtleJenaWr
import com.hp.hpl.jena.rdf.model.RDFWriter;
import com.hp.hpl.jena.rdf.model.RDFWriterF;
import com.hp.hpl.jena.rdf.model.impl.NTripleWriter;
+import com.hp.hpl.jena.rdfxml.xmloutput.impl.Abbreviated ;
+import com.hp.hpl.jena.rdfxml.xmloutput.impl.Basic ;
import com.hp.hpl.jena.shared.JenaException;
import com.hp.hpl.jena.shared.NoWriterForLangException;
import com.hp.hpl.jena.test.JenaTestBase;
-import com.hp.hpl.jena.xmloutput.impl.Abbreviated;
-import com.hp.hpl.jena.xmloutput.impl.Basic;
import java.util.HashMap;
import java.util.Map;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/BigAbbrevTestPackage.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/BigAbbrevTestPackage.java?rev=1621353&r1=1620668&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/BigAbbrevTestPackage.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/BigAbbrevTestPackage.java Fri Aug 29 17:59:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.xmloutput;
+package com.hp.hpl.jena.rdfxml.xmloutput;
import junit.framework.*;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/PrettyWriterTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/PrettyWriterTest.java?rev=1621353&r1=1620668&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/PrettyWriterTest.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/PrettyWriterTest.java Fri Aug 29 17:59:54 2014
@@ -18,7 +18,7 @@
// Package
///////////////
-package com.hp.hpl.jena.xmloutput;
+package com.hp.hpl.jena.rdfxml.xmloutput;
// Imports
///////////////
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestEntityOutput.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestEntityOutput.java?rev=1621353&r1=1620668&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestEntityOutput.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestEntityOutput.java Fri Aug 29 17:59:54 2014
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.xmloutput;
+package com.hp.hpl.jena.rdfxml.xmloutput;
import java.io.*;
import com.hp.hpl.jena.rdf.model.*;
import com.hp.hpl.jena.rdf.model.test.ModelTestBase;
+import com.hp.hpl.jena.rdfxml.xmloutput.impl.BaseXMLWriter ;
import com.hp.hpl.jena.vocabulary.RDF;
-import com.hp.hpl.jena.xmloutput.impl.BaseXMLWriter;
/**
Tests for entities being created corresponding to prefixes.
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestLiteralEncoding.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestLiteralEncoding.java?rev=1621353&r1=1620668&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestLiteralEncoding.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestLiteralEncoding.java Fri Aug 29 17:59:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.xmloutput;
+package com.hp.hpl.jena.rdfxml.xmloutput;
import java.io.*;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestMacEncodings.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestMacEncodings.java?rev=1621353&r1=1620668&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestMacEncodings.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestMacEncodings.java Fri Aug 29 17:59:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.xmloutput;
+package com.hp.hpl.jena.rdfxml.xmloutput;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestPackage.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestPackage.java?rev=1621353&r1=1620668&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestPackage.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestPackage.java Fri Aug 29 17:59:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.xmloutput;
+package com.hp.hpl.jena.rdfxml.xmloutput;
// Imports
///////////////
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestWriterFeatures.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestWriterFeatures.java?rev=1621353&r1=1620668&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestWriterFeatures.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestWriterFeatures.java Fri Aug 29 17:59:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.xmloutput;
+package com.hp.hpl.jena.rdfxml.xmloutput;
import java.io.IOException;
import java.io.StringReader;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestWriterInterface.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestWriterInterface.java?rev=1621353&r1=1620668&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestWriterInterface.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestWriterInterface.java Fri Aug 29 17:59:54 2014
@@ -16,18 +16,17 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.xmloutput;
+package com.hp.hpl.jena.rdfxml.xmloutput;
import java.io.ByteArrayOutputStream ;
import java.io.StringWriter ;
-import com.hp.hpl.jena.Jena ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.impl.NTripleWriter ;
import com.hp.hpl.jena.rdf.model.test.ModelTestBase ;
+import com.hp.hpl.jena.rdfxml.xmloutput.impl.Abbreviated ;
+import com.hp.hpl.jena.rdfxml.xmloutput.impl.Basic ;
import com.hp.hpl.jena.shared.NoWriterForLangException ;
-import com.hp.hpl.jena.xmloutput.impl.Abbreviated ;
-import com.hp.hpl.jena.xmloutput.impl.Basic ;
public class TestWriterInterface extends ModelTestBase {
private String lang;
@@ -85,7 +84,7 @@ public class TestWriterInterface extends
public void testAnotherWriter() {
Model m1 = createMemModel();
- m1.setWriterClassName("foobar", Jena.PATH + ".xmloutput.impl.Basic");
+ m1.setWriterClassName("foobar", com.hp.hpl.jena.rdfxml.xmloutput.impl.Basic.class.getName());
assertTrue(
"Failed to access set writer",
(m1.getWriter("foobar") instanceof Basic));
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestXMLAbbrev.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestXMLAbbrev.java?rev=1621353&r1=1620668&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestXMLAbbrev.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestXMLAbbrev.java Fri Aug 29 17:59:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.xmloutput;
+package com.hp.hpl.jena.rdfxml.xmloutput;
import java.io.IOException;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestXMLFeatures.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestXMLFeatures.java?rev=1621353&r1=1620668&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestXMLFeatures.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/TestXMLFeatures.java Fri Aug 29 17:59:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.xmloutput;
+package com.hp.hpl.jena.rdfxml.xmloutput;
import java.io.*;
import java.util.*;
@@ -25,13 +25,14 @@ import java.util.regex.Pattern;
import com.hp.hpl.jena.graph.*;
import org.apache.jena.iri.*;
+
import com.hp.hpl.jena.rdf.model.*;
import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler;
import com.hp.hpl.jena.rdf.model.impl.Util;
import com.hp.hpl.jena.rdf.model.test.ModelTestBase;
+import com.hp.hpl.jena.rdfxml.xmloutput.impl.* ;
import com.hp.hpl.jena.shared.*;
import com.hp.hpl.jena.vocabulary.RDF;
-import com.hp.hpl.jena.xmloutput.impl.*;
public class TestXMLFeatures extends XMLOutputTestBase {
// static protected Logger logger = LoggerFactory.getLogger( TestXMLFeatures.class );
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/XMLOutputTestBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/XMLOutputTestBase.java?rev=1621353&r1=1620668&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/XMLOutputTestBase.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/XMLOutputTestBase.java Fri Aug 29 17:59:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.xmloutput;
+package com.hp.hpl.jena.rdfxml.xmloutput;
import java.io.*;
import java.util.Properties;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.RDFWriter;
import com.hp.hpl.jena.rdf.model.test.ModelTestBase;
-import com.hp.hpl.jena.xmloutput.impl.BaseXMLWriter;
-import com.hp.hpl.jena.xmloutput.impl.SimpleLogger;
+import com.hp.hpl.jena.rdfxml.xmloutput.impl.BaseXMLWriter ;
+import com.hp.hpl.jena.rdfxml.xmloutput.impl.SimpleLogger ;
public class XMLOutputTestBase extends ModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/testWriterAndReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/testWriterAndReader.java?rev=1621353&r1=1620668&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/testWriterAndReader.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmloutput/testWriterAndReader.java Fri Aug 29 17:59:54 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.xmloutput;
+package com.hp.hpl.jena.rdfxml.xmloutput;
import java.io.* ;
import java.util.Random ;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/test/TestPackage.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/test/TestPackage.java?rev=1621353&r1=1621352&r2=1621353&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/test/TestPackage.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/test/TestPackage.java Fri Aug 29 17:59:54 2014
@@ -46,7 +46,7 @@ public class TestPackage extends TestCas
addTest(ts, "Model", com.hp.hpl.jena.rdf.model.test.TestPackage.suite());
addTest(ts, "N3", com.hp.hpl.jena.n3.N3TestSuite.suite());
addTest(ts, "Turtle", com.hp.hpl.jena.n3.turtle.TurtleTestSuite.suite()) ;
- addTest(ts, "XML Output", com.hp.hpl.jena.xmloutput.TestPackage.suite());
+ addTest(ts, "XML Output", com.hp.hpl.jena.rdfxml.xmloutput.TestPackage.suite());
addTest(ts, "Util", com.hp.hpl.jena.util.TestPackage.suite());
addTest(ts, "Jena iterator", com.hp.hpl.jena.util.iterator.test.TestPackage.suite() );
addTest(ts, "Assembler", TestAssemblerPackage.suite() );