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 2011/12/09 16:04:36 UTC
svn commit: r1212467 - in /incubator/jena/Jena2: ARQ/trunk/ IRI/trunk/
SDB/trunk/ TDB/trunk/ jena/trunk/ jena/trunk/Grammar/
jena/trunk/src/main/java/com/hp/hpl/jena/datatypes/xsd/
jena/trunk/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/
Author: andy
Date: Fri Dec 9 15:04:34 2011
New Revision: 1212467
URL: http://svn.apache.org/viewvc?rev=1212467&view=rev
Log:
Tidying out in preparation for jena release (version updates, remove junk)
Removed:
incubator/jena/Jena2/jena/trunk/Grammar/n3.g
incubator/jena/Jena2/jena/trunk/Grammar/turtle.txt
incubator/jena/Jena2/jena/trunk/checkCopyright.pl
Modified:
incubator/jena/Jena2/ARQ/trunk/.classpath
incubator/jena/Jena2/ARQ/trunk/README.txt
incubator/jena/Jena2/ARQ/trunk/pom.xml
incubator/jena/Jena2/IRI/trunk/.classpath
incubator/jena/Jena2/SDB/trunk/.classpath
incubator/jena/Jena2/SDB/trunk/pom.xml
incubator/jena/Jena2/TDB/trunk/.classpath
incubator/jena/Jena2/jena/trunk/.classpath
incubator/jena/Jena2/jena/trunk/Grammar/turtle-strict.jj
incubator/jena/Jena2/jena/trunk/Grammar/turtle.jj
incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/datatypes/xsd/AbstractDateTime.java
incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDurationType.java
Modified: incubator/jena/Jena2/ARQ/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/.classpath?rev=1212467&r1=1212466&r2=1212467&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/.classpath (original)
+++ incubator/jena/Jena2/ARQ/trunk/.classpath Fri Dec 9 15:04:34 2011
@@ -9,7 +9,7 @@
<classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.1.3/httpcore-4.1.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.1.3/httpcore-4.1.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar" sourcepath="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4-sources.jar"/>
<classpathentry kind="var"
@@ -26,12 +26,12 @@
<classpathentry kind="var" path="M2_REPO/junit/junit/4.8.2/junit-4.8.2.jar" sourcepath="M2_REPO/junit/junit/4.8.2/junit-4.8.2-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.9/wstx-asl-3.2.9.jar" sourcepath="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.9/wstx-asl-3.2.9-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="output" path="classes"/>
</classpath>
Modified: incubator/jena/Jena2/ARQ/trunk/README.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/README.txt?rev=1212467&r1=1212466&r2=1212467&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/README.txt (original)
+++ incubator/jena/Jena2/ARQ/trunk/README.txt Fri Dec 9 15:04:34 2011
@@ -18,21 +18,22 @@ or graph, including ones stored in datab
Download
--------
-Old Releases : SourceForge, Project Jena : Package ARQ
-http://sourceforge.net/project/showfiles.php?group_id=40417&package_id=143808
-
Also available via SVN:
https://svn.apache.org/repos/asf/incubator/jena/Jena2/ARQ/
Maven:
-GroupId: com.hp.hpl.jena
-ArtifactId: arq
+GroupId: org.apache.jena
+ArtifactId: jena-arq
+
+Development repository:
+ https://repository.apache.org/content/repositories/snapshots/org/apache/jena/
+
-(migrating to Aapche)
-Release repository: http://openjena.org/repo
+Old releases:
Mirrored to http://repo1.maven.org/
-Development repo: http://openjena.org/repo-dev (old)
- https://repository.apache.org/content/repositories/snapshots/org/apache/jena/ (new)
+http://openjena.org/repo
+http://sourceforge.net/project/showfiles.php?group_id=40417&package_id=143808
+
See below of maven repository contents.
@@ -47,55 +48,60 @@ http://www.sparql.org/validator.html
Documentation
-------------
-Included in the download in doc/index.html and online at http://openjena.org/ARQ
+http://incubator.apache.org/jena/documentation/query/index.html
Installation
------------
-Unpack zip : it unpacks into a directory, including the version number.
-Set environment variable ARQROOT to the path of this direrctory.
-ARQ includes all the libraries necessary in lib/
-ARQ includes a copy of Jena, the one it is tested against.
-Put each and every the jar file in lib/ on your classpath.
+The apache-jena distribution includes ARQ and all it's dependencies. It
+also includes scripts to run the command line tools.
+
+www.apache.org/dist/incubator/jena
+
+Unpack zip : it unpacks into a directory, including the version number.
+
+Set environment variable ARQROOT (or JENAROOT) to the path of this direrctory.
Maven Distribution
------------------
The maven repository contains the following files (for version VER)
-arq-VER.jar ARQ jar
-arq-VER-javadoc.jar Javadoc
-arq-VER-sources.jar Sources
+jena-arq-VER.jar ARQ jar
+jena-arq-VER-javadoc.jar Javadoc
+jena-arq-VER-sources.jar Sources
-arq-VER-tests.jar ARQ testing code
-arq-VER-test-sources.jar Sourecs for test code
-arq-VER-tests.zip Datafiles for tests, and test scripts.
+jena-arq-VER-tests.jar ARQ testing code
+jena-arq-VER-test-sources.jar Sourecs for test code
+jena-arq-VER-tests.zip Datafiles for tests, and test scripts.
-arq-VER.pom ARQ POM
+jena-arq-VER.pom ARQ POM
-arq-VER.zip The complete distribution file
+jena-arq-VER.zip The complete distribution file (if available)
+jena-arq-VER-source-release.zip Complete copy of the codebase at the release.
-To run tests, you will need 'arq-VER.jar', 'arq-VER-tests.jar' and all
-dependences and to unpack 'arq-VER-tests.zip' to get the "testing" data
+To run tests, you will need 'jena-arq-VER.jar', 'jena-arq-VER-tests.jar' and all
+dependences and to unpack 'jena-arq-VER-tests.zip' to get the "testing" data
directory and test scripts.
-Or download the distribution 'arq-VER.zip'.
+Or download the distribution 'jena-arq-VER.zip'.
Running from the command line
-----------------------------
-Some bash and bat scripts are provided to try out SPARQL queries:
+Some bash and bat scripts are provided to try out SPARQL queries.
-First, set environment variable ARQROOT to the root of the unzipped distibution.
+In the apache-jena distribution, set JENAROOT.
- export ARQROOT=$PWD
+ export JENAROOT=$PWD
Second, ensure all scripts are executable
- chmod u+x $ARQROOT/bin/*
+ chmod u+x $JENAROOT/bin/*
Command line applications:
+
sparql -- Run a SPARQL query. A wrapper around 'query'.
arq -- Run an ARQ query. A wrapper around 'query'.
query -- Run a query.
@@ -115,19 +121,13 @@ DESCRIBE and CONSTRUCT.
Run the script with no argument to get a usage message.
-See doc/cmds.html for details. Check the suitablity of scripts before running them.
-
Running commands as Java
------------------------
-Put all the jars files in lib/ on your classpath. All of them, including
-the version of jena.jar included.
+Set the classpath to "$JENAROOT/lib/*" (Linux) or "$JENAROOT\lib\*;" (Windows).
The arq command line application is:
-java -cp ... arq.query "$@"
-
-Running the test suite:
-java -cp ... arq.qtest --all
+java -cp ... arq.query ....
ARQ.Net
-------
Modified: incubator/jena/Jena2/ARQ/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/pom.xml?rev=1212467&r1=1212466&r2=1212467&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/pom.xml (original)
+++ incubator/jena/Jena2/ARQ/trunk/pom.xml Fri Dec 9 15:04:34 2011
@@ -43,7 +43,8 @@
<properties>
<this.root>${project.artifactId}-${project.version}</this.root>
<ver.wstx-asl>3.2.9</ver.wstx-asl>
- <ver.http-client>4.1.2</ver.http-client>
+ <ver.httpclient>4.1.2</ver.httpclient>
+ <ver.httpcore>4.1.3</ver.httpcore>
<ver.commons-codec>1.5</ver.commons-codec>
</properties>
@@ -71,7 +72,7 @@
And recode XMLInputStax to use STaX2 as still have the same problems of STaX1 if just upgrade woodstox.
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
- <version>4.0.0</version>
+ <version>4.1.2</version>
-->
</dependency>
@@ -84,7 +85,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${ver.http-client}</version>
+ <version>${ver.httpclient}</version>
<exclusions>
<!-- Replace with slf4j adapter -->
<exclusion>
@@ -94,10 +95,18 @@
</exclusions>
</dependency>
+ <!-- Intercept any uses of Jakarta Commons Logging e.g. Apache Common HTTP client. -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${ver.slf4j}</version>
+ <optional>true</optional>
+ </dependency>
+
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>${ver.http-client}</version>
+ <version>${ver.httpcore}</version>
</dependency>
</dependencies>
Modified: incubator/jena/Jena2/IRI/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/IRI/trunk/.classpath?rev=1212467&r1=1212466&r2=1212467&view=diff
==============================================================================
--- incubator/jena/Jena2/IRI/trunk/.classpath (original)
+++ incubator/jena/Jena2/IRI/trunk/.classpath Fri Dec 9 15:04:34 2011
@@ -5,7 +5,7 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.9/junit-4.9.jar" sourcepath="M2_REPO/junit/junit/4.9/junit-4.9-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar" sourcepath="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar" sourcepath="M2_REPO/com/ibm/icu/icu4j/4.9.4.4/icu4j-3.4.4-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="output" path="classes"/>
</classpath>
Modified: incubator/jena/Jena2/SDB/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/.classpath?rev=1212467&r1=1212466&r2=1212467&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/.classpath (original)
+++ incubator/jena/Jena2/SDB/trunk/.classpath Fri Dec 9 15:04:34 2011
@@ -35,11 +35,11 @@
<classpathentry kind="var" path="M2_REPO/junit/junit/4.9/junit-4.9.jar" sourcepath="M2_REPO/junit/junit/4.9/junit-4.9-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.9/wstx-asl-3.2.9.jar" sourcepath="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.9/wstx-asl-3.2.9-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
Modified: incubator/jena/Jena2/SDB/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/pom.xml?rev=1212467&r1=1212466&r2=1212467&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/pom.xml (original)
+++ incubator/jena/Jena2/SDB/trunk/pom.xml Fri Dec 9 15:04:34 2011
@@ -101,13 +101,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
+ <version>1.6.4</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.12</version>
+ <version>1.2.16</version>
</dependency>
-->
</dependencies>
Modified: incubator/jena/Jena2/TDB/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/.classpath?rev=1212467&r1=1212466&r2=1212467&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/.classpath (original)
+++ incubator/jena/Jena2/TDB/trunk/.classpath Fri Dec 9 15:04:34 2011
@@ -14,11 +14,11 @@
<classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar" sourcepath="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.9/junit-4.9.jar" sourcepath="M2_REPO/junit/junit/4.9/junit-4.9-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.9/wstx-asl-3.2.9.jar" sourcepath="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.9/wstx-asl-3.2.9-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="classes"/>
</classpath>
Modified: incubator/jena/Jena2/jena/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/.classpath?rev=1212467&r1=1212466&r2=1212467&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/.classpath (original)
+++ incubator/jena/Jena2/jena/trunk/.classpath Fri Dec 9 15:04:34 2011
@@ -13,10 +13,9 @@
<classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar" sourcepath="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.9/junit-4.9.jar" sourcepath="M2_REPO/junit/junit/4.9/junit-4.9-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
Modified: incubator/jena/Jena2/jena/trunk/Grammar/turtle-strict.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/Grammar/turtle-strict.jj?rev=1212467&r1=1212466&r2=1212467&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/Grammar/turtle-strict.jj (original)
+++ incubator/jena/Jena2/jena/trunk/Grammar/turtle-strict.jj Fri Dec 9 15:04:34 2011
@@ -535,31 +535,6 @@ TOKEN:
["\u0300"-"\u036F"] | ["\u203F"-"\u2040"] )* >
}
/*
- * (c) Copyright 2006 Hewlett-Packard Development Company, LP
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
# Local Variables:
# tab-width: 4
# indent-tabs-mode: nil
Modified: incubator/jena/Jena2/jena/trunk/Grammar/turtle.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/Grammar/turtle.jj?rev=1212467&r1=1212466&r2=1212467&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/Grammar/turtle.jj (original)
+++ incubator/jena/Jena2/jena/trunk/Grammar/turtle.jj Fri Dec 9 15:04:34 2011
@@ -516,31 +516,6 @@ TOKEN:
}
/*
- * (c) Copyright 2006, 2007, 2008, 2009 Hewlett-Packard Development Company, LP
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
# Local Variables:
# tab-width: 4
# indent-tabs-mode: nil
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/datatypes/xsd/AbstractDateTime.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/datatypes/xsd/AbstractDateTime.java?rev=1212467&r1=1212466&r2=1212467&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/datatypes/xsd/AbstractDateTime.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/datatypes/xsd/AbstractDateTime.java Fri Dec 9 15:04:34 2011
@@ -25,8 +25,9 @@ package com.hp.hpl.jena.datatypes.xsd;
* using an int array. These wrapper classes just provide more
* convenient access to the date values.
* <p>
- * This class includees code derived from Xerces 2.6.0 Copyright (c) 1999-2002 The Apache Software Foundation. All rights
- * reserved.
+ * This class includees code derived from Xerces 2.6.0
+ * Copyright (c) 1999-2002 The Apache Software Foundation.
+ * All rights reserved.
* </p>
*
* @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDurationType.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDurationType.java?rev=1212467&r1=1212466&r2=1212467&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDurationType.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDurationType.java Fri Dec 9 15:04:34 2011
@@ -27,8 +27,9 @@ import com.hp.hpl.jena.datatypes.xsd.*;
* avoid this proliferation of trivial types by use of reflection but
* since that causes allergic reactions in some we use brute force.
* <p>
- * This class includees code derived from Xerces 2.6.0 Copyright (c) 1999-2002 The Apache Software Foundation. All rights
- * reserved.
+ * This class includees code derived from Xerces 2.6.0
+ * Copyright (c) 1999-2002 The Apache Software Foundation.
+ * All rights reserved.
* </p>
*
* @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>