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 2012/03/01 12:29:46 UTC
svn commit: r1295520 - in /incubator/jena/Jena2/Fuseki/trunk: ChangeLog.txt
D.ttl SETUP.txt UP.ru books.ttl config-examples.ttl config-tdb.ttl desc.ttl
dist/dist-fuseki.sh fuseki-server.bat tdb2.ttl
Author: andy
Date: Thu Mar 1 11:29:46 2012
New Revision: 1295520
URL: http://svn.apache.org/viewvc?rev=1295520&view=rev
Log:
Release preparation
Removed:
incubator/jena/Jena2/Fuseki/trunk/D.ttl
incubator/jena/Jena2/Fuseki/trunk/SETUP.txt
incubator/jena/Jena2/Fuseki/trunk/UP.ru
incubator/jena/Jena2/Fuseki/trunk/books.ttl
incubator/jena/Jena2/Fuseki/trunk/desc.ttl
incubator/jena/Jena2/Fuseki/trunk/tdb2.ttl
Modified:
incubator/jena/Jena2/Fuseki/trunk/ChangeLog.txt
incubator/jena/Jena2/Fuseki/trunk/config-examples.ttl
incubator/jena/Jena2/Fuseki/trunk/config-tdb.ttl
incubator/jena/Jena2/Fuseki/trunk/dist/dist-fuseki.sh
incubator/jena/Jena2/Fuseki/trunk/fuseki-server.bat
Modified: incubator/jena/Jena2/Fuseki/trunk/ChangeLog.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/ChangeLog.txt?rev=1295520&r1=1295519&r2=1295520&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/ChangeLog.txt (original)
+++ incubator/jena/Jena2/Fuseki/trunk/ChangeLog.txt Thu Mar 1 11:29:46 2012
@@ -1,7 +1,5 @@
==== Fuseki
-== Version 1.0
-
== 0.2.1
+ Switch from JSPs to Velocity.
Modified: incubator/jena/Jena2/Fuseki/trunk/config-examples.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/config-examples.ttl?rev=1295520&r1=1295519&r2=1295520&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/config-examples.ttl (original)
+++ incubator/jena/Jena2/Fuseki/trunk/config-examples.ttl Thu Mar 1 11:29:46 2012
@@ -1,7 +1,10 @@
+# Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
+
+## A collection of example configurations for Fuseki
+
@prefix : <#> .
@prefix fuseki: <http://jena.apache.org/fuseki#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-## A collection of example configurations
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix tdb: <http://jena.hpl.hp.com/2008/tdb#> .
Modified: incubator/jena/Jena2/Fuseki/trunk/config-tdb.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/config-tdb.ttl?rev=1295520&r1=1295519&r2=1295520&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/config-tdb.ttl (original)
+++ incubator/jena/Jena2/Fuseki/trunk/config-tdb.ttl Thu Mar 1 11:29:46 2012
@@ -1,3 +1,5 @@
+# Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
+
## Example of a TDB dataset published using Fuseki
@prefix : <#> .
@@ -16,6 +18,7 @@
# ja:loadClass "your.code.Class" ;
fuseki:services (
+ <#service_tdb_read_only>
<#service_tdb_all>
) .
@@ -28,7 +31,7 @@ tdb:GraphTDB rdfs:subClassOf ja:Mode
## Updatable TDB dataset with all servcies enabled.
<#service_tdb_all> rdf:type fuseki:Service ;
- rdfs:label "TDB Service" ;
+ rdfs:label "TDB Service (R)" ;
fuseki:name "ds" ;
fuseki:serviceQuery "query" ;
fuseki:serviceQuery "sparql" ;
@@ -37,15 +40,33 @@ tdb:GraphTDB rdfs:subClassOf ja:Mode
fuseki:serviceReadWriteGraphStore "data" ;
# A separate read-only graph store endpoint:
fuseki:serviceReadGraphStore "get" ;
- fuseki:dataset <#tdb_dataset> ;
+ fuseki:dataset <#tdb_dataset_read> ;
.
+
+<#tdb_dataset_read> rdf:type tdb:DatasetTDB ;
+ tdb:location "DB1" ;
+ tdb:unionDefaultGraph true ;
+ .
+
## ---------------------------------------------------------------
-## TDB dataset with all
+## Updatable TDB dataset with all servcies enabled.
-<#tdb_dataset> rdf:type tdb:DatasetTDB ;
- tdb:location "DB" ;
+<#service_tdb_all> rdf:type fuseki:Service ;
+ rdfs:label "TDB Service (RW)" ;
+ fuseki:name "data" ;
+ fuseki:serviceQuery "query" ;
+ fuseki:serviceQuery "sparql" ;
+ fuseki:serviceUpdate "update" ;
+ fuseki:serviceUpload "upload" ;
+ fuseki:serviceReadWriteGraphStore "data" ;
+ # A separate read-only graph store endpoint:
+ fuseki:serviceReadGraphStore "get" ;
+ fuseki:dataset <#tdb_dataset_readwrite> ;
+ .
+
+<#tdb_dataset_readwrite> rdf:type tdb:DatasetTDB ;
+ tdb:location "DB2" ;
## # Query timeout on this dataset (milliseconds)
## ja:context [ ja:cxtName "arq:queryTimeout" ; ja:cxtValue "1000" ] ;
## # Default graph for query is the (read-only) union of all named graphs.
- tdb:unionDefaultGraph true ;
.
Modified: incubator/jena/Jena2/Fuseki/trunk/dist/dist-fuseki.sh
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/dist/dist-fuseki.sh?rev=1295520&r1=1295519&r2=1295520&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/dist/dist-fuseki.sh (original)
+++ incubator/jena/Jena2/Fuseki/trunk/dist/dist-fuseki.sh Thu Mar 1 11:29:46 2012
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
## Licensed to the Apache Software Foundation (ASF) under one
## or more contributor license agreements. See the NOTICE file
## distributed with this work for additional information
@@ -15,6 +15,14 @@
## See the License for the specific language governing permissions and
## limitations under the License.
+# This script collects everything for the
+# incubator/dist/jena area for a TDB release.
+
+# You need a copy of the maven-built-artifacts, toegther with the .asc files.
+# The .asc files should be created when the artifacts were created.
+# In emergencies, create the .asc
+# gpg --batch --armour --detach-sign F (creates $F.asc or use -o)
+
# Layout: simple:
# /MOD-VER/
@@ -23,15 +31,26 @@
REPO=${REPO:-}
if [ -z "$REPO" ]
then
- echo "REPO not set" 1>&2
+ echo "Environment variable REPO not set" 1>&2
+ echo "(set to the root of your maven local repository e.g. /home/user/.m2/repository )" 1>&2
exit 1
fi
REPO="$REPO/org/apache/jena"
OUT="dist"
-# Copy a file , and its associated asc md5 sha1, to a directory.
-# cpfile FILE DIR
-function cpfile
+ECHO=echo
+CPCMD="$ECHO cp"
+MKDIR="$ECHO mkdir -p"
+DELDIR="$ECHO rm -rf"
+
+echo "## Initalize"
+$DELDIR $OUT
+$MKDIR $OUT
+
+# Copy a file, and its associated asc, to a directory.
+# Create .md5 and .sha1 files.
+# cpfile FILE DIR
+cpfile()
{
local FILE="$1"
local DIR="$2"
@@ -39,33 +58,59 @@ function cpfile
local SRC="$REPO/$FILE"
local DEST="$OUT/$DIR"
- #[ -e "$SRC" ] || { echo "No such file: $SRC" 2>&1 ; exit 1 ; }
+ [ -e "$SRC" ] || { echo "No such file: $SRC" 2>&1 ; exit 1 ; }
#[ -d "$DEST" ] || { echo "Not a directory: $DEST" 2>&1 ; exit 1 ; }
$CPCMD "$SRC" "$DEST"
- #for ext in asc asc.md5 asc.sha1 md5 sha1
- for ext in asc md5 sha1
- do
- $CPCMD "$SRC.$ext" "$DEST"
- done
+ $CPCMD "${SRC}.asc" "$DEST"
+ local BASE="$(basename $FILE)"
+ chksum "$DEST" "$BASE"
+}
+
+chksum() # dir file
+{
+ local DIR="$1"
+ local FILE="$2"
+ $ECHO "("
+ $ECHO " cd $DIR > /dev/null"
+ $ECHO " md5sum $FILE > $FILE.md5"
+ $ECHO " sha1sum $FILE > $FILE.sha1"
+ $ECHO ")"
+}
+
+# Copy a file if it exists else add a comment
+cpfilemaybe()
+{
+ local FILE="$1"
+ local DIR="$2"
+ local SRC="$REPO/$FILE"
+
+
+ if [ -e "$SRC" ]
+ then
+ cpfile "$FILE" "$DIR"
+ else
+ echo "# ** Skipped: $FILE" 2>&1
+ fi
+
}
# Copy source-release files.
# cp_release MODULE VERSION
-function cp_release
+cp_release()
{
local M="$1"
local V="$2"
local D="$M-$V-$inc"
- local SRC="$M/$V-$inc/$M-$V-$inc-source-release"
- local DEST="$SRC_REL/$M-$V-$inc"
+ local SRC="$D/$M-$V-$inc-source-release"
+ local DEST="$M-$V-$inc"
$MKDIR "$OUT/$DEST"
for ext in zip # tar.gz tar.bz2
do
- #[ ! -e "$REPO/$SRC.ext" ] && { echo "No such file: $SRC.$ext" ; exit 1 ; }
+ #[ ! -e "$REPO/$SRC.ext" ] && { echo "No such file: $SRC.$ext" 2>&1 ; exit 1 ; }
cpfile "$SRC.$ext" $DEST
done
}
@@ -73,41 +118,76 @@ function cp_release
# Copy all the maven files
# jar, sources.jar, javadoc?,
# cpallfiles MODULE VERSION
-function cpallfiles
+cpallfiles()
{
# /download?
local M="$1"
local V="$2"
- local D="$DOWNLOAD/$M-$V-$inc"
+ local D="$BINARIES/$M-$V-$inc"
#[ ! -e "$OUT/$D" ] || { echo "Directory exists: $OUT/$D" 2>&1 ; exit 1 ; }
$MKDIR $OUT/$D
- cpfile "$M/$V-$inc/$M-$V-$inc.jar" $D
- cpfile "$M/$V-$inc/$M-$V-$inc-sources.jar" $D
- if [ -e "$REPO/$M/$V-$inc/$M-$V-$inc-javadoc.jar" ]
- then
- cpfile "$M/$V-$inc/$M-$V-$inc-javadoc.jar" $D
- else
- $ECHO echo "No javadoc: $REPO/$M/$V-$inc/$M-$V-$inc-javadoc.jar"
- fi
-}
-## ToDo: automate
+ for ext in zip tar.gz tar.bz2
+ do
+ cpfilemaybe "$M/$V-$inc/$M-$V-$inc-distribution.${ext}" $D
+ done
-V_FUSEKI=0.2.1
-inc=incubating
+}
## ToDo: automate
-V_TDB=0.9.0
+VER=0.2.1
inc=incubating
-M=jena-tdb
-V="${V_TDB}-$inc"
+## source-release
+echo
+echo "# source-release"
+
+M=jena-fuseki
+V="${VER}-$inc"
D="$M-$V"
+## Just the distribution and source-release
$MKDIR "$OUT/$M-$V"
cpfile "$M/$V/$M-$V-source-release.zip" $D
cpfile "$M/$V/$M-$V-distribution.zip" $D
cpfile "$M/$V/$M-$V-distribution.tar.gz" $D
+
+
+## ## If include maven artifacts and distribution.
+## echo
+## echo "## TDB"
+## cpallfiles jena-tdb "${V_TDB}"
+
+
+## ## If include a separate different copy of the distribution for easy finding.
+## if [ "$DOWNLOAD_COPY" = 1 ]
+## then
+## # Distribution
+## echo
+## echo "## zip"
+## M=jena-tdb
+## V=${V_TDB}
+## D="$M-$V-$inc"
+## cpfile $M/$V-$inc/$D-distribution.zip $DOWNLOAD
+## cpfilemaybe $M/$V-$inc/$D-distribution.tar.gz $DOWNLOAD
+## cpfilemaybe $M/$V-$inc/$D-distribution.tar.bz2 $DOWNLOAD
+##
+## echo
+## echo "# Distribution"
+## # Fix the name.
+##
+## for ext1 in zip tar.gz # tar.bz2
+## do
+## for ext2 in "" .asc .md5 .sha1
+## do
+## ext="$ext1$ext2"
+## F=$OUT/$DOWNLOAD/$D-distribution.$ext
+## $ECHO mv $F $OUT/$DOWNLOAD/apache-$D-distribution.$ext
+## done
+## done
+## fi
+
+
Modified: incubator/jena/Jena2/Fuseki/trunk/fuseki-server.bat
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/fuseki-server.bat?rev=1295520&r1=1295519&r2=1295520&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/fuseki-server.bat (original)
+++ incubator/jena/Jena2/Fuseki/trunk/fuseki-server.bat Thu Mar 1 11:29:46 2012
@@ -1,2 +1,3 @@
@echo off
-java -Xmx1200M -jar fuseki-sys.jar %*
+@REM modify this to name the server jar
+java -Xmx1200M -jar jena-fuseki-*-server.jar %*