svn commit: r1771040 - in /jena/dist: Javadoc/Skeleton/elephas/index.mdtext Javadoc/prepare-javadoc README

[an...@apache.org]

Author: andy
Date: Wed Nov 23 20:19:37 2016
New Revision: 1771040

URL: http://svn.apache.org/viewvc?rev=1771040&view=rev
Log:
Update Elephas

Modified:
    jena/dist/Javadoc/Skeleton/elephas/index.mdtext
    jena/dist/Javadoc/prepare-javadoc
    jena/dist/README

Modified: jena/dist/Javadoc/Skeleton/elephas/index.mdtext
URL: http://svn.apache.org/viewvc/jena/dist/Javadoc/Skeleton/elephas/index.mdtext?rev=1771040&r1=1771039&r2=1771040&view=diff
==============================================================================
--- jena/dist/Javadoc/Skeleton/elephas/index.mdtext (original)
+++ jena/dist/Javadoc/Skeleton/elephas/index.mdtext Wed Nov 23 20:19:37 2016
@@ -2,6 +2,6 @@ Title: Jena Elephas JavaDoc
 
 JavaDoc automatically generates detailed class and method documentation from the Jena source code.
 
- - [Elephas Common API JavaDoc](common/index.html)
- - [Elephas IO API JavaDoc](io/index.html)
- - [Elephas Map/Reduce API JavaDoc](mapred/index.html)
+ - [Elephas Common API JavaDoc](elephas-common/index.html)
+ - [Elephas IO API JavaDoc](elephas-io/index.html)
+ - [Elephas Map/Reduce API JavaDoc](elephas-mapreduce/index.html)

Modified: jena/dist/Javadoc/prepare-javadoc
URL: http://svn.apache.org/viewvc/jena/dist/Javadoc/prepare-javadoc?rev=1771040&r1=1771039&r2=1771040&view=diff
==============================================================================
--- jena/dist/Javadoc/prepare-javadoc (original)
+++ jena/dist/Javadoc/prepare-javadoc Wed Nov 23 20:19:37 2016
@@ -1,21 +1,24 @@
-#!/bin/bash
+#!/bin/bash -x
+set -e
 
 ## Get copies of the necessary javadoc.jar files,
-## and build a new jaavdoc tree in J/
+## and build a new javadoc tree in J/
 
 rm -rf J
 cp -R Skeleton J
 
 ## **** Adjust these settings.
-#MVN="http://central.maven.org/maven2/org/apache/jena"
-MVN="https://repository.apache.org/content/repositories/orgapachejena-1010/"
-# If you have a local copy of the Jena release build , set LOCAL to that directory
-LOCAL="$HOME/ASF/jena-dist/REPO/org/apache/jena/"
+##REPO="http://central.maven.org/maven2/org/apache/jena"
+REPO="https://repository.apache.org/content/repositories/orgapachejena-1013/"
+
+## If you have a local copy of the Jena release build, set LOCAL to that directory
+## REPo is ignores.
+LOCAL="$HOME/ASF/Release/dist-tools/REPO/org/apache/jena"
 
 ## **** Adjust these settings.
-VER=3.0.1
-VER_FU1=1.3.1
-VER_FU2=2.3.1
+VER=3.1.0
+VER_FU1=1.4.0
+VER_FU2=2.4.0
 
 ## Should be OK from here.
 
@@ -35,7 +38,7 @@ function fetch() {
     then
 	if [[ -z $LOCAL ]]
 	then
-	    local U="$MVN/jena-$M/$V/$F"
+	    local U="$REPO/jena-$M/$V/$F"
 	    echo "== fetch $U"
 	    wget -nc $U
 	else
@@ -52,8 +55,7 @@ function fetchunpack() {
     
     rm -rf "J/$M"
     mkdir "J/$M"
-    ( cd "J/$M">/dev/null ; unzip -q ../../$F )
-
+    ( cd "J/$M" ; unzip -q ../../$F )
 }
 
 if [[ true ]]
@@ -82,9 +84,9 @@ fi
     mv core jena
     mv fuseki-core fuseki2
     mv jdbc-driver-bundle jdbc
-    mv elephas-common elephas/common
-    mv elephas-mapreduce elephas/mapred
-    mv elephas-io elephas/io
+    mv elephas-common elephas/
+    mv elephas-mapreduce elephas/
+    mv elephas-io elephas/
     mv querybuilder extras
 )
 

Modified: jena/dist/README
URL: http://svn.apache.org/viewvc/jena/dist/README?rev=1771040&r1=1771039&r2=1771040&view=diff
==============================================================================
--- jena/dist/README (original)
+++ jena/dist/README Wed Nov 23 20:19:37 2016
@@ -2,10 +2,19 @@
 
 See https://cwiki.apache.org/confluence/display/JENA/Release+Process
 
-dist.st
+dist.sh
   Makes the distribution directory hierarchiy (source and binaries).
+  This assumes the files have been downloaded/copied lcoally beforehand.
 
 Javadoc/
   Helper tools for build the javadoc.
-  Check Javadoc/preparte-javadoc for local settings before running.
+  Check Javadoc/prepare-javadoc for local settings before running.
+  
+
+-----------------------------
+Work-in-progress:
+
+dist2.sh
+  New vesion of dist.sh that downloads only the necessary files once,
+  and then builds the "jena-dist" area.