equal
deleted
inserted
replaced
27 export QIBM_MULTI_THREADED=Y |
27 export QIBM_MULTI_THREADED=Y |
28 fi |
28 fi |
29 |
29 |
30 +# For Solaris |
30 +# For Solaris |
31 +if $solaris; then |
31 +if $solaris; then |
32 + [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.7.0 |
32 + [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.8.0 |
33 +fi |
33 +fi |
34 + |
34 + |
35 # Get standard Java environment variables |
35 # Get standard Java environment variables |
36 if $os400; then |
36 if $os400; then |
37 # -r will Only work on the os400 if the files are: |
37 # -r will Only work on the os400 if the files are: |
71 [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` |
71 [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` |
72 fi |
72 fi |
73 |
73 |
74 +# For Solaris |
74 +# For Solaris |
75 +if $solaris; then |
75 +if $solaris; then |
76 + [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.7.0 |
76 + [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.8.0 |
77 +fi |
77 +fi |
78 + |
78 + |
79 # Get standard Java environment variables |
79 # Get standard Java environment variables |
80 if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then |
80 if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then |
81 BASEDIR="$CATALINA_HOME" |
81 BASEDIR="$CATALINA_HOME" |