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/02/29 19:16:32 UTC
svn commit: r1295200 - in /incubator/jena/Jena2/TDB/trunk: ChangeLog.txt
assembly.xml dist/dist-tdb-1.sh dist/dist-tdb.sh pom.xml
Author: andy
Date: Wed Feb 29 18:16:31 2012
New Revision: 1295200
URL: http://svn.apache.org/viewvc?rev=1295200&view=rev
Log:
Reset POM; tighten up distribution building; misc
Added:
incubator/jena/Jena2/TDB/trunk/dist/dist-tdb.sh
- copied, changed from r1294751, incubator/jena/Jena2/TDB/trunk/dist/dist-tdb-1.sh
Removed:
incubator/jena/Jena2/TDB/trunk/dist/dist-tdb-1.sh
Modified:
incubator/jena/Jena2/TDB/trunk/ChangeLog.txt
incubator/jena/Jena2/TDB/trunk/assembly.xml
incubator/jena/Jena2/TDB/trunk/pom.xml
Modified: incubator/jena/Jena2/TDB/trunk/ChangeLog.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/ChangeLog.txt?rev=1295200&r1=1295199&r2=1295200&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/ChangeLog.txt (original)
+++ incubator/jena/Jena2/TDB/trunk/ChangeLog.txt Wed Feb 29 18:16:31 2012
@@ -1,8 +1,6 @@
ChangeLog for TDB
=================
-==== TDB 0.9.1
-
==== TDB 0.9.0
TDB 0.9.0 introduces ACID transactions for TDB. This is based on write-ahead logging.
Modified: incubator/jena/Jena2/TDB/trunk/assembly.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/assembly.xml?rev=1295200&r1=1295199&r2=1295200&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/assembly.xml (original)
+++ incubator/jena/Jena2/TDB/trunk/assembly.xml Wed Feb 29 18:16:31 2012
@@ -20,7 +20,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="xmlns=http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
<id>distribution</id>
- <baseDirectory>apache-${project.artifactId}-${project.version}</baseDirectory>
+ <!-- Long term, we will name distributions, as opposed to individual jars apache-jena-... -->
+ <!-- <baseDirectory>apache-${project.artifactId}-${project.version}</baseDirectory> -->
+ <baseDirectory>${project.artifactId}-${project.version}</baseDirectory>
<formats>
<format>tar.gz</format>
<!--<format>tar.bz2</format>-->
Copied: incubator/jena/Jena2/TDB/trunk/dist/dist-tdb.sh (from r1294751, incubator/jena/Jena2/TDB/trunk/dist/dist-tdb-1.sh)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/dist/dist-tdb.sh?p2=incubator/jena/Jena2/TDB/trunk/dist/dist-tdb.sh&p1=incubator/jena/Jena2/TDB/trunk/dist/dist-tdb-1.sh&r1=1294751&r2=1295200&rev=1295200&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/dist/dist-tdb-1.sh (original)
+++ incubator/jena/Jena2/TDB/trunk/dist/dist-tdb.sh Wed Feb 29 18:16:31 2012
@@ -15,10 +15,13 @@
## 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)
-# sha1sum $F > $F.sha1
-# md5sum $F > $F.md5
# Layout: simple:
# /MOD-VER/
@@ -28,15 +31,13 @@
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"
-# This script collects everything for the incubator/dist/jena area
-# for a TDB release. It write a script that will build dist/.
-
ECHO=echo
CPCMD="$ECHO cp"
MKDIR="$ECHO mkdir -p"
@@ -63,8 +64,18 @@ cpfile()
$CPCMD "$SRC" "$DEST"
$CPCMD "${SRC}.asc" "$DEST"
local BASE="$(basename $FILE)"
- $ECHO "sha1sum $SRC > $DEST/${BASE}.sha1"
- $ECHO "md5sum $SRC > $DEST/${BASE}.md5"
+ 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
@@ -138,7 +149,46 @@ M=jena-tdb
V="${V_TDB}-$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/TDB/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/pom.xml?rev=1295200&r1=1295199&r2=1295200&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/pom.xml (original)
+++ incubator/jena/Jena2/TDB/trunk/pom.xml Wed Feb 29 18:16:31 2012
@@ -22,7 +22,7 @@
<artifactId>jena-tdb</artifactId>
<packaging>jar</packaging>
<name>TDB</name>
- <version>0.9.1-incubating-SNAPSHOT</version>
+ <version>0.9.0-incubating-SNAPSHOT</version>
<parent>
<groupId>org.apache.jena</groupId>