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 [2/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...
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/LookingForRDF.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/LookingForRDF.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/LookingForRDF.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/LookingForRDF.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.AbsXMLContext;
-import com.hp.hpl.jena.rdf.arp.impl.AttributeLexer;
-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.AttributeLexer ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.XMLHandler ;
public class LookingForRDF extends Frame {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/OuterXMLLiteral.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/OuterXMLLiteral.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/OuterXMLLiteral.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/OuterXMLLiteral.java Fri Aug 29 18:23:54 2014
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.states;
+package com.hp.hpl.jena.rdfxml.xmlinput.states;
import org.xml.sax.SAXParseException;
-import com.hp.hpl.jena.rdf.arp.impl.ARPString;
-import com.hp.hpl.jena.rdf.arp.impl.AbsXMLContext;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.ARPString ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.AbsXMLContext ;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/RDFCollection.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/RDFCollection.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/RDFCollection.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/RDFCollection.java Fri Aug 29 18:23:54 2014
@@ -16,10 +16,10 @@
* 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.rdf.arp.impl.AbsXMLContext;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.ANode ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.AbsXMLContext ;
public class RDFCollection extends Collection {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/StartStateRDForDescription.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/StartStateRDForDescription.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/StartStateRDForDescription.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/StartStateRDForDescription.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 class StartStateRDForDescription extends WantTopLevelDescription {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantDescription.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantDescription.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantDescription.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantDescription.java Fri Aug 29 18:23:54 2014
@@ -16,18 +16,12 @@
* 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.rdf.arp.impl.AttributeLexer;
-import com.hp.hpl.jena.rdf.arp.impl.ElementLexer;
-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.impl.* ;
abstract public class WantDescription extends Frame implements HasSubjectFrameI {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantEmpty.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantEmpty.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantEmpty.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantEmpty.java Fri Aug 29 18:23:54 2014
@@ -16,12 +16,12 @@
* 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.rdfxml.xmlinput.impl.AbsXMLContext ;
public class WantEmpty extends Frame {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantLiteralValueOrDescription.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantLiteralValueOrDescription.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantLiteralValueOrDescription.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantLiteralValueOrDescription.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.ARPString;
-import com.hp.hpl.jena.rdf.arp.impl.AbsXMLContext;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.ARPString ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.AbsXMLContext ;
public class WantLiteralValueOrDescription extends AbsWantLiteralValueOrDescription {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantPropertyElement.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantPropertyElement.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantPropertyElement.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantPropertyElement.java Fri Aug 29 18:23:54 2014
@@ -16,21 +16,14 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.states;
+package com.hp.hpl.jena.rdfxml.xmlinput.states;
import java.util.ArrayList;
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.AResourceInternal;
-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.TaintImpl;
-import com.hp.hpl.jena.rdf.arp.impl.URIReference;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.* ;
public class WantPropertyElement extends Frame implements WantsObjectFrameI,
HasSubjectFrameI {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantTopLevelDescription.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantTopLevelDescription.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantTopLevelDescription.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantTopLevelDescription.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.SAXParseException;
-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.XMLHandler;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.AbsXMLContext ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.AttributeLexer ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.XMLHandler ;
public class WantTopLevelDescription extends WantDescription {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantTypedLiteral.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantTypedLiteral.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantTypedLiteral.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantTypedLiteral.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.ARPDatatypeLiteral;
-import com.hp.hpl.jena.rdf.arp.impl.AbsXMLContext;
-import com.hp.hpl.jena.rdf.arp.impl.URIReference;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.ARPDatatypeLiteral ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.AbsXMLContext ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.URIReference ;
public class WantTypedLiteral extends AbsWantLiteralValueOrDescription implements FrameI {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantsObjectFrameI.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantsObjectFrameI.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantsObjectFrameI.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantsObjectFrameI.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;
public interface WantsObjectFrameI extends WantsObjectI, FrameI {
}
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantsObjectI.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantsObjectI.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantsObjectI.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/states/WantsObjectI.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 ;
interface WantsObjectI {
void theObject(ANode a);
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=1621354&r1=1621353&r2=1621354&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 18:23:54 2014
@@ -22,7 +22,7 @@ import static jena.cmdline.CmdLineUtils.
import java.lang.reflect.Constructor ;
-import com.hp.hpl.jena.rdf.arp.NTriple ;
+import com.hp.hpl.jena.rdfxml.xmlinput.NTriple ;
import com.hp.hpl.jena.shared.Command ;
/** A command line interface into ARP.
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java?rev=1621354&r1=1621353&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java Fri Aug 29 18:23:54 2014
@@ -61,9 +61,9 @@ public class TestReaders extends Abstrac
}
try {
- model.setReaderClassName("foobar", com.hp.hpl.jena.rdf.arp.JenaReader.class.getName()) ;
+ model.setReaderClassName("foobar", com.hp.hpl.jena.rdfxml.xmlinput.JenaReader.class.getName()) ;
final RDFReader reader = model.getReader("foobar") ;
- Assert.assertTrue("Wrong reader type", reader instanceof com.hp.hpl.jena.rdf.arp.JenaReader) ;
+ Assert.assertTrue("Wrong reader type", reader instanceof com.hp.hpl.jena.rdfxml.xmlinput.JenaReader) ;
}
finally {
// unset the reader
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPTests.java (from r1620668, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/ARPTests.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPTests.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPTests.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/ARPTests.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/ARPTests.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/ARPTests.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.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
@@ -99,7 +99,7 @@ public class ARPTests extends java.lang.
}
static public void main(String args[]) throws IOException {
Test ts = suite();
- PrintWriter pw = new PrintWriter(new FileWriter("src/com/hp/hpl/jena/rdf/arp/test/TestPackage.java"));
+ PrintWriter pw = new PrintWriter(new FileWriter("src/java/test/com/hp/hpl/jena/rdfxml/xmlinput/test/TestPackage.java"));
pw.println("/*") ;
pw.println(" * Licensed to the Apache Software Foundation (ASF) under one") ;
pw.println(" * or more contributor license agreements. See the NOTICE file") ;
@@ -118,10 +118,10 @@ public class ARPTests extends java.lang.
pw.println(" * limitations under the License.") ;
pw.println(" */") ;
pw.println() ;
- pw.println("package com.hp.hpl.jena.rdf.arp.test;");
+ pw.println("package com.hp.hpl.jena.rdfxml.xmlinput.test;");
pw.println("import junit.framework.TestSuite;");
pw.println("import junit.framework.Test;");
- pw.println("import com.hp.hpl.jena.shared.wg.*;");
+ pw.println("import com.hp.hpl.jena.shared.wg.*;");
pw.println("public class TestPackage{");
pw.println("static public Test suite() {");
String tsname = toJava(ts, pw, "xx");
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/DOM2RDFTest.java (from r1621353, 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/rdfxml/xmlinput/DOM2RDFTest.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/DOM2RDFTest.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/DOM2RDFTest.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/DOM2RDFTest.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.IOException;
import java.io.InputStream;
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
import org.xml.sax.SAXException;
import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.arp.DOM2Model ;
+import com.hp.hpl.jena.rdfxml.xmlinput.DOM2Model ;
import com.hp.hpl.jena.shared.JenaException;
class DOM2RDFTest extends SAX2RDFTest {
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/ExceptionTests.java (from r1621353, 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/rdfxml/xmlinput/ExceptionTests.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/ExceptionTests.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/ExceptionTests.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/ExceptionTests.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 junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -26,7 +26,7 @@ import com.hp.hpl.jena.rdf.model.ModelFa
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.rdfxml.xmlinput.ARPErrorNumbers ;
import com.hp.hpl.jena.shared.JenaException;
public class ExceptionTests
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/InFactoryX.java (from r1620668, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/InFactoryX.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/InFactoryX.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/InFactoryX.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/InFactoryX.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/InFactoryX.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/InFactoryX.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.IOException;
import java.io.InputStream;
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/MemoryLeakTest.java (from r1621353, 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/rdfxml/xmlinput/MemoryLeakTest.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/MemoryLeakTest.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MemoryLeakTest.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/MemoryLeakTest.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.IOException;
import java.io.OutputStream;
@@ -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.rdfxml.xmlinput.NTriple ;
public class MemoryLeakTest extends TestCase {
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/MoreDOM2RDFTest.java (from r1621353, 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/rdfxml/xmlinput/MoreDOM2RDFTest.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/MoreDOM2RDFTest.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreDOM2RDFTest.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/MoreDOM2RDFTest.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.FileInputStream;
import java.io.IOException;
@@ -30,10 +30,10 @@ 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.rdfxml.xmlinput.ALiteral ;
+import com.hp.hpl.jena.rdfxml.xmlinput.AResource ;
+import com.hp.hpl.jena.rdfxml.xmlinput.DOM2Model ;
+import com.hp.hpl.jena.rdfxml.xmlinput.StatementHandler ;
public class MoreDOM2RDFTest extends TestCase implements StatementHandler {
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/MoreTests.java (from r1621353, 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/rdfxml/xmlinput/MoreTests.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/MoreTests.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/MoreTests.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.* ;
import java.nio.charset.Charset ;
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/NTripleTestSuite.java (from r1621353, 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/rdfxml/xmlinput/NTripleTestSuite.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/NTripleTestSuite.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/NTripleTestSuite.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.* ;
import java.util.HashSet ;
import java.util.Set ;
@@ -29,12 +29,12 @@ import org.xml.sax.SAXParseException ;
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.rdfxml.xmlinput.ALiteral ;
+import com.hp.hpl.jena.rdfxml.xmlinput.ARPEventHandler ;
+import com.hp.hpl.jena.rdfxml.xmlinput.AResource ;
+import com.hp.hpl.jena.rdfxml.xmlinput.NTriple ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.ARPResource ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.ARPSaxErrorHandler ;
import com.hp.hpl.jena.shared.wg.TestInputStreamFactory ;
/**
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/Performance.java (from r1621353, 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/rdfxml/xmlinput/Performance.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/Performance.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/Performance.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/Performance.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.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -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.rdfxml.xmlinput.NTriple ;
class Performance {
static String allFiles[][] =
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/SAX2RDFMoreTests.java (from r1621353, 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/rdfxml/xmlinput/SAX2RDFMoreTests.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/SAX2RDFMoreTests.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFMoreTests.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/SAX2RDFMoreTests.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.FileInputStream;
import java.io.InputStream;
@@ -28,12 +28,12 @@ import org.xml.sax.InputSource;
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
-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 ;
+import com.hp.hpl.jena.rdfxml.xmlinput.SAX2Model ;
+import com.hp.hpl.jena.rdfxml.xmlinput.SAX2RDF ;
+import com.hp.hpl.jena.rdfxml.xmlinput.SAX2RDFTest.RDFEHArray ;
public class SAX2RDFMoreTests extends TestCase {
public SAX2RDFMoreTests(String nm) {
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/SAX2RDFTest.java (from r1621353, 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/rdfxml/xmlinput/SAX2RDFTest.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/SAX2RDFTest.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFTest.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/SAX2RDFTest.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.FileInputStream;
import java.io.IOException;
@@ -38,8 +38,8 @@ 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 ;
+import com.hp.hpl.jena.rdfxml.xmlinput.SAX2Model ;
+import com.hp.hpl.jena.rdfxml.xmlinput.SAX2RDF ;
public class SAX2RDFTest extends TestCase {
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/StAX2ModelTest.java (from r1621353, 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/rdfxml/xmlinput/StAX2ModelTest.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/StAX2ModelTest.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/StAX2ModelTest.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/StAX2ModelTest.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.FileInputStream;
import java.io.InputStream;
@@ -31,7 +31,7 @@ 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 com.hp.hpl.jena.rdfxml.xmlinput.StAX2Model ;
import javax.xml.stream.XMLInputFactory;
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TaintingTests.java (from r1621353, 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/rdfxml/xmlinput/TaintingTests.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TaintingTests.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TaintingTests.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/TaintingTests.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.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -34,9 +34,9 @@ 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.arp.ARPErrorNumbers ;
-import com.hp.hpl.jena.rdf.arp.NTriple ;
-import com.hp.hpl.jena.rdf.arp.ParseException ;
+import com.hp.hpl.jena.rdfxml.xmlinput.ARPErrorNumbers ;
+import com.hp.hpl.jena.rdfxml.xmlinput.NTriple ;
+import com.hp.hpl.jena.rdfxml.xmlinput.ParseException ;
public class TaintingTests extends TestCase implements ErrorHandler,
ARPErrorNumbers {
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestARPMain.java (from r1620668, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestARPMain.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestARPMain.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestARPMain.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestARPMain.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestARPMain.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestARPMain.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 junit.framework.Test ;
import junit.framework.TestSuite ;
@@ -30,7 +30,7 @@ public class TestARPMain
{
TestSuite test0 = new TestSuite("ARP") ;
WGTestSuite test1 =
- new com.hp.hpl.jena.rdf.arp.WGTestSuite(
+ new com.hp.hpl.jena.rdfxml.xmlinput.WGTestSuite(
new TestInputStreamFactory(
IRIFactory
.iriImplementation()
@@ -1296,7 +1296,7 @@ public class TestARPMain
// test173.addTest(test174);
// test1.addTest(test173);
test0.addTest(test1) ;
- WGTestSuite test175 = new com.hp.hpl.jena.rdf.arp.WGTestSuite(
+ WGTestSuite test175 = new com.hp.hpl.jena.rdfxml.xmlinput.WGTestSuite(
new TestInputStreamFactory(IRIFactory.iriImplementation().create("http://jcarroll.hpl.hp.com/arp-tests/"),
"arp"),
"ARP Tests", false) ;
@@ -1483,7 +1483,7 @@ public class TestARPMain
test176.addTest(test210) ;
test175.addTest(test176) ;
test0.addTest(test175) ;
- WGTestSuite test211 = new com.hp.hpl.jena.rdf.arp.NTripleTestSuite(
+ WGTestSuite test211 = new com.hp.hpl.jena.rdfxml.xmlinput.NTripleTestSuite(
new TestInputStreamFactory(
IRIFactory
.iriImplementation()
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestErrorMsg.java (from r1621353, 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/rdfxml/xmlinput/TestErrorMsg.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestErrorMsg.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestErrorMsg.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/TestErrorMsg.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.FileInputStream;
import java.io.IOException;
@@ -30,7 +30,7 @@ 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.rdfxml.xmlinput.ARP ;
public class TestErrorMsg extends TestCase {
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestPackage.java (from r1620668, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestPackage.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestPackage.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestPackage.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestPackage.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestPackage.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestPackage.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 junit.framework.TestSuite;
@@ -32,13 +32,13 @@ public class TestPackage extends TestSui
private TestPackage()
{
super("ARP") ;
- addTest( com.hp.hpl.jena.rdf.arp.TestARPMain.suite());
- addTest( com.hp.hpl.jena.rdf.arp.MoreTests.suite());
- addTest( com.hp.hpl.jena.rdf.arp.states.TestARPStates.suite());
- addTest( com.hp.hpl.jena.rdf.arp.URITests.suite());
- addTest( com.hp.hpl.jena.rdf.arp.TaintingTests.suite());
- addTest( com.hp.hpl.jena.rdf.arp.SAX2RDFTest.suite());
- addTest( com.hp.hpl.jena.rdf.arp.StAX2ModelTest.suite());
+ addTest( com.hp.hpl.jena.rdfxml.xmlinput.TestARPMain.suite());
+ addTest( com.hp.hpl.jena.rdfxml.xmlinput.MoreTests.suite());
+ addTest( com.hp.hpl.jena.rdfxml.xmlinput.states.TestARPStates.suite());
+ addTest( com.hp.hpl.jena.rdfxml.xmlinput.URITests.suite());
+ addTest( com.hp.hpl.jena.rdfxml.xmlinput.TaintingTests.suite());
+ addTest( com.hp.hpl.jena.rdfxml.xmlinput.SAX2RDFTest.suite());
+ addTest( com.hp.hpl.jena.rdfxml.xmlinput.StAX2ModelTest.suite());
}
private void addTest(String name, TestSuite tc) {
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestPropEltErrorMsg.java (from r1621353, 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/rdfxml/xmlinput/TestPropEltErrorMsg.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestPropEltErrorMsg.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestPropEltErrorMsg.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/TestPropEltErrorMsg.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.ArrayList;
@@ -28,7 +28,7 @@ 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.rdfxml.xmlinput.impl.XMLHandler ;
import com.hp.hpl.jena.vocabulary.RDF;
public class TestPropEltErrorMsg extends TestCase {
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestScope.java (from r1620668, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestScope.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestScope.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestScope.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestScope.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestScope.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/TestScope.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.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/URITests.java (from r1620668, jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/URITests.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/URITests.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/URITests.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/URITests.java&r1=1620668&r2=1621354&rev=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/URITests.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/URITests.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.*;
import junit.framework.Test;
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/WGTestSuite.java (from r1621353, 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/rdfxml/xmlinput/WGTestSuite.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/WGTestSuite.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/WGTestSuite.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/WGTestSuite.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.FileOutputStream;
import java.io.IOException;
@@ -47,9 +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.rdfxml.xmlinput.ARPErrorNumbers ;
+import com.hp.hpl.jena.rdfxml.xmlinput.JenaReader ;
+import com.hp.hpl.jena.rdfxml.xmlinput.ParseException ;
import com.hp.hpl.jena.reasoner.rulesys.RDFSRuleReasonerFactory;
import com.hp.hpl.jena.reasoner.test.WGReasonerTester;
import com.hp.hpl.jena.shared.BrokenException;
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/AttrEvent.java (from r1621353, 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/rdfxml/xmlinput/states/AttrEvent.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/AttrEvent.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/AttrEvent.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/states/AttrEvent.java Fri Aug 29 18:23:54 2014
@@ -16,11 +16,12 @@
* 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 com.hp.hpl.jena.rdf.arp.impl.Names ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.Names ;
+import com.hp.hpl.jena.rdfxml.xmlinput.states.FrameI ;
class AttrEvent extends Event {
final QName q;
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/ElementEvent.java (from r1621353, 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/rdfxml/xmlinput/states/ElementEvent.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/ElementEvent.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/ElementEvent.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/states/ElementEvent.java Fri Aug 29 18:23:54 2014
@@ -16,7 +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.rdfxml.xmlinput.states.FrameI ;
import org.xml.sax.Attributes ;
import org.xml.sax.SAXParseException ;
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/Event.java (from r1621353, 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/rdfxml/xmlinput/states/Event.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/Event.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/Event.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/states/Event.java Fri Aug 29 18:23:54 2014
@@ -16,11 +16,11 @@
* 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.states.FrameI ;
+import com.hp.hpl.jena.rdfxml.xmlinput.states.FrameI ;
abstract class Event {
// TODO: not for 2.3. get rid of short names all together, not good idea.
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/EventList.java (from r1621353, 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/rdfxml/xmlinput/states/EventList.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/EventList.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/EventList.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/states/EventList.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.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.rdfxml.xmlinput.impl.TaintImpl ;
+import com.hp.hpl.jena.rdfxml.xmlinput.states.FrameI ;
class EventList implements Attributes, Cloneable {
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/EventRecord.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/EventRecord.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/EventRecord.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/EventRecord.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;
class EventRecord {
String startEvents[];
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/FullEventRecord.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/FullEventRecord.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/FullEventRecord.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/FullEventRecord.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;
class FullEventRecord extends EventRecord {
String state;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/InternalEvent.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/InternalEvent.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/InternalEvent.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/InternalEvent.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;
abstract class InternalEvent extends Event {
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/QName.java (from r1621353, 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/rdfxml/xmlinput/states/QName.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/QName.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/QName.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/states/QName.java Fri Aug 29 18:23:54 2014
@@ -16,8 +16,8 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.states;
-import com.hp.hpl.jena.rdf.arp.impl.Names ;
+package com.hp.hpl.jena.rdfxml.xmlinput.states;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.Names ;
class QName implements Names {
final String uri;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/TestARPStates.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/TestARPStates.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/TestARPStates.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/TestARPStates.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.io.FileReader;
import java.io.IOException;
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/TestData.java (from r1621353, 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/rdfxml/xmlinput/states/TestData.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/TestData.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestData.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/states/TestData.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.io.FileWriter ;
import java.io.IOException ;
@@ -26,8 +26,8 @@ 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.* ;
+import com.hp.hpl.jena.rdfxml.xmlinput.ARPErrorNumbers ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.* ;
/**
* For each state s, for each element-attribute event e1, - test s, e1 - if s,
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/TestEventList.java (from r1621353, 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/rdfxml/xmlinput/states/TestEventList.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/TestEventList.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestEventList.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/states/TestEventList.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.states.FrameI ;
+import com.hp.hpl.jena.rdfxml.xmlinput.states.FrameI ;
import junit.framework.Test;
import junit.framework.TestCase;
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/TestFrame.java (from r1621353, 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/rdfxml/xmlinput/states/TestFrame.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/TestFrame.java&p1=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestFrame.java&r1=1621353&r2=1621354&rev=1621354&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/rdfxml/xmlinput/states/TestFrame.java Fri Aug 29 18:23:54 2014
@@ -16,14 +16,17 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.states;
+package com.hp.hpl.jena.rdfxml.xmlinput.states;
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.rdfxml.xmlinput.impl.ANode ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.AbsXMLContext ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.XMLHandler ;
+import com.hp.hpl.jena.rdfxml.xmlinput.states.AbsXMLLiteral ;
+import com.hp.hpl.jena.rdfxml.xmlinput.states.HasSubjectFrameI ;
+import com.hp.hpl.jena.rdfxml.xmlinput.states.WantsObjectFrameI ;
class TestFrame extends AbsXMLLiteral implements WantsObjectFrameI,
HasSubjectFrameI {
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/TestHandler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/TestHandler.java?rev=1621354&r1=1620668&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/TestHandler.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdfxml/xmlinput/states/TestHandler.java Fri Aug 29 18:23:54 2014
@@ -16,16 +16,16 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.arp.states;
+package com.hp.hpl.jena.rdfxml.xmlinput.states;
import java.util.HashMap ;
import org.junit.Assert ;
-import com.hp.hpl.jena.rdf.arp.impl.ANode ;
-import com.hp.hpl.jena.rdf.arp.impl.Taint ;
-import com.hp.hpl.jena.rdf.arp.impl.XMLHandler ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.ANode ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.Taint ;
+import com.hp.hpl.jena.rdfxml.xmlinput.impl.XMLHandler ;
class TestHandler extends XMLHandler {
public void wrong(String msg) {
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=1621354&r1=1621353&r2=1621354&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 18:23:54 2014
@@ -27,13 +27,12 @@ import java.io.OutputStreamWriter;
import java.io.Writer;
import junit.framework.TestSuite;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.hp.hpl.jena.rdf.arp.MoreTests;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.test.ModelTestBase;
+import com.hp.hpl.jena.rdfxml.xmlinput.MoreTests ;
public class TestMacEncodings extends ModelTestBase
{
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/WGReasonerTester.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/WGReasonerTester.java?rev=1621354&r1=1621353&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/WGReasonerTester.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/WGReasonerTester.java Fri Aug 29 18:23:54 2014
@@ -33,10 +33,10 @@ import org.slf4j.LoggerFactory ;
import com.hp.hpl.jena.graph.Factory ;
import com.hp.hpl.jena.graph.Graph ;
-import com.hp.hpl.jena.rdf.arp.ARPTests ;
import com.hp.hpl.jena.rdf.model.* ;
import com.hp.hpl.jena.rdf.model.impl.PropertyImpl ;
import com.hp.hpl.jena.rdf.model.impl.ResourceImpl ;
+import com.hp.hpl.jena.rdfxml.xmlinput.ARPTests ;
import com.hp.hpl.jena.reasoner.InfGraph ;
import com.hp.hpl.jena.reasoner.Reasoner ;
import com.hp.hpl.jena.reasoner.ReasonerFactory ;
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=1621354&r1=1621353&r2=1621354&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 18:23:54 2014
@@ -50,7 +50,7 @@ public class TestPackage extends TestCas
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() );
- addTest(ts, "ARP", com.hp.hpl.jena.rdf.arp.TestPackage.suite());
+ addTest(ts, "ARP", com.hp.hpl.jena.rdfxml.xmlinput.TestPackage.suite());
addTest(ts, "Vocabularies", com.hp.hpl.jena.vocabulary.test.TestVocabularies.suite() );
addTest(ts, "Shared", com.hp.hpl.jena.shared.TestSharedPackage.suite() );
addTest(ts, "Reasoners", com.hp.hpl.jena.reasoner.test.TestPackage.suite());
Modified: jena/trunk/jena-core/src/test/java/jena/test/rdfparse.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/jena/test/rdfparse.java?rev=1621354&r1=1621353&r2=1621354&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/jena/test/rdfparse.java (original)
+++ jena/trunk/jena-core/src/test/java/jena/test/rdfparse.java Fri Aug 29 18:23:54 2014
@@ -20,7 +20,7 @@ package jena.test;
//import junit.swingui.TestRunner;
-import com.hp.hpl.jena.rdf.arp.ARPTests;
+import com.hp.hpl.jena.rdfxml.xmlinput.ARPTests ;
import com.hp.hpl.jena.shared.Command;
public class rdfparse implements Command