Final tweaks before DB installation works

container_files/bin/check.sh

@@ -2,9 +2,14 @@
 
 log="/tmp/grouper.log"
 
-
+echo "Installing schema" >> $log
 cd /opt/grouper/2.3.0/grouper.apiBinary-2.3.0 && GROUPER_HOME=/opt/grouper/2.3.0/grouper.apiBinary-2.3.0 bin/gsh.sh -registry -drop -runscript -noprompt
 
+echo "Preparing subjects" >> $log
 cd /opt/grouper/2.3.0/grouper.apiBinary-2.3.0 && GROUPER_HOME=/opt/grouper/2.3.0/grouper.apiBinary-2.3.0 bin/gsh.sh -registry -runsqlfile /opt/grouper/2.3.0/subjects.sql -noprompt
 
-cd /opt/grouper/2.3.0/grouper.apiBinary-2.3.0 && GROUPER_HOME=/opt/grouper/2.3.0/grouper.apiBinary-2.3.0 CLASSPATH=/opt/etc:$CLASSPATH bin/gsh.sh -registry -check >> $log
+echo "Adding Quickstart data" >> $log
+cd /opt/grouper/2.3.0/grouper.apiBinary-2.3.0 && GROUPER_HOME=/opt/grouper/2.3.0/grouper.apiBinary-2.3.0 bin/gsh.sh -xmlimportold GrouperSystem /opt/grouper/2.3.0/quickstart.xml -noprompt
+
+echo "Checking" >> $log
+cd /opt/grouper/2.3.0/grouper.apiBinary-2.3.0 && GROUPER_HOME=/opt/grouper/2.3.0/grouper.apiBinary-2.3.0 bin/gsh.sh -registry -check >> $log

container_files/bin/configure.sh

@@ -2,7 +2,7 @@
 
 log="/tmp/grouper.log"
 
-sed -i "s|#GROUPER_SYSTEM_PASSWORD#|$GROUPER_SYSTEM_PASSWORD|g" /opt/etc/grouper.installer.properties >> $log
+#sed -i "s|#GROUPER_SYSTEM_PASSWORD#|$GROUPER_SYSTEM_PASSWORD|g" /opt/etc/grouper.installer.properties >> $log
 
 # Long-lived configuration values, these are symlinked into place
 

container_files/etc/grouper.installer.properties

@@ -30,9 +30,6 @@ grouperInstaller.autorun.dbUser = grouper
 grouperInstaller.autorun.dbPass = XXXXXXXXXX
 # autorun Do you want to init the database (delete all existing grouper tables, add new ones) (t|f)?
 grouperInstaller.autorun.deleteAndInitDatabase = t
-# autorun What is the location of your tomcat server.xml for the UI?
-# Note, if you dont use tomcat just leave it blank or type 'blank':
-grouperInstaller.autorun.locationOfTomcatServerXml = /home/grouper/2.3.0/apache-tomcat-6.0.35/conf/server.xml
 
 # [jvf] The 'fake' run-through of 
 # While running the installer, we don't have access to the database