From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 23 Jan 2012 05:29:18 +0000 (-0500)
Subject: Merge branch 'master' of ssh://feistymeow.org/feisty_meow
X-Git-Tag: 2.140.90~1656^2~26
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=cf549fa1856a0c7b827c66cccd105f19e04c23b3;hp=-c;p=feisty_meow.git

Merge branch 'master' of ssh://feistymeow.org/feisty_meow
---

cf549fa1856a0c7b827c66cccd105f19e04c23b3
diff --combined scripts/custom/examples/fred/uva_profile_additions.txt
index 67657499,98c61d24..67657499
mode 100755,100644..100644
--- a/scripts/custom/examples/fred/uva_profile_additions.txt
+++ b/scripts/custom/examples/fred/uva_profile_additions.txt
@@@ -4,14 -4,8 +4,14 @@@
  
  # extras for uva
  export JAVA_HOME=/usr/lib/jvm/java-6-sun/jre
 -export PATH=$PATH:$JAVA_HOME/bin
  
  # ant options to get the wsdl files to all build properly.
  export ANT_OPTS="-Xms512m -Xmx768m -XX:MaxPermSize=768m"
  
 +# where we have our local eclipse.
 +export ECLIPSE_DIR=/usr/local/eclipse_jee
 +
 +# add in the places we'd like in the path.
 +# java and eclipse go first to override any other installed versions.
 +export PATH=$JAVA_HOME/bin:$ECLIPSE_DIR:$PATH
 +