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 2012/12/20 17:14:18 UTC
svn commit: r1424561 - in /jena/trunk:
jena-arq/src/main/java/org/apache/jena/riot/process/normalize/
jena-arq/src/main/java/org/apache/jena/riot/web/
jena-arq/src/main/java/org/openjena/riot/
jena-arq/src/test/java/org/apache/jena/riot/ jena-arq/src/t...
Author: andy
Date: Thu Dec 20 16:14:17 2012
New Revision: 1424561
URL: http://svn.apache.org/viewvc?rev=1424561&view=rev
Log:
Put some more things in their proper place.
Added:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/LangTag.java
- copied, changed from r1422814, jena/trunk/jena-arq/src/main/java/org/openjena/riot/LangTag.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/VocabTestRIOT.java
- copied, changed from r1424375, jena/trunk/jena-arq/src/test/java/org/openjena/riot/VocavTestRIOT.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TS_RiotSystem.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestChecker.java
- copied, changed from r1424375, jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestChecker.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestPrefixMap.java
- copied, changed from r1424375, jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestPrefixMap.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TS_RiotWeb.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TestLangTag.java
- copied, changed from r1424375, jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestLangTag.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TestWebContent.java
- copied, changed from r1424375, jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestWebContent.java
Removed:
jena/trunk/jena-arq/src/main/java/org/openjena/riot/LangTag.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotMisc.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestChecker.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot1.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestLangTag.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestPrefixMap.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestWebContent.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/VocavTestRIOT.java
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TS_Process.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/out/TS_Out.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java?rev=1424561&r1=1424560&r2=1424561&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java Thu Dec 20 16:14:17 2012
@@ -21,7 +21,7 @@ package org.apache.jena.riot.process.nor
import java.util.HashMap ;
import java.util.Map ;
-import org.openjena.riot.LangTag ;
+import org.apache.jena.riot.web.LangTag ;
import com.hp.hpl.jena.datatypes.RDFDatatype ;
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/LangTag.java (from r1422814, jena/trunk/jena-arq/src/main/java/org/openjena/riot/LangTag.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/LangTag.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/LangTag.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/riot/LangTag.java&r1=1422814&r2=1424561&rev=1424561&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/LangTag.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/LangTag.java Thu Dec 20 16:14:17 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.riot;
+package org.apache.jena.riot.web;
import java.util.regex.Matcher ;
import java.util.regex.Pattern ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java?rev=1424561&r1=1424560&r2=1424561&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java Thu Dec 20 16:14:17 2012
@@ -22,18 +22,18 @@ import org.apache.jena.riot.adapters.TS_
import org.apache.jena.riot.lang.TS_Lang ;
import org.apache.jena.riot.process.TS_Process ;
import org.apache.jena.riot.stream.TS_IO2 ;
+import org.apache.jena.riot.system.TS_RiotSystem ;
+import org.apache.jena.riot.web.TS_RiotWeb ;
import org.junit.BeforeClass ;
import org.junit.runner.RunWith ;
import org.junit.runners.Suite ;
import org.openjena.riot.RIOT ;
-import org.openjena.riot.TS_Riot1 ;
import org.openjena.riot.out.TS_Out ;
@RunWith(Suite.class)
@Suite.SuiteClasses( {
// Old world - org.openjena.riot
- TS_Riot1.class
- , TS_Out.class
+ TS_Out.class
// New world - org.apache.jena.riot
, TS_Lang.class
@@ -42,8 +42,9 @@ import org.openjena.riot.out.TS_Out ;
, TS_IO2.class
, TS_RIOTAdapters.class
, TS_Process.class
- , TS_ReaderRIOT.class
- , TS_RiotMisc.class
+ //, TS_RiotMisc.class
+ , TS_RiotSystem.class
+ , TS_RiotWeb.class
})
Copied: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/VocabTestRIOT.java (from r1424375, jena/trunk/jena-arq/src/test/java/org/openjena/riot/VocavTestRIOT.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/VocabTestRIOT.java?p2=jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/VocabTestRIOT.java&p1=jena/trunk/jena-arq/src/test/java/org/openjena/riot/VocavTestRIOT.java&r1=1424375&r2=1424561&rev=1424561&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/VocavTestRIOT.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/VocabTestRIOT.java Thu Dec 20 16:14:17 2012
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-package org.openjena.riot;
+package org.apache.jena.riot;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.rdf.model.Property ;
import com.hp.hpl.jena.rdf.model.Resource ;
-public class VocavTestRIOT
+public class VocabTestRIOT
{
public static String assumedBaseURI = "http://example/base/" ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java?rev=1424561&r1=1424560&r2=1424561&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java Thu Dec 20 16:14:17 2012
@@ -45,7 +45,8 @@ public class TestIRI extends BaseTest
public void iri2() { test("example") ; }
@Test(expected=ExWarning.class)
- public void iriErr1() { test("http:") ; }
+ public void iriErr1()
+ { test("http:") ; }
@Test(expected=ExWarning.class)
public void iriErr2() { test("http:///::") ; }
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java?rev=1424561&r1=1424560&r2=1424561&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java Thu Dec 20 16:14:17 2012
@@ -21,8 +21,8 @@ package org.apache.jena.riot.langsuite ;
import junit.framework.Test ;
import junit.framework.TestSuite ;
import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.VocabTestRIOT ;
import org.openjena.riot.RiotException ;
-import org.openjena.riot.VocavTestRIOT ;
import com.hp.hpl.jena.rdf.model.Resource ;
import com.hp.hpl.jena.sparql.junit.EarlReport ;
@@ -68,7 +68,7 @@ public class FactoryTestRiot extends Tes
Resource input = action ;
Resource output = result ;
- String baseIRI = VocavTestRIOT.assumedBaseURI ;
+ String baseIRI = VocabTestRIOT.assumedBaseURI ;
String x = input.getLocalName() ;
// Yuk, yuk, yuk.
baseIRI = baseIRI+x ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TS_Process.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TS_Process.java?rev=1424561&r1=1424560&r2=1424561&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TS_Process.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TS_Process.java Thu Dec 20 16:14:17 2012
@@ -24,7 +24,6 @@ import org.junit.runners.Suite ;
@RunWith(Suite.class)
@Suite.SuiteClasses( {
TestNormalization.class
-
})
public class TS_Process
Added: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TS_RiotSystem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TS_RiotSystem.java?rev=1424561&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TS_RiotSystem.java (added)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TS_RiotSystem.java Thu Dec 20 16:14:17 2012
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.system;
+
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
+import org.junit.runners.Suite.SuiteClasses ;
+
+@RunWith(Suite.class)
+@SuiteClasses({
+ TestChecker.class
+ , TestPrefixMap.class
+})
+
+public class TS_RiotSystem
+{}
Copied: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestChecker.java (from r1424375, jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestChecker.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestChecker.java?p2=jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestChecker.java&p1=jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestChecker.java&r1=1424375&r2=1424561&rev=1424561&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestChecker.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestChecker.java Thu Dec 20 16:14:17 2012
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.jena.riot;
+package org.apache.jena.riot.system;
+import org.apache.jena.riot.ErrorHandlerTestLib ;
import org.apache.jena.riot.ErrorHandlerTestLib.ExError ;
import org.apache.jena.riot.ErrorHandlerTestLib.ExWarning ;
-import org.apache.jena.riot.system.Checker ;
import org.junit.After ;
import org.junit.Before ;
import org.junit.Test ;
Copied: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestPrefixMap.java (from r1424375, jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestPrefixMap.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestPrefixMap.java?p2=jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestPrefixMap.java&p1=jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestPrefixMap.java&r1=1424375&r2=1424561&rev=1424561&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestPrefixMap.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestPrefixMap.java Thu Dec 20 16:14:17 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.riot;
+package org.apache.jena.riot.system;
import org.junit.Test ;
Added: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TS_RiotWeb.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TS_RiotWeb.java?rev=1424561&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TS_RiotWeb.java (added)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TS_RiotWeb.java Thu Dec 20 16:14:17 2012
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.web;
+
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
+import org.junit.runners.Suite.SuiteClasses ;
+
+@RunWith(Suite.class)
+@SuiteClasses({
+ TestLangTag.class
+ , TestWebContent.class
+})
+
+public class TS_RiotWeb
+{
+}
+
Copied: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TestLangTag.java (from r1424375, jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestLangTag.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TestLangTag.java?p2=jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TestLangTag.java&p1=jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestLangTag.java&r1=1424375&r2=1424561&rev=1424561&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestLangTag.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TestLangTag.java Thu Dec 20 16:14:17 2012
@@ -16,9 +16,10 @@
* limitations under the License.
*/
-package org.openjena.riot;
+package org.apache.jena.riot.web;
import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.riot.web.LangTag ;
import org.junit.Test ;
public class TestLangTag extends BaseTest
Copied: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TestWebContent.java (from r1424375, jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestWebContent.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TestWebContent.java?p2=jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TestWebContent.java&p1=jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestWebContent.java&r1=1424375&r2=1424561&rev=1424561&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestWebContent.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TestWebContent.java Thu Dec 20 16:14:17 2012
@@ -16,11 +16,12 @@
* limitations under the License.
*/
-package org.openjena.riot;
+package org.apache.jena.riot.web;
import junit.framework.Assert;
import org.junit.Test;
+import org.openjena.riot.WebContent ;
public class TestWebContent {
Modified: jena/trunk/jena-arq/src/test/java/org/openjena/riot/out/TS_Out.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/out/TS_Out.java?rev=1424561&r1=1424560&r2=1424561&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/out/TS_Out.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/out/TS_Out.java Thu Dec 20 16:14:17 2012
@@ -18,33 +18,17 @@
package org.openjena.riot.out;
-import org.apache.jena.riot.lang.* ;
-import org.apache.jena.riot.process.TestNormalization ;
import org.junit.runner.RunWith ;
import org.junit.runners.Suite ;
@RunWith(Suite.class)
@Suite.SuiteClasses( {
- TestIRI.class
- , TestLang.class
- , TestNodeAllocator.class
-
- , TestTurtleTerms.class
- , TestLangNTriples.class
- , TestLangNQuads.class
- , TestLangTurtle.class
- , TestLangTrig.class
- , TestLangRdfJson.class
- , TestParserFactory.class
-
- , TestNodeFmt.class
+ TestNodeFmt.class
, TestNodeFmtLib.class
, TestOutput.class
, TestOutputNTriples.class
, TestOutputRDFJSON.class
- , TestNormalization.class
-
})
public class TS_Out
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java?rev=1424561&r1=1424560&r2=1424561&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java Thu Dec 20 16:14:17 2012
@@ -25,7 +25,7 @@ import org.apache.jena.atlas.lib.StrUtil
import org.apache.jena.riot.tokens.Token ;
import org.apache.jena.riot.tokens.Tokenizer ;
import org.apache.jena.riot.tokens.TokenizerFactory ;
-import org.openjena.riot.LangTag ;
+import org.apache.jena.riot.web.LangTag ;
import org.openjena.riot.RiotException ;
import com.hp.hpl.jena.graph.Node ;