Fix bad substition error in scripts (#354)

Implemented as seen in 6e167be.

Fixes: #306

Author: michewl

openam-distribution/src/main/amserver/scripts/bin/ampassword

@@ -33,7 +33,7 @@ JAVA_HOME="\@JAVA_HOME@"
 TOOLS_HOME="@TOOLS_HOME@"
 
 CLASSPATH=""
-CLASSPATH="$CLASSPATH:${unix.setup.classpath}"
+CLASSPATH="$CLASSPATH:$TOOLS_HOME/lib/*"
 CLASSPATH="$CLASSPATH:$TOOLS_HOME/resources"
 
 $JAVA_HOME/bin/java -Xms64m -Xmx256m -classpath $CLASSPATH \

openam-distribution/src/main/amserver/scripts/bin/ampassword.bat

@@ -39,7 +39,7 @@ goto WHILE
 :WEND
 
 set CLASSPATH="@CONFIG_DIR@"
-set CLASSPATH="%CLASSPATH%;${windows.setup.classpath}"
+set CLASSPATH="%CLASSPATH%;%TOOLS_HOME%\lib\*"
 set CLASSPATH="%CLASSPATH%;%TOOLS_HOME%/resources"
 
 "\@JAVA_HOME@/bin/java.exe" -Xms64m -Xmx256m -classpath %CLASSPATH% -D"bootstrap.dir=@CONFIG_DIR@" -D"java.version.current=java.vm.version" -D"java.version.expected=1.4+"  -D"am.version.current=com.iplanet.am.version" -D"am.version.expected=@AM_VERSION@" com.iplanet.services.ldap.ServerConfigMgr %PARAMS%

openam-distribution/src/main/amserver/scripts/log/amverifyarchive

@@ -32,7 +32,7 @@ TOOLS_HOME="@TOOLS_HOME@"
 JAVA_HOME="@JAVA_HOME@"
 
 CLASSPATH="@CONFIG_DIR@"
-CLASSPATH="$CLASSPATH:${unix.setup.classpath}"
+CLASSPATH="$CLASSPATH:$TOOLS_HOME/lib/*"
 CLASSPATH="$CLASSPATH:$TOOLS_HOME/resources"
 
 # Setup proper LD_LIBRARY_PATH if not already set

openam-distribution/src/main/amserver/scripts/log/amverifyarchive.bat

@@ -39,7 +39,7 @@ goto WHILE
 :WEND
 
 set CLASSPATH="@CONFIG_DIR@"
-set CLASSPATH="%CLASSPATH%;${windows.setup.classpath}"
+set CLASSPATH="%CLASSPATH%;%TOOLS_HOME%\lib\*"
 set CLASSPATH="%CLASSPATH%;%TOOLS_HOME%/resources"
 
 "\@JAVA_HOME@/bin/java.exe" -Xms64m -Xmx256m -classpath %CLASSPATH% -D"bootstrap.dir=@CONFIG_DIR@" -D"java.version.current=java.vm.version" -D"java.version.expected=1.4+"  -D"am.version.current=com.iplanet.am.version" -D"am.version.expected=@AM_VERSION@" -D"amconfig=AMConfig" -D"max_conn_pool=10" -D"min_conn_pool=1" -D"s1is.java.util.logging.config.class=com.sun.identity.log.s1is.LogConfigReader" -D"com.iplanet.services.configpath=@CONFIG_DIR@" -D"com.sun.identity.configFilePath=@CONFIG_DIR@" -D"com.iplanet.coreservices.configpath=@CONFIG_DIR@"  -D"LOG_COMPATMODE=Off" -D"com.iplanet.am.logstatus=INACTIVE" -D"com.iplanet.am.serverMode=false" com.sun.identity.log.cli.ISArchiveVerify %PARAMS%