equal
deleted
inserted
replaced
34 export QIBM_MULTI_THREADED=Y |
34 export QIBM_MULTI_THREADED=Y |
35 fi |
35 fi |
36 |
36 |
37 +# For Solaris |
37 +# For Solaris |
38 +if $solaris; then |
38 +if $solaris; then |
39 + [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.6.0 |
39 + [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.7.0 |
40 +fi |
40 +fi |
41 + |
41 + |
42 # Get standard Java environment variables |
42 # Get standard Java environment variables |
43 if $os400; then |
43 if $os400; then |
44 # -r will Only work on the os400 if the files are: |
44 # -r will Only work on the os400 if the files are: |
85 [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` |
85 [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` |
86 fi |
86 fi |
87 |
87 |
88 +# For Solaris |
88 +# For Solaris |
89 +if $solaris; then |
89 +if $solaris; then |
90 + [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.6.0 |
90 + [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.7.0 |
91 +fi |
91 +fi |
92 + |
92 + |
93 # Get standard Java environment variables |
93 # Get standard Java environment variables |
94 if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then |
94 if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then |
95 BASEDIR="$CATALINA_HOME" |
95 BASEDIR="$CATALINA_HOME" |