openjena -> apache.jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0ec61c85 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0ec61c85 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0ec61c85 Branch: refs/heads/add-contract-tests Commit: 0ec61c8579af4c8cbfae8df85fc534d80fb4c9b0 Parents: a55e147 Author: Andy Seaborne <[email protected]> Authored: Thu May 7 10:42:27 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Thu May 7 10:42:27 2015 +0100 ---------------------------------------------------------------------- .../org/apache/jena/atlas/data/ThresholdPolicyCount.java | 10 ---------- .../org/apache/jena/atlas/data/ThresholdPolicyMemory.java | 5 ----- .../main/java/org/apache/jena/riot/lang/LangRDFJSON.java | 2 +- jena-arq/src/test/resources/log4j-testing.properties | 4 +--- jena-arq/src/test/resources/log4j.properties | 3 +-- .../src/main/java/org/apache/jena/atlas/lib/Cache.java | 2 +- .../main/java/org/apache/jena/atlas/logging/LogCtl.java | 3 +-- jena-core/testing/reasoners/bugs/layeredValidation.owl | 2 +- jena-csv/src/test/resources/log4j.properties | 3 +-- .../src/test/resources/log4j.properties | 3 +-- .../src/main/java/org/apache/jena/fuseki/FusekiCmd.java | 1 - .../main/java/org/apache/jena/fuseki/FusekiLogging.java | 1 - jena-maven-tools/README | 2 +- jena-maven-tools/src/it/schemagen-integration-0/pom.xml | 4 ++-- jena-maven-tools/src/it/schemagen-integration-1/pom.xml | 2 +- jena-maven-tools/src/it/schemagen-integration-2/pom.xml | 2 +- jena-maven-tools/src/it/schemagen-integration-3/pom.xml | 2 +- jena-spatial/src/test/resources/geoarq-query-1.rq | 2 +- .../org/apache/jena/tdb/store/bulkloader/BulkLoader.java | 6 +----- .../java/org/apache/jena/tdb/extra/T_TxnDeadlockTest.java | 8 ++++---- 20 files changed, 20 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyCount.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyCount.java b/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyCount.java index 640bdd2..1612098 100644 --- a/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyCount.java +++ b/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyCount.java @@ -36,28 +36,18 @@ public class ThresholdPolicyCount<T> implements ThresholdPolicy<T> reset(); } - /* (non-Javadoc) - * @see org.openjena.atlas.io.ThresholdPolicy#increment(java.lang.Object) - */ @Override public void increment(T item) { count++; } - /* (non-Javadoc) - * @see org.openjena.atlas.io.ThresholdPolicy#isThresholdExceeded() - */ @Override public boolean isThresholdExceeded() { return (count >= threshold); } - /* - * (non-Javadoc) - * @see org.openjena.atlas.data.ThresholdPolicy#reset() - */ @Override public void reset() { http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyMemory.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyMemory.java b/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyMemory.java index 15af2c4..00ea7b8 100644 --- a/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyMemory.java +++ b/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyMemory.java @@ -61,11 +61,6 @@ public class ThresholdPolicyMemory<T> implements ThresholdPolicy<T> { return (size >= threshold) ; } - /* - * (non-Javadoc) - * - * @see org.openjena.atlas.data.ThresholdPolicy#reset() - */ @Override public void reset() { count = 0 ; http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFJSON.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFJSON.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFJSON.java index d529763..d495e07 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFJSON.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFJSON.java @@ -43,7 +43,7 @@ public class LangRDFJSON extends LangBase super(tokenizer, profile, dest) ; if (!(tokenizer instanceof TokenizerJSON)) { - throw new IllegalArgumentException("Tokenizer for the RDF/JSON parser must be an instance of org.openjena.atlas.json.io.parser.TokenizerJSON") ; + throw new IllegalArgumentException("Tokenizer for the RDF/JSON parser must be an instance of "+TokenizerJSON.class.getName()) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-arq/src/test/resources/log4j-testing.properties ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/resources/log4j-testing.properties b/jena-arq/src/test/resources/log4j-testing.properties index 17c9cc6..8ff6f73 100644 --- a/jena-arq/src/test/resources/log4j-testing.properties +++ b/jena-arq/src/test/resources/log4j-testing.properties @@ -10,9 +10,7 @@ log4j.logger.com.hp.hpl.jena.arq.info=INFO log4j.logger.com.hp.hpl.jena.arq.exec=INFO # Everything else in Jena -log4j.logger.com.hp.hpl.jena=WARN -log4j.logger.org.openjena=WARN -log4j.logger.org.openjena.riot=INFO +log4j.logger.org.apache.jena.riot=INFO # Apache Commons HTTP # May be useful to switch to DEBUG if aiming to debug any HTTP communication issues http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-arq/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/resources/log4j.properties b/jena-arq/src/test/resources/log4j.properties index 247e450..5cedb50 100644 --- a/jena-arq/src/test/resources/log4j.properties +++ b/jena-arq/src/test/resources/log4j.properties @@ -11,8 +11,7 @@ log4j.logger.org.apache.jena.arq.exec=INFO # Everything else in Jena log4j.logger.org.apache.jena=WARN -log4j.logger.org.openjena=WARN -log4j.logger.org.openjena.riot=INFO +log4j.logger.org.apache.jena.riot=INFO # Apache Commons HTTP # May be useful to turn up to DEBUG if debugging HTTP communication issues http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-base/src/main/java/org/apache/jena/atlas/lib/Cache.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/Cache.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/Cache.java index 8ebf2d7..69d6544 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/lib/Cache.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/Cache.java @@ -33,7 +33,7 @@ public interface Cache<Key, Value> public Value getIfPresent(Key key) ; /** Get from cache, of not present, call the {@code callable} - * to try to fill the cache. + * to try to fill the cache. This operation should be atomic. */ public Value getOrFill(Key key, Callable<Value> callable) ; http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java b/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java index ad1adce..9e067bc 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java @@ -179,7 +179,6 @@ public class LogCtl { , "## Everything", "log4j.rootLogger=INFO, jena.plainlevel", "log4j.logger.com.hp.hpl.jena=WARN", - "log4j.logger.org.openjena=WARN", "log4j.logger.org.apache.jena=WARN", "log4j.logger.org.apache.jena.tdb.loader=INFO" @@ -195,7 +194,7 @@ public class LogCtl { // "handlers=java.util.logging.ConsoleHandler,org.apache.jena.atlas.logging.java.ConsoleHandlerStdout", // Atlas. - "handlers=org.openjena.atlas.logging.java.ConsoleHandlerStdout", + "handlers=org.apache.jena.atlas.logging.java.ConsoleHandlerStdout", "org.apache.atlas.jena.logging.java.ConsoleHandlerStdout.level=INFO", "java.util.logging.ConsoleHandler.formatter=atlas.logging.java.TextFormatter" ) ; http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-core/testing/reasoners/bugs/layeredValidation.owl ---------------------------------------------------------------------- diff --git a/jena-core/testing/reasoners/bugs/layeredValidation.owl b/jena-core/testing/reasoners/bugs/layeredValidation.owl index a177cf7..8c7964b 100644 --- a/jena-core/testing/reasoners/bugs/layeredValidation.owl +++ b/jena-core/testing/reasoners/bugs/layeredValidation.owl @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE owl [ - <!ENTITY eg "http://www.openjena.org/bugs#"; > + <!ENTITY eg "http://example.jena.apache.org/bugs#"; > <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#"; > <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; > <!ENTITY owl "http://www.w3.org/2002/07/owl#"; > http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-csv/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/jena-csv/src/test/resources/log4j.properties b/jena-csv/src/test/resources/log4j.properties index 247e450..5cedb50 100644 --- a/jena-csv/src/test/resources/log4j.properties +++ b/jena-csv/src/test/resources/log4j.properties @@ -11,8 +11,7 @@ log4j.logger.org.apache.jena.arq.exec=INFO # Everything else in Jena log4j.logger.org.apache.jena=WARN -log4j.logger.org.openjena=WARN -log4j.logger.org.openjena.riot=INFO +log4j.logger.org.apache.jena.riot=INFO # Apache Commons HTTP # May be useful to turn up to DEBUG if debugging HTTP communication issues http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-elephas/jena-elephas-common/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/jena-elephas/jena-elephas-common/src/test/resources/log4j.properties b/jena-elephas/jena-elephas-common/src/test/resources/log4j.properties index 247e450..5cedb50 100644 --- a/jena-elephas/jena-elephas-common/src/test/resources/log4j.properties +++ b/jena-elephas/jena-elephas-common/src/test/resources/log4j.properties @@ -11,8 +11,7 @@ log4j.logger.org.apache.jena.arq.exec=INFO # Everything else in Jena log4j.logger.org.apache.jena=WARN -log4j.logger.org.openjena=WARN -log4j.logger.org.openjena.riot=INFO +log4j.logger.org.apache.jena.riot=INFO # Apache Commons HTTP # May be useful to turn up to DEBUG if debugging HTTP communication issues http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java index 995c5d7..6e79cee 100644 --- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java +++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java @@ -71,7 +71,6 @@ public class FusekiCmd extends CmdARQ , "## Everything" , "log4j.rootLogger=INFO, jena.plain" , "log4j.logger.com.hp.hpl.jena=WARN" - , "log4j.logger.org.openjena=WARN" , "log4j.logger.org.apache.jena=WARN" , "# Server log." http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java index 003b38d..1810f1e 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java @@ -151,7 +151,6 @@ public class FusekiLogging "## Most things", "log4j.rootLogger=INFO, jena.plainstdout", "log4j.logger.com.hp.hpl.jena=WARN", - "log4j.logger.org.openjena=WARN", "log4j.logger.org.apache.jena=WARN", "# Fuseki System logs.", http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-maven-tools/README ---------------------------------------------------------------------- diff --git a/jena-maven-tools/README b/jena-maven-tools/README index ba8bbb6..e7f5f03 100644 --- a/jena-maven-tools/README +++ b/jena-maven-tools/README @@ -15,7 +15,7 @@ Changes Version 0.4 - * Moved source code from org.openjena package tree to org.apache.jena + * Moved source code to org.apache.jena * Removed some obsolete project artefacts (e.g. src/site) * Added license headers to conform to Apache Software Foundation policy, and added a rat:check target to the pom file. http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-maven-tools/src/it/schemagen-integration-0/pom.xml ---------------------------------------------------------------------- diff --git a/jena-maven-tools/src/it/schemagen-integration-0/pom.xml b/jena-maven-tools/src/it/schemagen-integration-0/pom.xml index 97ccf1c..732a38d 100644 --- a/jena-maven-tools/src/it/schemagen-integration-0/pom.xml +++ b/jena-maven-tools/src/it/schemagen-integration-0/pom.xml @@ -1,4 +1,4 @@ -<!-- +f<!-- 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 @@ -18,7 +18,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.openjena.tools</groupId> + <groupId>org.apache.jena.tools</groupId> <artifactId>schemagen-test</artifactId> <version>@project.version@</version> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-maven-tools/src/it/schemagen-integration-1/pom.xml ---------------------------------------------------------------------- diff --git a/jena-maven-tools/src/it/schemagen-integration-1/pom.xml b/jena-maven-tools/src/it/schemagen-integration-1/pom.xml index bc3c94d..858da18 100644 --- a/jena-maven-tools/src/it/schemagen-integration-1/pom.xml +++ b/jena-maven-tools/src/it/schemagen-integration-1/pom.xml @@ -18,7 +18,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.openjena.tools</groupId> + <groupId>org.apache.jena.tools</groupId> <artifactId>schemagen-test</artifactId> <version>@project.version@</version> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-maven-tools/src/it/schemagen-integration-2/pom.xml ---------------------------------------------------------------------- diff --git a/jena-maven-tools/src/it/schemagen-integration-2/pom.xml b/jena-maven-tools/src/it/schemagen-integration-2/pom.xml index 225ce2f..ef4cf8f 100644 --- a/jena-maven-tools/src/it/schemagen-integration-2/pom.xml +++ b/jena-maven-tools/src/it/schemagen-integration-2/pom.xml @@ -18,7 +18,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.openjena.tools</groupId> + <groupId>org.apache.jena.tools</groupId> <artifactId>schemagen-test</artifactId> <version>@project.version@</version> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-maven-tools/src/it/schemagen-integration-3/pom.xml ---------------------------------------------------------------------- diff --git a/jena-maven-tools/src/it/schemagen-integration-3/pom.xml b/jena-maven-tools/src/it/schemagen-integration-3/pom.xml index 890aafd..a746421 100644 --- a/jena-maven-tools/src/it/schemagen-integration-3/pom.xml +++ b/jena-maven-tools/src/it/schemagen-integration-3/pom.xml @@ -18,7 +18,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.openjena.tools</groupId> + <groupId>org.apache.jena.tools</groupId> <artifactId>schemagen-test</artifactId> <version>@project.version@</version> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-spatial/src/test/resources/geoarq-query-1.rq ---------------------------------------------------------------------- diff --git a/jena-spatial/src/test/resources/geoarq-query-1.rq b/jena-spatial/src/test/resources/geoarq-query-1.rq index a189da9..7f7bb64 100644 --- a/jena-spatial/src/test/resources/geoarq-query-1.rq +++ b/jena-spatial/src/test/resources/geoarq-query-1.rq @@ -1,6 +1,6 @@ PREFIX : <http://example/> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> -PREFIX geoarq: <http://openjena.org/GeoARQ/property#> +PREFIX geoarq: <http://jena.apache.org/GeoARQ/property#> SELECT ?airport { ?s geoarq:nearby (51.3000 -2.71000) . http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader/BulkLoader.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader/BulkLoader.java b/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader/BulkLoader.java index 0d162d2..04b4108 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader/BulkLoader.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader/BulkLoader.java @@ -52,11 +52,7 @@ public class BulkLoader { /** Number of ticks per super tick */ public static int superTick = 10 ; - // Events. - // private static String baseNameGeneral = "http://openjena.org/TDB/event#"; - // ; - - private static String baseName = "http://openjena.org/TDB/bulkload/event#"; ; + private static String baseName = "http://jena.apache.org/TDB/bulkload/event#"; ; public static EventType evStartBulkload = new EventType(baseName + "start-bulkload") ; public static EventType evFinishBulkload = new EventType(baseName + "finish-bulkload") ; http://git-wip-us.apache.org/repos/asf/jena/blob/0ec61c85/jena-tdb/src/test/java/org/apache/jena/tdb/extra/T_TxnDeadlockTest.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/extra/T_TxnDeadlockTest.java b/jena-tdb/src/test/java/org/apache/jena/tdb/extra/T_TxnDeadlockTest.java index 269a498..a3f4413 100644 --- a/jena-tdb/src/test/java/org/apache/jena/tdb/extra/T_TxnDeadlockTest.java +++ b/jena-tdb/src/test/java/org/apache/jena/tdb/extra/T_TxnDeadlockTest.java @@ -81,13 +81,13 @@ public class T_TxnDeadlockTest { DatasetGraphTxn txnGraph = storeConnection.begin(ReadWrite.WRITE); txnGraph.add(new Quad( - NodeFactory.createURI("http://openjena.org/"; + NodeFactory.createURI("http://jena-example.org/"; + numberGenerator.nextInt()), - NodeFactory.createURI("http://openjena.org/"; + NodeFactory.createURI("http://jena-example.org/"; + numberGenerator.nextInt()), - NodeFactory.createURI("http://openjena.org/"; + NodeFactory.createURI("http://jena-example.org/"; + numberGenerator.nextInt()), - NodeFactory.createURI("http://openjena.org/"; + NodeFactory.createURI("http://jena-example.org/"; + numberGenerator.nextInt()))); txnGraph.commit(); txnGraph.end();
