Removed work-arounds from SPEC files and BasicATSSetup script.

CASA-auth-token/server-java/Svc/linux/CasaBasicATSSetup.sh

@@ -64,44 +64,6 @@ function display_usage
 }
 
 
-function java_1_5_oes_workaround
-{
-   #
-   # Notice, this function is here temporarily to support
-   # OES before it starts dealing with IBM's 1.5 JVM.
-   #
-
-   # Determine the file and folder names 
-   CERT_FOLDER=/etc/opt/novell/certs
-   ALT_CERT_FOLDER=/etc/opt/novell
-   CERT_FILE_NAME=SSCert.der
-   JAVA_KEY_STORE_PATH=$JAVA_HOME/lib/security/cacerts
-
-   # Determine the path to the eDir cert file
-   if [ ! -f $CERT_FOLDER/$CERT_FILE_NAME ]; then
-      if [ ! -f $ALT_CERT_FOLDER/$CERT_FILE_NAME ]; then
-         echo "eDir CA Cert not found!"
-         echo "Verify that Java_1_5 will be able to accept certificates from configured LDAP server."
-         return 2
-      else
-         CERT_FILE_PATH=$ALT_CERT_FOLDER/$CERT_FILE_NAME
-      fi
-   else
-      CERT_FILE_PATH=$CERT_FOLDER/$CERT_FILE_NAME
-   fi
-
-   # Now import the cert into java's keystore
-   $JAVA_HOME/bin/keytool -import -noprompt\
-      -trustcacerts\
-      -alias edir_root_ca\
-      -keystore $JAVA_KEY_STORE_PATH\
-      -storepass changeit\
-      -file $CERT_FILE_PATH
-
-   return 0
-}
-
-
 function setup_jaas_file
 {
    # Determine the file names 
@@ -260,7 +222,6 @@ fi
 . /etc/CASA/authtoken/svc/envvars
 
 # Setup the configuration files
-java_1_5_oes_workaround
 setup_jaas_file
 setup_iaRealms_file
 RETVAL=$?