Changeset 35650

Timestamp:

2021-10-20T18:13:57+13:00 (2 years ago)

Author:

davidb

Message:

Tweaks to echo statements. Tidy up of commented out code

Location:

gs3-extensions/solr/trunk/src

Files:

• gs3-setup.bat (modified) (2 diffs)
• gs3-setup.sh (modified) (3 diffs)

gs3-extensions/solr/trunk/src/gs3-setup.bat

@@ -37 +37 @@
 endlocal& set SOLR_HOST=%SOLR_HOST%& set SOLR_PORT=%SOLR_PORT%
 echo   - Solr API accessed internally via: http://%SOLR_HOST%:%SOLR_PORT%/solr/
-rem echo Tomcat host: %SOLR_HOST%
-rem echo Tomcat port: %SOLR_PORT%
-
-
-rem rem IF USING JETTY SERVER FOR SOLR
-rem :: The port Jetty runs on:
-rem set SOLR_JETTY_PORT=8983
-
-rem :: The port Jetty listens on for a "stop" command
-rem set JETTY_STOP_PORT=8079
 
 if "%OS%" == "Windows_NT" goto WinNT
@@ -95 +85 @@
 endlocal & set GSDL3EXTS=%GSDL3EXTS%
 
-echo +Your environment is now setup for %extdesc%
-
 :: Back to delayed expansion to avoid problems with environment
 :: variables with brackets in them, such as "Program Files (x86)"
 
-rem ::echo ++Solr/Jetty server will run on port %SOLR_JETTY_PORT% (+ port %JETTY_STOP_PORT% for shutdown command)
-rem echo ++Solr will run off the tomcat server on port %SOLR_PORT%
-rem echo --This port value can be changed by editing tomcat.port in build.properties
-rem ::echo --  %0
-
-
+echo +Your environment is now setup for %extdesc%
 
 :End

gs3-extensions/solr/trunk/src/gs3-setup.sh

@@ -32 +32 @@
 
 
-## If using jetty:
-## The port Jetty runs on:
-#SOLR_JETTY_PORT=8983
-
-## The port Jetty listens on for a "stop" command
-#JETTY_STOP_PORT=8079
-
-
 if test -z $GSDLOS ; then
   GSDLOS=`uname -s | tr '[A-Z]' '[a-z]'`
@@ -59 +51 @@
 
 if [ "x$GEXT_SOLR" = "x" ] ; then
-  echo "+ Setting up your environment for $extdesc ..."
   export GEXT_SOLR=`pwd`
 
@@ -82 +73 @@
   fi
 
-#  export SOLR_JETTY_PORT
-#  export JETTY_STOP_PORT
   export SOLR_PORT
   export SOLR_HOST
 #  first_time=1
 
-  echo "+ ... Your environment is now setup for $extdesc"
+  echo "+Your environment is now setup for $extdesc"
 else
-  echo "+ Your environment is already setup for $extdesc"
+  echo "+Your environment is already setup for $extdesc"
 fi
 
-#echo "SOLR port: $SOLR_PORT"
-#echo "SOLR host: $SOLR_HOST"
 echo "  - Solr API accessed internally via: http://$SOLR_HOST:$SOLR_PORT/solr/"
 
-
-#echo "++Solr/Jetty server will run on port $SOLR_JETTY_PORT (+ port $JETTY_STOP_PORT for shutdown command)"
 
 #if [ "$first_time" = "1" ] ; then