svn commit: r1418103 - in /jena/trunk/jena-sdb: bin/make_classpath bin/make_classpath_mvn pom.xml

[an...@apache.org]

Author: andy
Date: Thu Dec  6 21:57:14 2012
New Revision: 1418103

URL: http://svn.apache.org/viewvc?rev=1418103&view=rev
Log:
Align Jena versions

Modified:
    jena/trunk/jena-sdb/bin/make_classpath
    jena/trunk/jena-sdb/bin/make_classpath_mvn
    jena/trunk/jena-sdb/pom.xml

Modified: jena/trunk/jena-sdb/bin/make_classpath
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/bin/make_classpath?rev=1418103&r1=1418102&r2=1418103&view=diff
==============================================================================
--- jena/trunk/jena-sdb/bin/make_classpath (original)
+++ jena/trunk/jena-sdb/bin/make_classpath Thu Dec  6 21:57:14 2012
@@ -31,11 +31,6 @@ then
 DIRROOT=${DIRROOT%/}
 
 LIBDIR="$DIRROOT/lib"
-# List
-CPDIR1="$DIRROOT/classes"
-CPDIR2="$DIRROOT/target/classes"
-CPDIR3="$DIRROOT/target/classes-eclipse"
-ETCDIR="$DIRROOT/etc"
 
 # Cygwin - on Windows, the Java separator is ;
 # Alternative: Form in UNIX style, turn into windows form at the end.
@@ -76,17 +71,6 @@ for jar in "$LIBDIR"/*.jar
 ## 
 done
 
-# Prepend any classes/ directory
-# As it's "prepend", we need to do it in reverse.
-for dir in "$CPDIR3" "$CPDIR2" "$CPDIR1"
-do
-  if [ -e "$dir" ]
-      then
-      [ "$CP" != "" ] && CP="${SEP}${CP}"
-      CP="${dir}$CP"
-  fi
-done
-
 # Add DIRROOT
 #CP="${CP}${SEP}${DIRROOT}"
 

Modified: jena/trunk/jena-sdb/bin/make_classpath_mvn
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/bin/make_classpath_mvn?rev=1418103&r1=1418102&r2=1418103&view=diff
==============================================================================
--- jena/trunk/jena-sdb/bin/make_classpath_mvn (original)
+++ jena/trunk/jena-sdb/bin/make_classpath_mvn Thu Dec  6 21:57:14 2012
@@ -33,7 +33,18 @@ do
    CP="${CP}$M2_REPO$x"
 done
 
+# Add development systems
+
 [ -e "$DIRROOT/classes" ] && CP="$DIRROOT/classes:$CP"
 [ -e "$DIRROOT/target/classes" ] && CP="$DIRROOT/target/classes:$CP"
 
+for P in jena-core jena-arq
+do
+    [ -e "$DIRROOT/../$P/classes" ] && CP="$DIRROOT/../$P/classes:$CP"
+    [ -e "$DIRROOT/../$P/target/classes" ] && CP="$DIRROOT/../$P/target/classes:$CP"
+done
+
+
+
+
 echo "$CP"

Modified: jena/trunk/jena-sdb/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/pom.xml?rev=1418103&r1=1418102&r2=1418103&view=diff
==============================================================================
--- jena/trunk/jena-sdb/pom.xml (original)
+++ jena/trunk/jena-sdb/pom.xml Thu Dec  6 21:57:14 2012
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-parent</artifactId>
-    <version>4</version>
+    <version>5-SNAPSHOT</version>
     <relativePath>../jena-parent</relativePath>
   </parent>