Remove -SNAPSHOT jars, and obsolete old jars

BuildSetup.cmake

@@ -27,7 +27,7 @@ SET( ILC_HOME "/afs/desy.de/group/it/ilcsoft"
 
 #  ---- SL4 
 # Path to Java
-SET( JAVA_HOME "${ILC_HOME}/java/1.6.0"
+SET( JAVA_HOME "/usr/lib/jvm/java-6-sun"
     CACHE PATH "Path to Java" FORCE )
 
 #  ---- SL3 
@@ -59,6 +59,7 @@ SET( JAVA_HOME "${ILC_HOME}/java/1.6.0"
 # set cmake build type, default value is: RelWithDebInfo
 # possible options are: None Debug Release RelWithDebInfo MinSizeRel
 #SET( CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build" FORCE )
+SET( BUILD_32BIT_COMPATIBLE OFF CACHE BOOL "Set to OFF to build 64 bit libraries" FORCE)
 
 #############################################################################
 # Advanced options

bin/lcio

@@ -31,11 +31,10 @@ fi
 
 #echo "LCIO=$LCIO"
 
-LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/sio.jar:$LCIO/tools/jdom.jar:$LCIO/tools/saxpath.jar
+LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/jdom.jar:$LCIO/tools/saxpath.jar
 LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/jaxen-jdom.jar:$LCIO/tools/jaxen-core.jar:$LCIO/tools/jel.jar
 LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/commons-cli-1.0.jar:$LCIO/tools/commons-lang-2.1.jar:$LCIO/tools/commons-math-1.2.jar
-#LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-hep.jar:$LCIO/tools/freehep-physics.jar:$LCIO/tools/freehep-base.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-mcfio-2.0.1.jar:$LCIO/tools/freehep-stdhep-2.0.2.jar:$LCIO/tools/freehep-sio-2.0.jar:$LCIO/tools/freehep-xdr-2.0.3.jar:$LCIO/tools/freehep-physics-2.1.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-mcfio-2.0.2.jar:$LCIO/tools/freehep-stdhep-2.0.3.jar:$LCIO/tools/freehep-sio-2.1.jar:$LCIO/tools/freehep-xdr-2.0.4.jar:$LCIO/tools/freehep-physics-2.1.jar
 
 # OS specific support for Cygwin 
 cygwin=false;

bin/runAnalysisJob.bat

@@ -1 +1 @@
-java %JAVA_OPTS% -cp "%LCIO%/lib/lcio.jar;%LCIO%/tools/freehep-sio-2.1-SNAPSHOT.jar;%LCIO%/tools/freehep-xdr-2.0.4-SNAPSHOT.jar" hep.lcio.example.AnalysisJob %*
+java %JAVA_OPTS% -cp "%LCIO%/lib/lcio.jar;%LCIO%/tools/freehep-sio-2.1.jar;%LCIO%/tools/freehep-xdr-2.0.4.jar" hep.lcio.example.AnalysisJob %*

bin/runAnalysisJob.cyg

@@ -1,2 +1,2 @@
-java -cp "$LCIO/lib/lcio.jar;$LCIO/tools/sio.jar" hep.lcio.example.AnalysisJob $1
+java -cp "$LCIO/lib/lcio.jar:$LCIO/tools/freehep-sio-2.1.jar:$LCIO/tools/freehep-xdr-2.0.4.jar" hep.lcio.example.AnalysisJob $1
 

bin/runAnalysisJob.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
-LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/sio.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-sio-2.1-SNAPSHOT.jar:$LCIO/tools/freehep-xdr-2.0.4-SNAPSHOT.jar
+LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/freehep-sio-2.1.jar:$LCIO/tools/freehep-xdr-2.0.4.jar
 
 # OS specific support for Cygwin 
 cygwin=false;

bin/runRecJob.bat

@@ -1 +1 @@
-java -cp %LCIO%/lib/lcio.jar;%LCIO%/tools/sio.jar hep.lcio.example.RecJob %*
+java -cp "%LCIO%/lib/lcio.jar;%LCIO%/tools/freehep-sio-2.1.jar;%LCIO%/tools/freehep-xdr-2.0.4.jar" hep.lcio.example.RecJob %*

bin/runRecJob.sh

@@ -1,8 +1,7 @@
 #!/bin/sh
 
-LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/sio.jar
-#LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-sio-2.0.jar:$LCIO/tools/freehep-xdr-2.0.3.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-sio-2.1-SNAPSHOT.jar:$LCIO/tools/freehep-xdr-2.0.4-SNAPSHOT.jar
+LOCALCLASSPATH=$LCIO/lib/lcio.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-sio-2.1.jar:$LCIO/tools/freehep-xdr-2.0.4.jar
 
 # OS specific support for Cygwin 
 cygwin=false;

bin/runSIODump.bat

@@ -1,2 +1,2 @@
 @echo off
-java -cp "%LCIO%/lib/lcio.jar;%LCIO%/tools/freehep-sio-2.1-SNAPSHOT.jar;%LCIO%/tools/freehep-xdr-2.0.4-SNAPSHOT.jar;%LCIO%/tools/jdom.jar;%LCIO%/tools/saxpath.jar;%LCIO%/tools/jaxen-jdom.jar;%LCIO%/tools/jaxen-core.jar;%LCIO%/tools/jel.jar" hep.lcio.util.SIODump %*
+java -cp "%LCIO%/lib/lcio.jar;%LCIO%/tools/freehep-sio-2.1.jar;%LCIO%/tools/freehep-xdr-2.0.4.jar;%LCIO%/tools/jdom.jar;%LCIO%/tools/saxpath.jar;%LCIO%/tools/jaxen-jdom.jar;%LCIO%/tools/jaxen-core.jar;%LCIO%/tools/jel.jar" hep.lcio.util.SIODump %*

bin/runSIODump.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/sio.jar:$LCIO/tools/jdom.jar:$LCIO/tools/saxpath.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-sio-2.1-SNAPSHOT.jar:$LCIO/tools/freehep-xdr-2.0.4-SNAPSHOT.jar
+LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/freehep-sio-2.1.jar:$LCIO/tools/freehep-xdr-2.0.4.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/jdom.jar:$LCIO/tools/saxpath.jar
 LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/jaxen-jdom.jar:$LCIO/tools/jaxen-core.jar:$LCIO/tools/jel.jar
 
 # OS specific support for Cygwin 

bin/runSimJob.bat

@@ -1 +1 @@
-java -cp "%LCIO%/lib/lcio.jar;%LCIO%/tools/freehep-sio-2.1-SNAPSHOT.jar;%LCIO%/tools/freehep-xdr-2.0.4-SNAPSHOT.jar" hep.lcio.example.SimJob %*
+java -cp "%LCIO%/lib/lcio.jar;%LCIO%/tools/freehep-sio-2.1.jar;%LCIO%/tools/freehep-xdr-2.0.4.jar" hep.lcio.example.SimJob %*

bin/runSimJob.cyg

@@ -1,2 +1,2 @@
-java -cp "$LCIO/lib/lcio.jar;$LCIO/tools/sio.jar" hep.lcio.example.SimJob $1
+java -cp "$LCIO/lib/lcio.jar:$LCIO/tools/freehep-sio-2.1.jar:$LCIO/tools/freehep-xdr-2.0.4.jar" hep.lcio.example.SimJob $1
 

bin/runSimJob.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
-LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/sio.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-sio-2.1-SNAPSHOT.jar:$LCIO/tools/freehep-xdr-2.0.4-SNAPSHOT.jar
+LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/freehep-sio-2.1.jar:$LCIO/tools/freehep-xdr-2.0.4.jar
 
 # OS specific support for Cygwin 
 cygwin=false;

bin/runrandomtests.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
-LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/sio.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-sio-2.0.jar:$LCIO/tools/freehep-xdr-2.0.3.jar
+LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/freehep-sio-2.1.jar:$LCIO/tools/freehep-xdr-2.0.4.jar
 
 case "`uname`" in
   CYGWIN*)

config/lcio.properties

@@ -1,7 +1,7 @@
 # ANT property file for LCIO
 #
 # Author: Mark Donszelmann
-# Version: $Id: lcio.properties,v 1.72 2010-06-22 13:49:54 gaede Exp $
+# Version: $Id: lcio.properties,v 1.73 2010-06-29 00:32:30 tonyj Exp $
 #
 debug=true
 
@@ -25,7 +25,7 @@ test.html=./reports/html
 test.classpath=lib/lcio.jar;tools/sio.jar;tools/commons-cli-1.0.jar;tools/commons-lang-2.1.jar
 test.format=frames
 
-classpath=src/java;tools/saxpath.jar;tools/jel.jar;tools/jdom.jar;tools/jaxen-core.jar;tools/jaxen-jdom.jar;tools/commons-cli-1.0.jar;tools/commons-lang-2.1.jar;tools/freehep-physics-2.1.jar;tools/freehep-mcfio-2.0.2-SNAPSHOT.jar;tools/freehep-sio-2.1-SNAPSHOT.jar;tools/freehep-stdhep-2.0.3-SNAPSHOT.jar;tools/freehep-xdr-2.0.4-SNAPSHOT.jar;tools/commons-math-1.2.jar
+classpath=src/java;tools/saxpath.jar;tools/jel.jar;tools/jdom.jar;tools/jaxen-core.jar;tools/jaxen-jdom.jar;tools/commons-cli-1.0.jar;tools/commons-lang-2.1.jar;tools/freehep-physics-2.1.jar;tools/freehep-mcfio-2.0.2.jar;tools/freehep-sio-2.1.jar;tools/freehep-stdhep-2.0.3.jar;tools/freehep-xdr-2.0.4.jar;tools/commons-math-1.2.jar
 
 srcpath=src/java
 exp.srcpath=