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/18 17:32:26 UTC

svn commit: r1220452 - in /incubator/jena: Jena2/ARQ/trunk/ Jena2/Fuseki/trunk/ Jena2/IRI/trunk/ Jena2/Joseki/trunk/ Jena2/SDB/trunk/ Jena2/TDB/trunk/ Jena2/jena/trunk/ Scratch/AFS/Jena-Dev/trunk/ Scratch/AFS/Jena-Dev/trunk/src/dev/

Author: andy
Date: Sun Dec 18 16:32:25 2011
New Revision: 1220452

URL: http://svn.apache.org/viewvc?rev=1220452&view=rev
Log:
Tidy up and correct after first release attempt.

Added:
    incubator/jena/Jena2/Fuseki/trunk/DEPENDENCIES
    incubator/jena/Jena2/SDB/trunk/DEPENDENCIES
    incubator/jena/Jena2/TDB/trunk/DEPENDENCIES
    incubator/jena/Jena2/jena/trunk/DEPENDENCIES
Modified:
    incubator/jena/Jena2/ARQ/trunk/BUILD
    incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt
    incubator/jena/Jena2/ARQ/trunk/DEPENDENCIES
    incubator/jena/Jena2/ARQ/trunk/README.txt
    incubator/jena/Jena2/Fuseki/trunk/.classpath
    incubator/jena/Jena2/Fuseki/trunk/pom.xml
    incubator/jena/Jena2/IRI/trunk/BUILD
    incubator/jena/Jena2/Joseki/trunk/pom.xml
    incubator/jena/Jena2/SDB/trunk/BUILD
    incubator/jena/Jena2/TDB/trunk/BUILD
    incubator/jena/Jena2/TDB/trunk/assembly.xml
    incubator/jena/Jena2/TDB/trunk/pom.xml
    incubator/jena/Jena2/jena/trunk/BUILD
    incubator/jena/Jena2/jena/trunk/README.txt
    incubator/jena/Jena2/jena/trunk/ReleaseNotes.txt
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/D.ttl
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java

Modified: incubator/jena/Jena2/ARQ/trunk/BUILD
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/BUILD?rev=1220452&r1=1220451&r2=1220452&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/BUILD (original)
+++ incubator/jena/Jena2/ARQ/trunk/BUILD Sun Dec 18 16:32:25 2011
@@ -35,7 +35,7 @@ The file with extension .asc contains th
 
 For the zip file of the zzz module:
 
-    gpg --verify jena-zzz-VER-incubator-source-release.zip.asc
+    gpg --verify jena-zzz-VER-incubating-source-release.zip.asc
 
 == Verify a checksum
 
@@ -44,16 +44,16 @@ respectively.  Calculate the checksum on
 
 Exampale (linux):
 
-    md5sum jena-zzz-VER-incubator-source-release.zip
+    md5sum jena-zzz-VER-incubating-source-release.zip
 
 == Unpack the file.
 
-   unzip -q jena-zzz-VER-incubator-source-release.zip
+   unzip -q jena-zzz-VER-incubating-source-release.zip
 
-will create a directory "jena-zzz-VER-incubator" with the files needed to
+will create a directory "jena-zzz-VER-incubating" with the files needed to
 recreate the distribution.
 
-   cd jena-zzz-VER-incubator
+   cd jena-zzz-VER-incubating
 
 == Ensure the dependecies are available
 

Modified: incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt?rev=1220452&r1=1220451&r2=1220452&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt (original)
+++ incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt Sun Dec 18 16:32:25 2011
@@ -1,7 +1,9 @@
 ChangeLog for ARQ
 =================
 
-==== ARQ 2.8.9
+==== ARQ 2.9.1
+
+==== ARQ 2.8.9 / 2.9.0
 ** Java 6 is now required for running ARQ.
 
 + ARQ: Provides \-escapes for characters ~.-!$&'()*+,;=:/?#@% in local part of prefix names 

Modified: incubator/jena/Jena2/ARQ/trunk/DEPENDENCIES
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/DEPENDENCIES?rev=1220452&r1=1220451&r2=1220452&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/DEPENDENCIES (original)
+++ incubator/jena/Jena2/ARQ/trunk/DEPENDENCIES Sun Dec 18 16:32:25 2011
@@ -17,6 +17,3 @@ SLF4J : http://www.slf4j.org/
 
 JUnit : http://junit.org/
   Common Public License - v 1.0
-  
-WoodSToX StAX parser http://woodstox.codehaus.org/
-  Apache Software License

Modified: incubator/jena/Jena2/ARQ/trunk/README.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/README.txt?rev=1220452&r1=1220451&r2=1220452&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/README.txt (original)
+++ incubator/jena/Jena2/ARQ/trunk/README.txt Sun Dec 18 16:32:25 2011
@@ -62,7 +62,7 @@ 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.
+Set environment variable ARQROOT to the path of this direrctory.
 
 Maven Distribution
 ------------------

Modified: incubator/jena/Jena2/Fuseki/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/.classpath?rev=1220452&r1=1220451&r2=1220452&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/.classpath (original)
+++ incubator/jena/Jena2/Fuseki/trunk/.classpath Sun Dec 18 16:32:25 2011
@@ -7,24 +7,24 @@
   <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
 
   <classpathentry kind="var" 
-		  path="M2_REPO/org/apache/jena/jena-arq/2.9.1-incubating-SNAPSHOT/jena-arq-2.9.1-incubating-SNAPSHOT.jar" 
-		  sourcepath="M2_REPO/org/apache/jena/jena-arq/2.9.1-incubating-SNAPSHOT/jena-arq-2.9.1-incubating-SNAPSHOT-sources.jar"/>
+		  path="M2_REPO/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating.jar" 
+		  sourcepath="M2_REPO/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating-sources.jar"/>
 
   <classpathentry kind="var" 
-		  path="M2_REPO/org/apache/jena/jena-iri/0.9.1-incubating-SNAPSHOT/jena-iri-0.9.1-incubating-SNAPSHOT.jar"
-		  sourcepath="M2_REPO/org/apache/jena/jena-iri/0.9.1-incubating-SNAPSHOT/jena-iri-0.9.1-incubating-SNAPSHOT-sources.jar"/>
+		  path="M2_REPO/org/apache/jena/jena-iri/0.9.0-incubating/jena-iri-0.9.0-incubating.jar"
+		  sourcepath="M2_REPO/org/apache/jena/jena-iri/0.9.0-incubating/jena-iri-0.9.0-incubating-sources.jar"/>
   
   <classpathentry kind="var" 
-		  path="M2_REPO/org/apache/jena/jena-core/2.7.1-incubating-SNAPSHOT/jena-core-2.7.1-incubating-SNAPSHOT.jar" 
-		  sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.1-incubating-SNAPSHOT/jena-core-2.7.1-incubating-SNAPSHOT-sources.jar"/>
+		  path="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating.jar" 
+		  sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating-sources.jar"/>
 
   <classpathentry kind="var"
-		  path="M2_REPO/org/apache/jena/jena-arq/2.9.1-incubating-SNAPSHOT/jena-arq-2.9.1-incubating-SNAPSHOT-tests.jar" 
-		  sourcepath="M2_REPO/org/apache/jena/jena-arq/2.9.1-incubating-SNAPSHOT/jena-arq-2.9.1-incubating-SNAPSHOT-test-sources.jar"/>
+		  path="M2_REPO/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating-tests.jar" 
+		  sourcepath="M2_REPO/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating-test-sources.jar"/>
 
   <classpathentry kind="var" 
-		  path="M2_REPO/org/apache/jena/jena-core/2.7.1-incubating-SNAPSHOT/jena-core-2.7.1-incubating-SNAPSHOT-tests.jar" 
-		  sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.1-incubating-SNAPSHOT/jena-core-2.7.1-incubating-SNAPSHOT-test-sources.jar"/>
+		  path="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating-tests.jar" 
+		  sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating-test-sources.jar"/>
 
   <classpathentry kind="var" 
 		  path="M2_REPO/org/apache/jena/jena-tdb/0.9.0-incubating-SNAPSHOT/jena-tdb-0.9.0-incubating-SNAPSHOT.jar" 

Added: incubator/jena/Jena2/Fuseki/trunk/DEPENDENCIES
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/DEPENDENCIES?rev=1220452&view=auto
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/DEPENDENCIES (added)
+++ incubator/jena/Jena2/Fuseki/trunk/DEPENDENCIES Sun Dec 18 16:32:25 2011
@@ -0,0 +1,24 @@
+This file lists the dependences for ARQ.
+  Version numbers are given in the POM file for a particular distribution. 
+
+Apache Projects:   Apache Software License
+  Apache Jena, including the Jena IRI library
+  Apache Xerces-J
+  Apache log4j
+  Apache HttpComponents (HTTP Client)
+  Apache Commons Codec
+  Apache Common FileUpload
+
+ICU4J : http://icu-project.org/
+   IBM X License (to version ICU4J 3.4.4)
+
+SLF4J : http://www.slf4j.org/
+  Copyright (c) 2004-2008 QOS.ch
+  MIT License
+
+JUnit : http://junit.org/
+  Common Public License - v 1.0
+
+Jetty: http://www.eclipse.org/jetty/
+  Apache License 2.0 
+  (also avilable under Eclipse Public License 1.0)

Modified: incubator/jena/Jena2/Fuseki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/pom.xml?rev=1220452&r1=1220451&r2=1220452&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/pom.xml (original)
+++ incubator/jena/Jena2/Fuseki/trunk/pom.xml Sun Dec 18 16:32:25 2011
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-top</artifactId>
-    <version>1-incubating-SNAPSHOT</version>
+    <version>0-incubating</version>
   </parent> 
 
   <organization>
@@ -45,15 +45,26 @@
   </licenses>
 
   <scm>
-    <connection>scm:svn:https://svn.apache.org/repos/asf/incubator/jena/Jena2/Fuseki/</connection>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/jena/Jena2/Fuseki/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/jena/Jena2/Fuseki/trunk</developerConnection>
     <url>http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/</url>
   </scm>
 
-  <!-- Problems with additional artifacts:
-       Any names set here are lost on installation.
-         Solution: use install:install-file.
-	 Solution: separate artifacts (heavyweight)
-  -->
+
+  <!-- Testing against staged artifacts -->
+  <repositories>
+    <repository>
+      <id>apache.jena.staging</id>
+      <name>Apache jena Staging Repository</name>
+      <url>https://repository.apache.org/content/repositories/orgapachejena-334</url>
+      <releases>
+	<enabled>true</enabled>
+      </releases>
+      <snapshots>
+	<enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
 
   <properties>
     <this.root>${project.artifactId}-${project.version}</this.root>
@@ -66,9 +77,9 @@
     <assembly.soh.name>${this.root}</assembly.soh.name>
     <assembly.zip.name>${this.root}</assembly.zip.name>
 
-    <ver.jena>2.7.1-incubating-SNAPSHOT</ver.jena>
-    <ver.arq>2.9.1-incubating-SNAPSHOT</ver.arq>
-    <ver.tdb>0.9.1-incubating-SNAPSHOT</ver.tdb>
+    <ver.jena>2.7.0-incubating</ver.jena>
+    <ver.arq>2.9.0-incubating</ver.arq>
+    <ver.tdb>0.9.0-incubating-SNAPSHOT</ver.tdb>
 
     <!-- These two go together -->
     <ver.jetty>7.2.1.v20101111</ver.jetty>

Modified: incubator/jena/Jena2/IRI/trunk/BUILD
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/IRI/trunk/BUILD?rev=1220452&r1=1220451&r2=1220452&view=diff
==============================================================================
--- incubator/jena/Jena2/IRI/trunk/BUILD (original)
+++ incubator/jena/Jena2/IRI/trunk/BUILD Sun Dec 18 16:32:25 2011
@@ -35,7 +35,7 @@ The file with extension .asc contains th
 
 For the zip file of the zzz module:
 
-    gpg --verify jena-zzz-VER-incubator-source-release.zip.asc
+    gpg --verify jena-zzz-VER-incubating-source-release.zip.asc
 
 == Verify a checksum
 
@@ -44,16 +44,16 @@ respectively.  Calculate the checksum on
 
 Exampale (linux):
 
-    md5sum jena-zzz-VER-incubator-source-release.zip
+    md5sum jena-zzz-VER-incubating-source-release.zip
 
 == Unpack the file.
 
-   unzip -q jena-zzz-VER-incubator-source-release.zip
+   unzip -q jena-zzz-VER-incubating-source-release.zip
 
-will create a directory "jena-zzz-VER-incubator" with the files needed to
+will create a directory "jena-zzz-VER-incubating" with the files needed to
 recreate the distribution.
 
-   cd jena-zzz-VER-incubator
+   cd jena-zzz-VER-incubating
 
 == Ensure the dependecies are available
 

Modified: incubator/jena/Jena2/Joseki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Joseki/trunk/pom.xml?rev=1220452&r1=1220451&r2=1220452&view=diff
==============================================================================
--- incubator/jena/Jena2/Joseki/trunk/pom.xml (original)
+++ incubator/jena/Jena2/Joseki/trunk/pom.xml Sun Dec 18 16:32:25 2011
@@ -13,37 +13,37 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-top</artifactId>
-    <version>0-incubating-SNAPSHOT</version>
+    <version>1-incubating-SNAPSHOT</version>
   </parent>
 
   <organization>
-    <name>The Jena Project</name>
-    <url>http://www.openjena.org/</url>
+    <name>Apache Jena</name>
+    <url>http://incubator.apache.org/jena</url>
   </organization>
 
   <licenses>
     <license>
-      <name>BSD-style license</name>
-      <url>http://joseki.org/license.html</url>
+      <name>Apache 2.0 License</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
     </license>
   </licenses>
 
   <scm>
-    <connection>scm:cvs:pserver:anonymous@joseki.cvs.sourceforge.net:/cvsroot/joseki:Joseki3</connection>
-    <url>http://jena.svn.sourceforge.net/</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/jena/Jena2/Joseki/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/jena/Jena2/Joseki/trunk</developerConnection>
+    <url>http://svn.apache.org/viewvc/incubator/jena/Jena2/Joseki</url>
   </scm>
 
   <properties>
     <this.root>${project.artifactId}-${project.version}</this.root>
-    <ver.jena>2.6.4</ver.jena>
-    <ver.arq>2.8.9-SNAPSHOT</ver.arq>
-    <ver.tdb>0.8.11-SNAPSHOT</ver.tdb>
+    <ver.jena>2.7.1-SNAPSHOT</ver.jena>
+    <ver.arq>2.9.1-SNAPSHOT</ver.arq>
+    <ver.tdb>0.9.1-SNAPSHOT</ver.tdb>
     <ver.sdb>1.3.5-SNAPSHOT</ver.sdb>
   </properties>
 
   <dependencies>
 
-    <!-- References Jena -->
      <dependency>
       <groupId>com.hp.hpl.jena</groupId>
       <artifactId>arq</artifactId>
@@ -89,7 +89,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
+      <version>4.9</version>
     </dependency>
 
     <dependency>
@@ -101,20 +101,20 @@
      <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.5.8</version>
+      <version>1.6.4</version>
     </dependency>
 
      <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.8</version>
+      <version>1.6.4</version>
     </dependency>
 
     <!-- Needed because the Joseki test suite resets logging levels -->
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
+      <version>1.2.16</version>
       <exclusions>
 	<exclusion>
 	  <groupId>javax.jms</groupId>

Modified: incubator/jena/Jena2/SDB/trunk/BUILD
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/BUILD?rev=1220452&r1=1220451&r2=1220452&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/BUILD (original)
+++ incubator/jena/Jena2/SDB/trunk/BUILD Sun Dec 18 16:32:25 2011
@@ -37,7 +37,7 @@ The file with extension .asc contains th
 
 For the zip file of the zzz module:
 
-    gpg --verify jena-zzz-VER-incubator-source-release.zip.asc
+    gpg --verify jena-zzz-VER-incubating-source-release.zip.asc
 
 == Verify a checksum
 
@@ -46,16 +46,16 @@ respectively.  Calculate the checksum on
 
 Exampale (linux):
 
-    md5sum jena-zzz-VER-incubator-source-release.zip
+    md5sum jena-zzz-VER-incubating-source-release.zip
 
 == Unpack the file.
 
-   unzip -q jena-zzz-VER-incubator-source-release.zip
+   unzip -q jena-zzz-VER-incubating-source-release.zip
 
-will create a directory "jena-zzz-VER-incubator" with the files needed to
+will create a directory "jena-zzz-VER-incubating" with the files needed to
 recreate the distribution.
 
-   cd jena-zzz-VER-incubator
+   cd jena-zzz-VER-incubating
 
 == Ensure the dependecies are available
 

Added: incubator/jena/Jena2/SDB/trunk/DEPENDENCIES
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/DEPENDENCIES?rev=1220452&view=auto
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/DEPENDENCIES (added)
+++ incubator/jena/Jena2/SDB/trunk/DEPENDENCIES Sun Dec 18 16:32:25 2011
@@ -0,0 +1,19 @@
+This file lists the dependences for ARQ.
+  Version numbers are given in the POM file for a particular distribution. 
+
+Apache Projects:   Apache Software License
+  Apache Jena, including the Jena IRI library
+  Apache Xerces-J
+  Apache log4j
+  Apache HttpComponents (HTTP Client)
+  Apache Commons Codec
+
+ICU4J : http://icu-project.org/
+   IBM X License (to version ICU4J 3.4.4)
+
+SLF4J : http://www.slf4j.org/
+  Copyright (c) 2004-2008 QOS.ch
+  MIT License
+
+JUnit : http://junit.org/
+  Common Public License - v 1.0

Modified: incubator/jena/Jena2/TDB/trunk/BUILD
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/BUILD?rev=1220452&r1=1220451&r2=1220452&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/BUILD (original)
+++ incubator/jena/Jena2/TDB/trunk/BUILD Sun Dec 18 16:32:25 2011
@@ -37,7 +37,7 @@ The file with extension .asc contains th
 
 For the zip file of the zzz module:
 
-    gpg --verify jena-zzz-VER-incubator-source-release.zip.asc
+    gpg --verify jena-zzz-VER-incubating-source-release.zip.asc
 
 == Verify a checksum
 
@@ -46,16 +46,16 @@ respectively.  Calculate the checksum on
 
 Exampale (linux):
 
-    md5sum jena-zzz-VER-incubator-source-release.zip
+    md5sum jena-zzz-VER-incubating-source-release.zip
 
 == Unpack the file.
 
-   unzip -q jena-zzz-VER-incubator-source-release.zip
+   unzip -q jena-zzz-VER-incubating-source-release.zip
 
-will create a directory "jena-zzz-VER-incubator" with the files needed to
+will create a directory "jena-zzz-VER-incubating" with the files needed to
 recreate the distribution.
 
-   cd jena-zzz-VER-incubator
+   cd jena-zzz-VER-incubating
 
 == Ensure the dependecies are available
 

Added: incubator/jena/Jena2/TDB/trunk/DEPENDENCIES
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/DEPENDENCIES?rev=1220452&view=auto
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/DEPENDENCIES (added)
+++ incubator/jena/Jena2/TDB/trunk/DEPENDENCIES Sun Dec 18 16:32:25 2011
@@ -0,0 +1,19 @@
+This file lists the dependences for ARQ.
+  Version numbers are given in the POM file for a particular distribution. 
+
+Apache Projects:   Apache Software License
+  Apache Jena, including the Jena IRI library
+  Apache Xerces-J
+  Apache log4j
+  Apache HttpComponents (HTTP Client)
+  Apache Commons Codec
+
+ICU4J : http://icu-project.org/
+   IBM X License (to version ICU4J 3.4.4)
+
+SLF4J : http://www.slf4j.org/
+  Copyright (c) 2004-2008 QOS.ch
+  MIT License
+
+JUnit : http://junit.org/
+  Common Public License - v 1.0

Modified: incubator/jena/Jena2/TDB/trunk/assembly.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/assembly.xml?rev=1220452&r1=1220451&r2=1220452&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/assembly.xml (original)
+++ incubator/jena/Jena2/TDB/trunk/assembly.xml Sun Dec 18 16:32:25 2011
@@ -32,7 +32,6 @@
   <dependencySets>
     <dependencySet>
       <unpack>false</unpack>
-      <scope>test</scope>
       <outputDirectory>lib</outputDirectory>
     </dependencySet>
   </dependencySets>

Modified: incubator/jena/Jena2/TDB/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/pom.xml?rev=1220452&r1=1220451&r2=1220452&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/pom.xml (original)
+++ incubator/jena/Jena2/TDB/trunk/pom.xml Sun Dec 18 16:32:25 2011
@@ -51,11 +51,12 @@
 
   </properties>
 
+  <!-- Testing against staged artifacts -->
   <repositories>
     <repository>
       <id>apache.jena.staging</id>
       <name>Apache jena Staging Repository</name>
-      <url>https://repository.apache.org/content/repositories/orgapachejena-334/</url>
+      <url>https://repository.apache.org/content/repositories/orgapachejena-334</url>
       <releases>
         <enabled>true</enabled>
       </releases>

Modified: incubator/jena/Jena2/jena/trunk/BUILD
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/BUILD?rev=1220452&r1=1220451&r2=1220452&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/BUILD (original)
+++ incubator/jena/Jena2/jena/trunk/BUILD Sun Dec 18 16:32:25 2011
@@ -35,7 +35,7 @@ The file with extension .asc contains th
 
 For the zip file of the zzz module:
 
-    gpg --verify jena-zzz-VER-incubator-source-release.zip.asc
+    gpg --verify jena-zzz-VER-incubating-source-release.zip.asc
 
 == Verify a checksum
 
@@ -44,16 +44,16 @@ respectively.  Calculate the checksum on
 
 Exampale (linux):
 
-    md5sum jena-zzz-VER-incubator-source-release.zip
+    md5sum jena-zzz-VER-incubating-source-release.zip
 
 == Unpack the file.
 
-   unzip -q jena-zzz-VER-incubator-source-release.zip
+   unzip -q jena-zzz-VER-incubating-source-release.zip
 
-will create a directory "jena-zzz-VER-incubator" with the files needed to
+will create a directory "jena-zzz-VER-incubating" with the files needed to
 recreate the distribution.
 
-   cd jena-zzz-VER-incubator
+   cd jena-zzz-VER-incubating
 
 == Ensure the dependecies are available
 

Added: incubator/jena/Jena2/jena/trunk/DEPENDENCIES
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/DEPENDENCIES?rev=1220452&view=auto
==============================================================================
--- incubator/jena/Jena2/jena/trunk/DEPENDENCIES (added)
+++ incubator/jena/Jena2/jena/trunk/DEPENDENCIES Sun Dec 18 16:32:25 2011
@@ -0,0 +1,17 @@
+This file lists the dependences for ARQ.
+  Version numbers are given in the POM file for a particular distribution. 
+
+Apache Projects:   Apache Software License
+  Apache Jena, including the Jena IRI library
+  Apache Xerces-J
+  Apache log4j
+
+ICU4J : http://icu-project.org/
+   IBM X License (to version ICU4J 3.4.4)
+
+SLF4J : http://www.slf4j.org/
+  Copyright (c) 2004-2008 QOS.ch
+  MIT License
+
+JUnit : http://junit.org/
+  Common Public License - v 1.0

Modified: incubator/jena/Jena2/jena/trunk/README.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/README.txt?rev=1220452&r1=1220451&r2=1220452&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/README.txt (original)
+++ incubator/jena/Jena2/jena/trunk/README.txt Sun Dec 18 16:32:25 2011
@@ -4,8 +4,6 @@ Jena2 README
 Welcome to Apache Jena,  a Java framework for 
 writing Semantic Web applications.
 
-The full readme is in doc/readme.html. 
-
 Documentation can be found on the web at
 http://incubator.apache.org/jena
 

Modified: incubator/jena/Jena2/jena/trunk/ReleaseNotes.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/ReleaseNotes.txt?rev=1220452&r1=1220451&r2=1220452&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/ReleaseNotes.txt (original)
+++ incubator/jena/Jena2/jena/trunk/ReleaseNotes.txt Sun Dec 18 16:32:25 2011
@@ -1,10 +1,12 @@
 Release Notes 
 =============
 
-==== Jena 2.6.5
+==== Jena 2.7.1
+
+==== Jena 2.6.5 / 2.7.0
 
 ** Java 6 is now required for running Jena.
-** The deprecate RDB subsystem has been removed.  Please use TDB or SDB.
+** The deprecated RDB subsystem has been removed.  Please use TDB or SDB.
 
 ==== Jena 2.6.4
 

Modified: incubator/jena/Scratch/AFS/Jena-Dev/trunk/D.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/D.ttl?rev=1220452&r1=1220451&r2=1220452&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java?rev=1220452&r1=1220451&r2=1220452&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java (original)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java Sun Dec 18 16:32:25 2011
@@ -18,6 +18,7 @@
 
 package dev;
 
+import java.io.File ;
 import java.io.FileInputStream ;
 import java.io.InputStream ;
 import java.util.ArrayList ;
@@ -32,12 +33,15 @@ import org.openjena.atlas.logging.Log ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.query.* ;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.RDFReader ;
 import com.hp.hpl.jena.sparql.function.FunctionRegistry ;
 import com.hp.hpl.jena.sparql.function.library.wait ;
 import com.hp.hpl.jena.sparql.lang.SyntaxVarScope ;
 import com.hp.hpl.jena.sparql.sse.SSE ;
 import com.hp.hpl.jena.tdb.DatasetGraphTxn ;
 import com.hp.hpl.jena.tdb.StoreConnection ;
+import com.hp.hpl.jena.tdb.TDBFactory ;
 import com.hp.hpl.jena.tdb.TDBLoader ;
 import com.hp.hpl.jena.tdb.base.file.FileFactory ;
 import com.hp.hpl.jena.tdb.base.objectfile.ObjectFile ;
@@ -58,6 +62,16 @@ public class Run extends RunBase
     
     public static void main(String[] argv) throws Exception
     {
+        Dataset ds = TDBFactory.createDataset( "DB" ) ; // tdbDest is a String
+        Model model = ds.getDefaultModel() ;
+
+        RDFReader rdfRdr = model.getReader( "TTL" );
+        File f = new File( "D.ttl" ); // ttlDir is a File, fn is a String
+        InputStream dataStream = new FileInputStream( f );
+        rdfRdr.read( model, dataStream, null ); // <-- this is where the error occurs
+        dataStream.close(); 
+        exit(0) ;
+        
         RecordFactory recordFactory = new RecordFactory(SystemTDB.LenNodeHash, SystemTDB.SizeOfNodeId) ;
         Index nodeIndex = new IndexMap(recordFactory) ;
         ObjectFile objectFile = FileFactory.createObjectFileMem("mem") ;