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:48:31 UTC
svn commit: r1454689 - in /jena/branches/arq-riot-output: ./ .gitattributes
pom.xml src/main/java/com/hp/hpl/jena/query/ARQ.java
src/main/resources/arq-properties.xml src/main/resources/org/
src/test/resources/etc/
Author: andy
Date: Sat Mar 9 11:48:30 2013
New Revision: 1454689
URL: http://svn.apache.org/r1454689
Log:
Merge from trunk
Added:
jena/branches/arq-riot-output/.gitattributes
- copied unchanged from r1454688, jena/trunk/jena-arq/.gitattributes
jena/branches/arq-riot-output/src/main/resources/org/
- copied from r1454688, jena/trunk/jena-arq/src/main/resources/org/
Removed:
jena/branches/arq-riot-output/src/main/resources/arq-properties.xml
jena/branches/arq-riot-output/src/test/resources/etc/
Modified:
jena/branches/arq-riot-output/ (props changed)
jena/branches/arq-riot-output/pom.xml
jena/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/query/ARQ.java
Propchange: jena/branches/arq-riot-output/
------------------------------------------------------------------------------
Merged /jena/trunk/jena-arq:r1454416-1454688
Modified: jena/branches/arq-riot-output/pom.xml
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/pom.xml?rev=1454689&r1=1454688&r2=1454689&view=diff
==============================================================================
--- jena/branches/arq-riot-output/pom.xml (original)
+++ jena/branches/arq-riot-output/pom.xml Sat Mar 9 11:48:30 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/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/query/ARQ.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/query/ARQ.java?rev=1454689&r1=1454688&r2=1454689&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/query/ARQ.java (original)
+++ jena/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/query/ARQ.java Sat Mar 9 11:48:30 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