Removed hard dependency on IBM's JVM.

CASA-auth-token/server-java/Svc/linux/CasaAuthtokenSvcD

@@ -86,14 +86,32 @@ StartDAEMON()
       test -d "$dir" && chown -R --dereference $DAEMON_USER:$DAEMON_GROUP "$dir" 2>/dev/null || true
     done
 
+    TEST_IBM_JVM=$($JAVA_HOME/bin/java -version 2>&1 | grep -i ibm)
+
+    # Append the java.security.auth.login.conf property on the JAVA_OPTS environment
+    # variable if not utilizing the IBM JVM.
+    if [ -z "${TEST_IBM_JVM}" ]; then
+      export JAVA_OPTS="$JAVA_OPTS -Djava.security.auth.login.config=/etc/CASA/authtoken/svc/jaas.conf"
+    fi
+
     # Make sure that the server.xml link has been made
     if [ ! -f /srv/www/casaats/conf/server.xml ]; then
-      ln -s /srv/www/casaats/conf/server-ibm.xml /srv/www/casaats/conf/server.xml
+      # The server.xml file link needs to be made. Use the appropriate
+      # file for the JVM version that we are using.
+      if [ -z "${TEST_IBM_JVM}" ]; then
+        # Assume Sun JVM
+        ln -s /srv/www/casaats/conf/server-sun.xml /srv/www/casaats/conf/server.xml
+      else
+        # IBM JVM
+        ln -s /srv/www/casaats/conf/server-ibm.xml /srv/www/casaats/conf/server.xml
+      fi
+
+      # Make sure that our service has rights to the file
       chown -h casaatsd:casaauth /srv/www/casaats/conf/server.xml
     fi
 
     # Start it up
-    su $DAEMON_USER -s /bin/bash -c "$CATALINA_HOME/bin/startup.sh" >"$CATALINA_BASE/logs//start.log" 2>&1
+    su $DAEMON_USER -s /bin/bash -c "$CATALINA_HOME/bin/startup.sh" >"$CATALINA_BASE/logs/start.log" 2>&1
     sleep 1
     if atsIsRunning ; then
       rc_failed 0