Author: rareddy
Date: 2009-07-23 14:52:11 -0400 (Thu, 23 Jul 2009)
New Revision: 1176
Removed:
trunk/build/kit-runtime/bin/encrypt.bat
trunk/build/kit-runtime/bin/encrypt.sh
Log:
TEIID-729: No longer creates a keystore by running the server script. To generate the key
user must run the keystore.sh or keystore.bat script file.
Deleted: trunk/build/kit-runtime/bin/encrypt.bat
===================================================================
--- trunk/build/kit-runtime/bin/encrypt.bat 2009-07-23 18:51:36 UTC (rev 1175)
+++ trunk/build/kit-runtime/bin/encrypt.bat 2009-07-23 18:52:11 UTC (rev 1176)
@@ -1,45 +0,0 @@
-@echo off
-rem
-rem This script file encrypts the passed in clear text and spits out encypted form
-rem
-
-@if not "%ECHO%" == "" echo %ECHO%
-@if "%OS%" == "Windows_NT" setlocal
-
-if "%OS%" == "Windows_NT" (
- set "DIRNAME=%~dp0%"
-) else (
- set DIRNAME=.\
-)
-
-pushd %DIRNAME%..
-if "x%TEIID_HOME%" == "x" (
- set "TEIID_HOME=%CD%"
-)
-popd
-
-set DIRNAME=
-
-if "x%JAVA_HOME%" == "x" (
- set JAVA=java
- echo JAVA_HOME is not set. Unexpected results may occur.
- echo Set JAVA_HOME to the directory of your local JDK to avoid this message.
-) else (
- set "JAVA=%JAVA_HOME%\bin\java"
- if exist "%JAVA_HOME%\lib\tools.jar" (
- set "JAVAC_JAR=%JAVA_HOME%\lib\tools.jar"
- )
-)
-
-set
TEIID_CLASSPATH=%TEIID_HOME%\lib\patches\*;%TEIID_HOME%\deploy;%TEIID_HOME%\client\*;%TEIID_HOME%\lib\*;
-set KEYSTORE_FILE=%TEIID_HOME%\deploy\teiid.keystore
-if not exist %KEYSTORE_FILE (
- %JAVA%" -classpath "%TEIID_CLASSPATH%"
com.metamatrix.common.util.crypto.CryptoUtil -genkey %KEYSTORE_FILE%
- echo A new key with keystore generated at %KEYSTORE_FILE%
-)
-
-if "x%1%" == "x"(
- echo Provide text phrase to encrypt.
-) else (
- %JAVA%" -classpath "%TEIID_CLASSPATH%"
com.metamatrix.common.util.crypto.CryptoUtil -key %KEYSTORE_FILE% -encrypt %1%
-)
Deleted: trunk/build/kit-runtime/bin/encrypt.sh
===================================================================
--- trunk/build/kit-runtime/bin/encrypt.sh 2009-07-23 18:51:36 UTC (rev 1175)
+++ trunk/build/kit-runtime/bin/encrypt.sh 2009-07-23 18:52:11 UTC (rev 1176)
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-DIRNAME=`dirname $0`
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false;
-linux=false;
-case "`uname`" in
- CYGWIN*)
- cygwin=true
- ;;
-
- Linux)
- linux=true
- ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
- [ -n "$TEIID_HOME" ] &&
- TEIID_HOME=`cygpath --unix "$TEIID_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Setup TEIID_HOME
-if [ "x$TEIID_HOME" = "x" ]; then
- # get the full path (without any relative bits)
- TEIID_HOME=`cd $DIRNAME/..; pwd`
-fi
-export TEIID_HOME
-
-# Setup the JVM
-if [ "x$JAVA" = "x" ]; then
- if [ "x$JAVA_HOME" != "x" ]; then
- JAVA="$JAVA_HOME/bin/java"
- else
- JAVA="java"
- fi
-fi
-
-TEIID_CLASSPATH="$TEIID_HOME/lib/patches/*:$TEIID_HOME/deploy:$TEIID_HOME/client/*:$TEIID_HOME/lib/*"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- TEIID_HOME=`cygpath --path --windows "$TEIID_HOME"`
- JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- TEIID_CLASSPATH=`cygpath --path --windows "$TEIID_CLASSPATH"`
-fi
-
-# generate teiid.keystore if does not exist.
-KEYSTORE_FILE=$TEIID_HOME/deploy/teiid.keystore
-if [ ! -f $KEYSTORE_FILE ]; then
- "$JAVA" -classpath $TEIID_CLASSPATH
com.metamatrix.common.util.crypto.CryptoUtil -genkey $KEYSTORE_FILE
- echo "A new key with keystore generated at $KEYSTORE_FILE"
-fi
-
-if [ "x$1" = "x" ]; then
- echo "Provide text phrase to encrypt."
-else
- "$JAVA" -classpath $TEIID_CLASSPATH
com.metamatrix.common.util.crypto.CryptoUtil -key $KEYSTORE_FILE -encrypt $1
-fi
\ No newline at end of file
Show replies by date