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 2016/01/14 14:44:19 UTC
jena git commit: Fix SDb automatic initialization.
Repository: jena
Updated Branches:
refs/heads/master dd7b6ecc9 -> e601bdaf0
Fix SDb automatic initialization.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e601bdaf
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e601bdaf
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e601bdaf
Branch: refs/heads/master
Commit: e601bdaf0703fb53c17939a0c1f9e478c954cc3f
Parents: dd7b6ec
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Jan 14 13:39:22 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Jan 14 13:39:22 2016 +0000
----------------------------------------------------------------------
jena-sdb/pom.xml | 12 +++++++++++-
.../src/main/java/org/apache/jena/sdb/core/InitSDB.java | 2 +-
.../resources/org/apache/jena/sdb/sdb-properties.xml | 9 +++++++++
jena-sdb/src/main/resources/sdb-properties.xml | 9 ---------
4 files changed, 21 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e601bdaf/jena-sdb/pom.xml
----------------------------------------------------------------------
diff --git a/jena-sdb/pom.xml b/jena-sdb/pom.xml
index cdb6884..b5b70c1 100644
--- a/jena-sdb/pom.xml
+++ b/jena-sdb/pom.xml
@@ -105,11 +105,21 @@
</dependencies>
<build>
+
<resources>
<resource>
- <targetPath>org/apache/jena/sdb/</targetPath>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>org/apache/jena/sdb/sdb-properties.xml</exclude>
+ </excludes>
+ </resource>
+ <resource>
<filtering>true</filtering>
<directory>src/main/resources</directory>
+ <includes>
+ <include>org/apache/jena/sdb/sdb-properties.xml</include>
+ </includes>
</resource>
</resources>
http://git-wip-us.apache.org/repos/asf/jena/blob/e601bdaf/jena-sdb/src/main/java/org/apache/jena/sdb/core/InitSDB.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/core/InitSDB.java b/jena-sdb/src/main/java/org/apache/jena/sdb/core/InitSDB.java
index 3461f15..00be85b 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/core/InitSDB.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/core/InitSDB.java
@@ -34,6 +34,6 @@ public class InitSDB implements JenaSubsystemLifecycle {
@Override
public int level() {
- return 9 ;
+ return 50 ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/e601bdaf/jena-sdb/src/main/resources/org/apache/jena/sdb/sdb-properties.xml
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/resources/org/apache/jena/sdb/sdb-properties.xml b/jena-sdb/src/main/resources/org/apache/jena/sdb/sdb-properties.xml
new file mode 100644
index 0000000..bca78a9
--- /dev/null
+++ b/jena-sdb/src/main/resources/org/apache/jena/sdb/sdb-properties.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<!-- Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0 -->
+
+<properties version="1.0">
+ <comment>SDB System Properties</comment>
+ <entry key="org.apache.jena.sdb.version">${project.version}</entry>
+ <entry key="org.apache.jena.sdb.build.datetime">${build.time.xsd}</entry>
+</properties>
http://git-wip-us.apache.org/repos/asf/jena/blob/e601bdaf/jena-sdb/src/main/resources/sdb-properties.xml
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/resources/sdb-properties.xml b/jena-sdb/src/main/resources/sdb-properties.xml
deleted file mode 100644
index bca78a9..0000000
--- a/jena-sdb/src/main/resources/sdb-properties.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<!-- Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0 -->
-
-<properties version="1.0">
- <comment>SDB System Properties</comment>
- <entry key="org.apache.jena.sdb.version">${project.version}</entry>
- <entry key="org.apache.jena.sdb.build.datetime">${build.time.xsd}</entry>
-</properties>