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 2017/10/03 19:34:35 UTC
[49/65] [abbrv] jena git commit: JENA-1397: Old names to Apache Jena
names
JENA-1397: Old names to Apache Jena names
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b6d967bb
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b6d967bb
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b6d967bb
Branch: refs/heads/master
Commit: b6d967bbfaec29a5e65c464870bbe1ba173a8b00
Parents: 3d45665
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Sep 28 17:04:21 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Sep 28 17:04:21 2017 +0100
----------------------------------------------------------------------
jena-db/README.md | 47 +-------------------
jena-db/jena-dboe-base/pom.xml | 2 +-
jena-db/jena-dboe-index-test/pom.xml | 2 +-
jena-db/jena-dboe-index/pom.xml | 2 +-
jena-db/jena-dboe-trans-data/pom.xml | 2 +-
jena-db/jena-dboe-transaction/pom.xml | 2 +-
jena-db/jena-fuseki-tdb2/pom.xml | 4 +-
jena-db/jena-tdb2-cmds/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 12 +++--
jena-db/jena-tdb2-cmds/tdb2 | 2 +-
jena-db/jena-tdb2/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 12 +++--
jena-db/pom.xml | 3 +-
jena-db/use-fuseki-tdb2.md | 4 --
jena-db/use-tdb2-cmds.md | 2 -
jena-db/use-tdb2.md | 11 +----
16 files changed, 24 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b6d967bb/jena-db/README.md
----------------------------------------------------------------------
diff --git a/jena-db/README.md b/jena-db/README.md
index f9c3d43..7837b17 100644
--- a/jena-db/README.md
+++ b/jena-db/README.md
@@ -1,8 +1,6 @@
-[](https://travis-ci.org/afs/mantis)
+# Apache Jena - Database Operating Environment
-# Mantis - Database Operating Environment
-
-Mantis is a set of database-related components. It includes:
+"DBOE" is a set of database-related components. It includes:
* Transaction Coordination
* Copy-on-write data structures
@@ -16,49 +14,8 @@ License: Apache License
See [LICENSE](LICENSE) and [NOTICE](NOTICE) for details.
-Continuous integration: [TravisCI](https://travis-ci.org/afs/mantis)
-
Notes on using [TDB2 in a Java application](use-tdb2.md).
Notes on using [TDB2 from the command line](use-tdb2-cmds.md).
Notes on using [TDB2 with Apache Jena Fuseki](use-fuseki-tdb2.md).
-
-Status: currently snapshot builds only.
-
-It depends on [Apache Jena](https://jena.apache.org/) snapshots.
-
-Maven repositories setup:
-
-```
- <repositories>
- <!-- Apache Snapshot Repository -->
- <repository>
- <id>apache-repository-snapshots</id>
- <url>https://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- </repository>
-
- <!-- Sonatype snapshot repository -->
- <repository>
- <id>sonatype.public</id>
- <name>Sonatype Snapshots Repository</name>
- <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
-
- </repositories>
-```
-
http://git-wip-us.apache.org/repos/asf/jena/blob/b6d967bb/jena-db/jena-dboe-base/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-base/pom.xml b/jena-db/jena-dboe-base/pom.xml
index 7657165..f017b53 100644
--- a/jena-db/jena-dboe-base/pom.xml
+++ b/jena-db/jena-dboe-base/pom.xml
@@ -22,7 +22,7 @@
<artifactId>jena-dboe-base</artifactId>
<packaging>jar</packaging>
- <name>Mantis (${project.artifactId})</name>
+ <name>Apache Jena (${project.artifactId})</name>
<parent>
<groupId>org.apache.jena</groupId>
http://git-wip-us.apache.org/repos/asf/jena/blob/b6d967bb/jena-db/jena-dboe-index-test/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-index-test/pom.xml b/jena-db/jena-dboe-index-test/pom.xml
index e02625e..a076277 100644
--- a/jena-db/jena-dboe-index-test/pom.xml
+++ b/jena-db/jena-dboe-index-test/pom.xml
@@ -22,7 +22,7 @@
<artifactId>jena-dboe-index-test</artifactId>
<packaging>jar</packaging>
- <name>Mantis (${project.artifactId})</name>
+ <name>Apache Jena (${project.artifactId})</name>
<parent>
<groupId>org.apache.jena</groupId>
http://git-wip-us.apache.org/repos/asf/jena/blob/b6d967bb/jena-db/jena-dboe-index/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-index/pom.xml b/jena-db/jena-dboe-index/pom.xml
index f6db194..f3127aa 100644
--- a/jena-db/jena-dboe-index/pom.xml
+++ b/jena-db/jena-dboe-index/pom.xml
@@ -22,7 +22,7 @@
<artifactId>jena-dboe-index</artifactId>
<packaging>jar</packaging>
- <name>Mantis (${project.artifactId})</name>
+ <name>Apache Jena (${project.artifactId})</name>
<parent>
<groupId>org.apache.jena</groupId>
http://git-wip-us.apache.org/repos/asf/jena/blob/b6d967bb/jena-db/jena-dboe-trans-data/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-trans-data/pom.xml b/jena-db/jena-dboe-trans-data/pom.xml
index 1efd68b..044f3a3 100644
--- a/jena-db/jena-dboe-trans-data/pom.xml
+++ b/jena-db/jena-dboe-trans-data/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jena-dboe-trans-data</artifactId>
<packaging>jar</packaging>
- <name>Mantis (${project.artifactId})</name>
+ <name>Apache Jena (${project.artifactId})</name>
<parent>
<groupId>org.apache.jena</groupId>
http://git-wip-us.apache.org/repos/asf/jena/blob/b6d967bb/jena-db/jena-dboe-transaction/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-transaction/pom.xml b/jena-db/jena-dboe-transaction/pom.xml
index 25b2fb8..94591ef 100644
--- a/jena-db/jena-dboe-transaction/pom.xml
+++ b/jena-db/jena-dboe-transaction/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jena-dboe-transaction</artifactId>
<packaging>jar</packaging>
- <name>Mantis (${project.artifactId})</name>
+ <name>Apache Jena (${project.artifactId})</name>
<parent>
<groupId>org.apache.jena</groupId>
http://git-wip-us.apache.org/repos/asf/jena/blob/b6d967bb/jena-db/jena-fuseki-tdb2/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/jena-fuseki-tdb2/pom.xml b/jena-db/jena-fuseki-tdb2/pom.xml
index 48cddb7..c974b5d 100644
--- a/jena-db/jena-fuseki-tdb2/pom.xml
+++ b/jena-db/jena-fuseki-tdb2/pom.xml
@@ -20,7 +20,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>
- <name>Mantis (${project.artifactId})</name>
+ <name>Apache Jena (${project.artifactId})</name>
<artifactId>jena-fuseki-tdb2-server</artifactId>
<parent>
@@ -30,7 +30,7 @@
</parent>
<packaging>jar</packaging>
- <description>Apache Jena Fuseki combined with Mantis/TDB2</description>
+ <description>Apache Jena Fuseki combined with Apache Jena/TDB2</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/jena/blob/b6d967bb/jena-db/jena-tdb2-cmds/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2-cmds/pom.xml b/jena-db/jena-tdb2-cmds/pom.xml
index 4f00d28..0b12fea 100644
--- a/jena-db/jena-tdb2-cmds/pom.xml
+++ b/jena-db/jena-tdb2-cmds/pom.xml
@@ -23,7 +23,7 @@
<artifactId>jena-tdb2-cmds</artifactId>
<packaging>jar</packaging>
- <name>Mantis (${project.artifactId})</name>
+ <name>Apache Jena (${project.artifactId})</name>
<parent>
<groupId>org.apache.jena</groupId>
http://git-wip-us.apache.org/repos/asf/jena/blob/b6d967bb/jena-db/jena-tdb2-cmds/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2-cmds/src/main/resources/META-INF/NOTICE b/jena-db/jena-tdb2-cmds/src/main/resources/META-INF/NOTICE
index 5ba7ec0..0b2d10d 100644
--- a/jena-db/jena-tdb2-cmds/src/main/resources/META-INF/NOTICE
+++ b/jena-db/jena-tdb2-cmds/src/main/resources/META-INF/NOTICE
@@ -1,10 +1,8 @@
-Mantis Database Operating Environment
+Apache Jena - Database Operating Environment
-Copyright 2013-2017 Andy Seaborne
-Copyright 2014, 2015 Epimorphics Ltd.
+Portions of this software were originally based on the following:
+
+ - Copyright 2013-2017 Andy Seaborne
+ - Copyright 2014-2015 Epimorphics Ltd.
-Portions of this software derive from software from Apache Jena:
- - Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Hewlett-Packard Development Company, LP
- - Copyright 2010, 2011 Epimorphics Ltd.
- - Copyright 2010, 2011 Talis Systems Ltd.
These have been licensed to the Apache Software Foundation under a software grant.
http://git-wip-us.apache.org/repos/asf/jena/blob/b6d967bb/jena-db/jena-tdb2-cmds/tdb2
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2-cmds/tdb2 b/jena-db/jena-tdb2-cmds/tdb2
index 935240f..170f8bb 100755
--- a/jena-db/jena-tdb2-cmds/tdb2
+++ b/jena-db/jena-tdb2-cmds/tdb2
@@ -15,7 +15,7 @@ LOG4J_CP="/home/afs/.m2/repo/org/slf4j/slf4j-log4j12/1.7.25/slf4j-log4j12-1.7.25
## JUL
JUL_CP="/home/afs/.m2/repo/org/slf4j/slf4j-jdk14/1.7.25/slf4j-jdk14-1.7.25.jar"
-H="$HOME/Mantis"
+H="$HOME/JenaTDB2/jena-db"
D=
# modules
http://git-wip-us.apache.org/repos/asf/jena/blob/b6d967bb/jena-db/jena-tdb2/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/pom.xml b/jena-db/jena-tdb2/pom.xml
index 5c83f9c..33643ea 100644
--- a/jena-db/jena-tdb2/pom.xml
+++ b/jena-db/jena-tdb2/pom.xml
@@ -23,7 +23,7 @@
<artifactId>jena-tdb2</artifactId>
<packaging>jar</packaging>
- <name>Mantis (${project.artifactId})</name>
+ <name>Apache Jena (${project.artifactId})</name>
<parent>
<groupId>org.apache.jena</groupId>
http://git-wip-us.apache.org/repos/asf/jena/blob/b6d967bb/jena-db/jena-tdb2/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/src/main/resources/META-INF/NOTICE b/jena-db/jena-tdb2/src/main/resources/META-INF/NOTICE
index 5ba7ec0..0b2d10d 100644
--- a/jena-db/jena-tdb2/src/main/resources/META-INF/NOTICE
+++ b/jena-db/jena-tdb2/src/main/resources/META-INF/NOTICE
@@ -1,10 +1,8 @@
-Mantis Database Operating Environment
+Apache Jena - Database Operating Environment
-Copyright 2013-2017 Andy Seaborne
-Copyright 2014, 2015 Epimorphics Ltd.
+Portions of this software were originally based on the following:
+
+ - Copyright 2013-2017 Andy Seaborne
+ - Copyright 2014-2015 Epimorphics Ltd.
-Portions of this software derive from software from Apache Jena:
- - Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Hewlett-Packard Development Company, LP
- - Copyright 2010, 2011 Epimorphics Ltd.
- - Copyright 2010, 2011 Talis Systems Ltd.
These have been licensed to the Apache Software Foundation under a software grant.
http://git-wip-us.apache.org/repos/asf/jena/blob/b6d967bb/jena-db/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/pom.xml b/jena-db/pom.xml
index d65b755..8810b31 100644
--- a/jena-db/pom.xml
+++ b/jena-db/pom.xml
@@ -23,8 +23,7 @@
<artifactId>jena-db</artifactId>
<packaging>pom</packaging>
<version>3.5.0-SNAPSHOT</version>
- <name>Mantis :: Database Operation Environment</name>
- <description>Mantis :: Database Operation Environment</description>
+ <name>Apache Jena :: Database Operation Environment</name>
<url>http://jena.apache.org/</url>
<parent>
http://git-wip-us.apache.org/repos/asf/jena/blob/b6d967bb/jena-db/use-fuseki-tdb2.md
----------------------------------------------------------------------
diff --git a/jena-db/use-fuseki-tdb2.md b/jena-db/use-fuseki-tdb2.md
index e64d99f..f78177f 100644
--- a/jena-db/use-fuseki-tdb2.md
+++ b/jena-db/use-fuseki-tdb2.md
@@ -1,9 +1,5 @@
There is a combined Fuseki server jar:
-Release builds are available from the central maven repository:
-
-http://central.maven.org/maven2/org/seaborne/mantis/fuseki-tdb2-server/
-
In addition, you will need a copy of Apache Jena Fuseki to get the web pages.
```
http://git-wip-us.apache.org/repos/asf/jena/blob/b6d967bb/jena-db/use-tdb2-cmds.md
----------------------------------------------------------------------
diff --git a/jena-db/use-tdb2-cmds.md b/jena-db/use-tdb2-cmds.md
index b420c9d..bbbb3eb 100644
--- a/jena-db/use-tdb2-cmds.md
+++ b/jena-db/use-tdb2-cmds.md
@@ -12,8 +12,6 @@ command has help message; the arguments are the mostly the same as TDB1.
* `tdb2.tdbstats`
* `tdb2.tdbupdate`
-[Command line jar (release builds)](http://central.maven.org/maven2/org/seaborne/mantis/tdb2-cmds/
-
Example usage:
```
http://git-wip-us.apache.org/repos/asf/jena/blob/b6d967bb/jena-db/use-tdb2.md
----------------------------------------------------------------------
diff --git a/jena-db/use-tdb2.md b/jena-db/use-tdb2.md
index 9208366..c487447 100644
--- a/jena-db/use-tdb2.md
+++ b/jena-db/use-tdb2.md
@@ -1,15 +1,6 @@
*TDB2 is not compatible with Apache Jena TDB (TDB1).*
-The maven artifact, a non-Apache build, is in maven central:
-```
- <dependency>
- <groupId>org.seaborne.mantis</groupId>
- <artifactId>tdb2</artifactId>
- <version>0.3.0</version>
- </dependency>
-```
-
-Simple migration is to use `TDB2Factory` in placeTDFCatory to create
+Simple migration of code is to use `TDB2Factory` in place of TDBFactory to create
datasets. `DatasetGraph` objects are now created via `DatabaseMgr`.
Example code: **`TDB2Factory`**