[Swift-commit] r2860 - SwiftApps/pc3

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2009-04-15 07:23:52 -0500 (Wed, 15 Apr 2009)
New Revision: 2860

Modified:
   SwiftApps/pc3/CompactDatabase.sh
   SwiftApps/pc3/PSLoadExecutable.sh
   SwiftApps/pc3/PSLoadExecutableDB.sh
   SwiftApps/pc3/README
Log:
misc changes to simply execution of pc3 app

Modified: SwiftApps/pc3/CompactDatabase.sh
===================================================================
--- SwiftApps/pc3/CompactDatabase.sh	2009-04-15 09:55:28 UTC (rev 2859)
+++ SwiftApps/pc3/CompactDatabase.sh	2009-04-15 12:23:52 UTC (rev 2860)
@@ -1,7 +1,7 @@
 #!/bin/bash
 INPUT=$1
 
-$JAVA_HOME/bin/java -Dderby.system.home=/var/tmp/derby-pc3/ -cp "$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadExecutable.jar:$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadWorkflow.jar:$PC3LIB/Java/lib/derby.jar:$PC3LIB/Java/lib/derbyclient.jar:$PC3LIB/Java/lib/derbynet.jar:$PC3LIB/Java/lib/derbyrun.jar:$PC3LIB/Java/lib/derbytools.jar" info.ipaw.pc3.PSLoadExecutable.Execute CompactDatabase -f $INPUT
+java -Dderby.system.home=/var/tmp/derby-pc3/ -cp "$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadExecutable.jar:$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadWorkflow.jar:$PC3LIB/Java/lib/derby.jar:$PC3LIB/Java/lib/derbyclient.jar:$PC3LIB/Java/lib/derbynet.jar:$PC3LIB/Java/lib/derbyrun.jar:$PC3LIB/Java/lib/derbytools.jar" info.ipaw.pc3.PSLoadExecutable.Execute CompactDatabase -f $INPUT
 
 
- 
\ No newline at end of file
+ 

Modified: SwiftApps/pc3/PSLoadExecutable.sh
===================================================================
--- SwiftApps/pc3/PSLoadExecutable.sh	2009-04-15 09:55:28 UTC (rev 2859)
+++ SwiftApps/pc3/PSLoadExecutable.sh	2009-04-15 12:23:52 UTC (rev 2860)
@@ -3,5 +3,5 @@
 INPUT2=$2
 OUTPUT=$3
 
-$JAVA_HOME/bin/java -Dderby.system.home=/var/tmp/derby-pc3/ -cp "$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadExecutable.jar:$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadWorkflow.jar:$PC3LIB/Java/lib/derby.jar:$PC3LIB/Java/lib/derbyclient.jar:$PC3LIB/Java/lib/derbynet.jar:$PC3LIB/Java/lib/derbyrun.jar:$PC3LIB/Java/lib/derbytools.jar" info.ipaw.pc3.PSLoadExecutable.Execute $INPUT2 -o $OUTPUT -f $INPUT1
+java -Dderby.system.home=/var/tmp/derby-pc3/ -cp "$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadExecutable.jar:$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadWorkflow.jar:$PC3LIB/Java/lib/derby.jar:$PC3LIB/Java/lib/derbyclient.jar:$PC3LIB/Java/lib/derbynet.jar:$PC3LIB/Java/lib/derbyrun.jar:$PC3LIB/Java/lib/derbytools.jar" info.ipaw.pc3.PSLoadExecutable.Execute $INPUT2 -o $OUTPUT -f $INPUT1
 

Modified: SwiftApps/pc3/PSLoadExecutableDB.sh
===================================================================
--- SwiftApps/pc3/PSLoadExecutableDB.sh	2009-04-15 09:55:28 UTC (rev 2859)
+++ SwiftApps/pc3/PSLoadExecutableDB.sh	2009-04-15 12:23:52 UTC (rev 2860)
@@ -4,4 +4,4 @@
 SINPUT=$3
 OUTPUT=$4
 
-$JAVA_HOME/bin/java -Dderby.system.home=/var/tmp/derby-pc3/ -cp "$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadExecutable.jar:$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadWorkflow.jar:$PC3LIB/Java/lib/derby.jar:$PC3LIB/Java/lib/derbyclient.jar:$PC3LIB/Java/lib/derbynet.jar:$PC3LIB/Java/lib/derbyrun.jar:$PC3LIB/Java/lib/derbytools.jar" info.ipaw.pc3.PSLoadExecutable.Execute $SINPUT -o $OUTPUT -f $DB -f $INPUT 
+java -Dderby.system.home=/var/tmp/derby-pc3/ -cp "$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadExecutable.jar:$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadWorkflow.jar:$PC3LIB/Java/lib/derby.jar:$PC3LIB/Java/lib/derbyclient.jar:$PC3LIB/Java/lib/derbynet.jar:$PC3LIB/Java/lib/derbyrun.jar:$PC3LIB/Java/lib/derbytools.jar" info.ipaw.pc3.PSLoadExecutable.Execute $SINPUT -o $OUTPUT -f $DB -f $INPUT 

Modified: SwiftApps/pc3/README
===================================================================
--- SwiftApps/pc3/README	2009-04-15 09:55:28 UTC (rev 2859)
+++ SwiftApps/pc3/README	2009-04-15 12:23:52 UTC (rev 2860)
@@ -1,19 +1,36 @@
-* This is a work-space for the Swift entry to the third provenance challenge
+* Download and extract PC3.tar.gz from the PC3 home page at
+  http://twiki.ipaw.info/bin/view/Challenge/ThirdProvenanceChallenge
 
-* Download and extract PC3.tar.gz from the PC3 home page.
-
 * Append tc.data.append to your tc.data.
 
-* Requires xpath program (in Debian: $ apt-get install libxml-xpath-perl).
+* Requires xpath program (in Debian: $ apt-get install libxml-xpath-perl)
+* Requires Java 1.6
 
 * Example:
 
+$ cd swift-svn/SwiftApps/pc3
+$ export PATH=$PATH:`pwd`
 $ tar xvfz PC3.tar.gz
 $ cd PC3
-$ export JAVA_PATH=<path to Java>
 $ export PC3LIB=`pwd`
-$ mkdir Java/tmp
-$ cd Java/tmp
-$ cp <path to pc3 wf impl>/pc3/* .
-$ export PATH=$PATH:`pwd`
-$ swift pc3.swift -csvpath=CSVRootPathInput.xml -jobid=JobIDInput.xml
+$ cd Java/
+$ ant jar
+$ mkdir tmp
+$ cd tmp
+$ swift -tc.data ../../../tc.data.append pc3.swift -csvpath=CSVRootPathInput.xml -jobid=JobIDInput.xml
+
+To re-run, you will need to delete the Derby database generated by the
+run, like this:
+
+rm -rfv /var/tmp/derby-pc3/
+
+
+Extra notes for running on Ben's OS X 10.5 laptop with multiple Java versions
+installed, the default of which does not work:
+
+Set these:
+$ echo $JAVACMD 
+/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Commands//java
+$ echo $JAVA_HOME 
+/System/Library/Frameworks/JavaVM.framework/Versions/1.6/
+