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 2013/03/09 12:41:10 UTC
svn commit: r1454685 - in /jena/trunk: jena-arq/
jena-arq/src/main/java/com/hp/hpl/jena/query/ jena-arq/src/main/resources/
jena-arq/src/main/resources/org/ jena-arq/src/main/resources/org/apache/
jena-arq/src/main/resources/org/apache/jena/ jena-arq/s...
Author: andy
Date: Sat Mar 9 11:41:09 2013
New Revision: 1454685
URL: http://svn.apache.org/r1454685
Log:
Move rules files from etc/ to src/main/resources/etc/
Move module properties files to src/main/resources/org/apache/jena/...
Changes name of metadata properties to org.apache.jena....
Move file:etc/assembler.n3 to resource org/apache/jena/vocabulary/
Added:
jena/trunk/jena-arq/src/main/resources/org/
jena/trunk/jena-arq/src/main/resources/org/apache/
jena/trunk/jena-arq/src/main/resources/org/apache/jena/
jena/trunk/jena-arq/src/main/resources/org/apache/jena/arq/
jena/trunk/jena-arq/src/main/resources/org/apache/jena/arq/arq-properties.xml
- copied, changed from r1454415, jena/trunk/jena-arq/src/main/resources/arq-properties.xml
jena/trunk/jena-core/src/main/resources/etc/
jena/trunk/jena-core/src/main/resources/etc/daml-micro.rules
- copied unchanged from r1454415, jena/trunk/jena-core/etc/daml-micro.rules
jena/trunk/jena-core/src/main/resources/etc/owl-b.rules
- copied unchanged from r1454415, jena/trunk/jena-core/etc/owl-b.rules
jena/trunk/jena-core/src/main/resources/etc/owl-fb-micro.rules
- copied unchanged from r1454415, jena/trunk/jena-core/etc/owl-fb-micro.rules
jena/trunk/jena-core/src/main/resources/etc/owl-fb-mini.rules
- copied unchanged from r1454415, jena/trunk/jena-core/etc/owl-fb-mini.rules
jena/trunk/jena-core/src/main/resources/etc/owl-fb-old.rules
- copied unchanged from r1454415, jena/trunk/jena-core/etc/owl-fb-old.rules
jena/trunk/jena-core/src/main/resources/etc/owl-fb.rules
- copied unchanged from r1454415, jena/trunk/jena-core/etc/owl-fb.rules
jena/trunk/jena-core/src/main/resources/etc/owl.rules
- copied unchanged from r1454415, jena/trunk/jena-core/etc/owl.rules
jena/trunk/jena-core/src/main/resources/etc/rdfs-b-tuned.rules
- copied unchanged from r1454415, jena/trunk/jena-core/etc/rdfs-b-tuned.rules
jena/trunk/jena-core/src/main/resources/etc/rdfs-b.rules
- copied unchanged from r1454415, jena/trunk/jena-core/etc/rdfs-b.rules
jena/trunk/jena-core/src/main/resources/etc/rdfs-fb-lp-expt.rules
- copied unchanged from r1454415, jena/trunk/jena-core/etc/rdfs-fb-lp-expt.rules
jena/trunk/jena-core/src/main/resources/etc/rdfs-fb-tgc-noresource.rules
- copied unchanged from r1454415, jena/trunk/jena-core/etc/rdfs-fb-tgc-noresource.rules
jena/trunk/jena-core/src/main/resources/etc/rdfs-fb-tgc-simple.rules
- copied unchanged from r1454415, jena/trunk/jena-core/etc/rdfs-fb-tgc-simple.rules
jena/trunk/jena-core/src/main/resources/etc/rdfs-fb-tgc.rules
- copied unchanged from r1454415, jena/trunk/jena-core/etc/rdfs-fb-tgc.rules
jena/trunk/jena-core/src/main/resources/etc/rdfs-fb.rules
- copied unchanged from r1454415, jena/trunk/jena-core/etc/rdfs-fb.rules
jena/trunk/jena-core/src/main/resources/etc/rdfs-noresource.rules
- copied unchanged from r1454415, jena/trunk/jena-core/etc/rdfs-noresource.rules
jena/trunk/jena-core/src/main/resources/etc/rdfs.rules
- copied unchanged from r1454415, jena/trunk/jena-core/etc/rdfs.rules
jena/trunk/jena-core/src/main/resources/jena-log4j.properties
- copied unchanged from r1454415, jena/trunk/jena-core/src/main/java/jena-log4j.properties
jena/trunk/jena-core/src/main/resources/org/
jena/trunk/jena-core/src/main/resources/org/apache/
jena/trunk/jena-core/src/main/resources/org/apache/jena/
jena/trunk/jena-core/src/main/resources/org/apache/jena/vocabulary/
jena/trunk/jena-core/src/main/resources/org/apache/jena/vocabulary/assembler.ttl
- copied unchanged from r1454415, jena/trunk/jena-core/vocabularies/assembler.n3
Removed:
jena/trunk/jena-arq/src/main/resources/arq-properties.xml
jena/trunk/jena-arq/src/test/resources/etc/
jena/trunk/jena-core/etc/daml-micro.rules
jena/trunk/jena-core/etc/owl-b.rules
jena/trunk/jena-core/etc/owl-fb-micro.rules
jena/trunk/jena-core/etc/owl-fb-mini.rules
jena/trunk/jena-core/etc/owl-fb-old.rules
jena/trunk/jena-core/etc/owl-fb.rules
jena/trunk/jena-core/etc/owl.rules
jena/trunk/jena-core/etc/rdfs-b-tuned.rules
jena/trunk/jena-core/etc/rdfs-b.rules
jena/trunk/jena-core/etc/rdfs-fb-lp-expt.rules
jena/trunk/jena-core/etc/rdfs-fb-tgc-noresource.rules
jena/trunk/jena-core/etc/rdfs-fb-tgc-simple.rules
jena/trunk/jena-core/etc/rdfs-fb-tgc.rules
jena/trunk/jena-core/etc/rdfs-fb.rules
jena/trunk/jena-core/etc/rdfs-noresource.rules
jena/trunk/jena-core/etc/rdfs.rules
jena/trunk/jena-core/lib/
jena/trunk/jena-core/src/main/java/jena-log4j.properties
jena/trunk/jena-core/vocabularies/assembler.n3
jena/trunk/jena-tdb/src/test/resources/etc/
jena/trunk/jena-tdb/src/test/resources/vocabularies/
Modified:
jena/trunk/jena-arq/pom.xml
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
jena/trunk/jena-core/etc/location-mapping.ex
jena/trunk/jena-core/pom.xml
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/Jena.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/JA.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/Metadata.java
Modified: jena/trunk/jena-arq/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/pom.xml?rev=1454685&r1=1454684&r2=1454685&view=diff
==============================================================================
--- jena/trunk/jena-arq/pom.xml (original)
+++ jena/trunk/jena-arq/pom.xml Sat Mar 9 11:41:09 2013
@@ -93,17 +93,16 @@
<resources>
<resource>
<filtering>true</filtering>
- <targetPath>com/hp/hpl/jena/sparql/</targetPath>
<directory>src/main/resources</directory>
<includes>
- <include>arq-properties.xml</include>
+ <include>org/apache/jena/arq/arq-properties.xml</include>
</includes>
</resource>
<resource>
<filtering>false</filtering>
<directory>src/main/resources</directory>
<excludes>
- <exclude>arq-properties.xml</exclude>
+ <exclude>org/apache/jena/arq/arq-properties.xml</exclude>
</excludes>
</resource>
</resources>
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java?rev=1454685&r1=1454684&r2=1454685&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java Sat Mar 9 11:41:09 2013
@@ -398,20 +398,20 @@ public class ARQ
// ----------------------------------
/** The root package name for ARQ */
- public static final String PATH = "com.hp.hpl.jena.sparql";
+ public static final String PATH = "org.apache.jena.arq";
- static private String metadataLocation = "com/hp/hpl/jena/sparql/arq-properties.xml" ;
+ static private String metadataLocation = "org/apache/jena/arq/arq-properties.xml" ;
- static private Metadata metadata = new Metadata(metadataLocation) ;
+ static private Metadata metadata = new Metadata(metadataLocation) ;
/** The product name */
- public static final String NAME = "ARQ";
+ public static final String NAME = "ARQ";
/** The full name of the current ARQ version */
- public static final String VERSION = metadata.get(PATH+".version", "unknown") ;
+ public static final String VERSION = metadata.get(PATH+".version", "unknown") ;
/** The date and time at which this release was built */
- public static final String BUILD_DATE = metadata.get(PATH+".build.datetime", "unset") ;
+ public static final String BUILD_DATE = metadata.get(PATH+".build.datetime", "unset") ;
// A correct way to manage without synchonized using the double checked locking pattern.
// http://en.wikipedia.org/wiki/Double-checked_locking
Copied: jena/trunk/jena-arq/src/main/resources/org/apache/jena/arq/arq-properties.xml (from r1454415, jena/trunk/jena-arq/src/main/resources/arq-properties.xml)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/resources/org/apache/jena/arq/arq-properties.xml?p2=jena/trunk/jena-arq/src/main/resources/org/apache/jena/arq/arq-properties.xml&p1=jena/trunk/jena-arq/src/main/resources/arq-properties.xml&r1=1454415&r2=1454685&rev=1454685&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/resources/arq-properties.xml (original)
+++ jena/trunk/jena-arq/src/main/resources/org/apache/jena/arq/arq-properties.xml Sat Mar 9 11:41:09 2013
@@ -3,6 +3,6 @@
<!-- Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0 -->
<properties version="1.0">
<comment>ARQ System Properties</comment>
- <entry key="com.hp.hpl.jena.sparql.version">${project.version}</entry>
- <entry key="com.hp.hpl.jena.sparql.build.datetime">${build.time.xsd}</entry>
+ <entry key="org.apache.jena.arq.version">${project.version}</entry>
+ <entry key="org.apache.jena.arq.build.datetime">${build.time.xsd}</entry>
</properties>
Modified: jena/trunk/jena-core/etc/location-mapping.ex
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/etc/location-mapping.ex?rev=1454685&r1=1454684&r2=1454685&view=diff
==============================================================================
--- jena/trunk/jena-core/etc/location-mapping.ex (original)
+++ jena/trunk/jena-core/etc/location-mapping.ex Sat Mar 9 11:41:09 2013
@@ -23,9 +23,9 @@
## -- Example 1
[] lm:mapping
- [ lm:name "file:foo.n3" ; lm:altName "file:etc/foo.n3" ] ,
+ [ lm:name "file:foo.ttl" ; lm:altName "file:etc/foo.ttl" ] ,
[ lm:prefix "file:etc/" ; lm:altPrefix "file:ETC/" ] ,
- [ lm:name "file:etc/foo.n3" ; lm:altName "file:DIR/foo.n3" ] ,
+ [ lm:name "file:etc/foo.ttl" ; lm:altName "file:DIR/foo.ttl" ] ,
.
## -- Example 2
@@ -33,15 +33,15 @@
# This is exactly the same graph using the ; syntax of N3
# Multiple statements with the same subject - and we used the same predicate.
-## [] lm:mapping [ lm:name "file:foo.n3" ; lm:altName "file:etc/foo.n3" ] ;
+## [] lm:mapping [ lm:name "file:foo.ttl" ; lm:altName "file:etc/foo.ttl" ] ;
## lm:mapping [ lm:prefix "file:etc/" ; lm:altPrefix "file:ETC/" ] ;
-## lm:mapping [ lm:name "file:etc/foo.n3" ; lm:altName "file:DIR/foo.n3" ] ;
+## lm:mapping [ lm:name "file:etc/foo.ttl" ; lm:altName "file:DIR/foo.ttl" ] ;
## .
## -- Example 3
# Different graph - same effect. The fact there are different subjects is immaterial.
-## [] lm:mapping [ lm:name "file:foo.n3" ; lm:altName "file:etc/foo.n3" ] .
+## [] lm:mapping [ lm:name "file:foo.ttl" ; lm:altName "file:etc/foo.ttl" ] .
## [] lm:mapping [ lm:prefix "file:etc/" ; lm:altPrefix "file:ETC/" ] .
-## [] lm:mapping [ lm:name "file:etc/foo.n3" ; lm:altName "file:DIR/foo.n3" ] .
+## [] lm:mapping [ lm:name "file:etc/foo.ttl" ; lm:altName "file:DIR/foo.ttl" ] .
Modified: jena/trunk/jena-core/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/pom.xml?rev=1454685&r1=1454684&r2=1454685&view=diff
==============================================================================
--- jena/trunk/jena-core/pom.xml (original)
+++ jena/trunk/jena-core/pom.xml Sat Mar 9 11:41:09 2013
@@ -70,44 +70,29 @@
<build>
<resources>
+
+ <!-- Legacy -->
<resource>
- <directory>etc</directory>
+ <directory>etc</directory>
<targetPath>etc</targetPath>
<filtering>false</filtering>
</resource>
<resource>
- <directory>vocabularies</directory>
- <targetPath>vocabularies</targetPath>
<filtering>false</filtering>
- <includes>
- <include>assembler.n3</include>
- </includes>
+ <directory>src/main/resources</directory>
</resource>
<resource>
- <directory>src/main/java</directory>
+ <directory>src/main/resources</directory>
<includes>
- <include>jena-log4j.properties</include>
+ <include>org/apache/jena/jena-properties.xml</include>
</includes>
- <filtering>false</filtering>
- </resource>
-
-
- <!-- <copy file="src/main/resources/jena-properties.xml" toFile="${project.basedir}/target/classes/com/hp/hpl/jena/jena-properties.xml" overwrite="true">
- -->
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <targetPath>com/hp/hpl/jena/</targetPath>
<filtering>true</filtering>
- <directory>src/main/resources</directory>
</resource>
+
</resources>
-
<plugins>
<plugin>
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/Jena.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/Jena.java?rev=1454685&r1=1454684&r2=1454685&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/Jena.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/Jena.java Sat Mar 9 11:41:09 2013
@@ -27,46 +27,21 @@ public interface Jena
{
/** The root package name for Jena */
public static final String PATH = "com.hp.hpl.jena";
+
+ /** The root name for metadata */
+
+ public static final String MPATH = "org.apache.jena";
static final String UNSET = "unset" ;
/** The product name */
- public static final String NAME = JenaRuntime.getMetadata( PATH + ".name", UNSET ) ;
+ public static final String NAME = JenaRuntime.getMetadata( MPATH + ".name", UNSET ) ;
/** The Jena web site */
- public static final String WEBSITE = JenaRuntime.getMetadata( PATH + ".website", UNSET ) ;
+ public static final String WEBSITE = JenaRuntime.getMetadata( MPATH + ".website", UNSET ) ;
/** The full name of the current Jena version */
- public static final String VERSION = JenaRuntime.getMetadata( PATH + ".version", UNSET ) ;
+ public static final String VERSION = JenaRuntime.getMetadata( MPATH + ".version", UNSET ) ;
/** The date and time at which this release was built */
- public static final String BUILD_DATE = JenaRuntime.getMetadata( PATH + ".build.datetime", UNSET ) ;
-
- /** @deprecated See the VERSION constant */
- @Deprecated
- public static final String MAJOR_VERSION = "unset" ;
-
- /** @deprecated See the VERSION constant */
- @Deprecated
- public static final String MINOR_VERSION = "unset" ;
-
- /** @deprecated See the VERSION constant */
- @Deprecated
- public static final String REVISION_VERSION = "unset" ;
-
- /** @deprecated See the VERSION constant */
- @Deprecated
- public static final String VERSION_STATUS = "unset" ;
-
-// /** The major version number for this release of Jena (ie '2' for Jena 2.6.0) */
-// public static final String MAJOR_VERSION = metadata.get ( PATH + ".version.major", UNSET ) ;
-//
-// /** The minor version number for this release of Jena (ie '6' for Jena 2.6.0) */
-// public static final String MINOR_VERSION = metadata.get ( PATH + ".version.minor", UNSET ) ;
-//
-// /** The minor version number for this release of Jena (ie '0' for Jena 2.6.0) */
-// public static final String REVISION_VERSION = metadata.get ( PATH + ".version.revision", UNSET ) ;
-//
-// /** The version status for this release of Jena (eg '-beta1' or the empty string) */
-// public static final String VERSION_STATUS = metadata.get ( PATH + ".version.status", UNSET ) ;
-
+ public static final String BUILD_DATE = JenaRuntime.getMetadata( MPATH + ".build.datetime", UNSET ) ;
}
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java?rev=1454685&r1=1454684&r2=1454685&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java Sat Mar 9 11:41:09 2013
@@ -30,7 +30,7 @@ import com.hp.hpl.jena.util.Metadata ;
public class JenaRuntime
{
- private static String metadataLocation = "com/hp/hpl/jena/jena-properties.xml" ;
+ private static String metadataLocation = "org/apache/jena/jena-properties.xml" ;
private static Metadata metadata = new Metadata(metadataLocation) ;
public static String getMetadata(String key, String defaultValue) { return metadata.get(key, defaultValue) ; }
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/JA.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/JA.java?rev=1454685&r1=1454684&r2=1454685&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/JA.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/JA.java Sat Mar 9 11:41:09 2013
@@ -193,5 +193,5 @@ public class JA
}
private static String getSchemaPath()
- { return "vocabularies/assembler.n3"; }
+ { return "org/apache/jena/vocabulary/assembler.ttl"; }
}
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/Metadata.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/Metadata.java?rev=1454685&r1=1454684&r2=1454685&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/Metadata.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/Metadata.java Sat Mar 9 11:41:09 2013
@@ -54,10 +54,6 @@ public class Metadata
read(properties, resourceName) ;
}
-
- //static String resource = "com/hp/hpl/jena/jena-properties.xml" ;
-
-
private static void read(Properties properties, String resource)
{
ClassLoader classLoader = SystemUtils.chooseClassLoader() ;