JENA-1547: Metadata for TDB2

novellll · May 12, 2018 · dee610e · dee610e
1 parent ee053b7
commit dee610e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/jena-db/jena-tdb2/pom.xml b/jena-db/jena-tdb2/pom.xml
@@ -32,6 +32,8 @@
   </parent> 
 
   <properties>
+    <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
+    <build.time.xsd>${maven.build.timestamp}</build.time.xsd>
     <automatic.module.name>org.apache.jena.tdb2</automatic.module.name>
   </properties>
 
@@ -70,6 +72,23 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/resources</directory>
+        <excludes>
+          <exclude>org/apache/jena/tdb2/tdb2-properties.xml</exclude>
+        </excludes>
+      </resource>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>org/apache/jena/tdb2/tdb2-properties.xml</include>
+        </includes>
+      </resource>
+    </resources>
+
     <plugins> 
 
       <plugin>

diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/TDB2.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/TDB2.java
@@ -159,11 +159,11 @@ private static void wireIntoExecution() {
     // ---- Static constants read by modVersion
     // ---- Must be after initialization.
 
-    static private String      metadataLocation = "org/apache/jena/tdb/tdb-properties.xml" ;
+    static private String      metadataLocation = "org/apache/jena/tdb2/tdb2-properties.xml" ;
     static private Metadata    metadata         = new Metadata(metadataLocation) ;
 
     /** The root package name for TDB */
-    public static final String PATH             = "org.apache.jena.tdb" ;
+    public static final String PATH             = "org.apache.jena.tdb2" ;
 
     // The names known to ModVersion : "NAME", "VERSION", "BUILD_DATE"
 

diff --git a/...es/org/apache/jena/tdb/tdb-properties.xml → .../org/apache/jena/tdb2/tdb2-properties.xml b/...es/org/apache/jena/tdb/tdb-properties.xml → .../org/apache/jena/tdb2/tdb2-properties.xml
@@ -2,7 +2,7 @@
 <!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>TDB System Properties</comment>
-  <entry key="org.apache.jena.tdb.version">${project.version}</entry>
-  <entry key="org.apache.jena.tdb.build.datetime">${build.time.xsd}</entry>
+  <comment>TDB2 System Properties</comment>
+  <entry key="org.apache.jena.tdb2.version">${project.version}</entry>
+  <entry key="org.apache.jena.tdb2.build.datetime">${build.time.xsd}</entry>
 </properties>