JENA-1397: Old names to Apache Jena names

Trung-Cyberpunk · Sep 28, 2017 · b6d967b · b6d967b
1 parent 3d45665
commit b6d967b
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 87 deletions.
diff --git a/jena-db/README.md b/jena-db/README.md
@@ -1,8 +1,6 @@
-[![Build Status](https://api.travis-ci.org/afs/mantis.png)](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>
-```
-
diff --git 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>

diff --git 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>

diff --git 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>

diff --git 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>

diff --git 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>

diff --git 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>
 

diff --git 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>

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
@@ -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.
diff --git 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

diff --git 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>

diff --git 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.
diff --git 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>

diff --git 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.
 
 ```

diff --git 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:
 
 ```

diff --git 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`**