[java-identity-provider COMMIT] in /trunk/idp-distribution/src/main/resources/bin: runclass.bat runclass.sh

[noreply at shibboleth.net]

Author: scantor
Date: Tue May  5 20:46:27 2015
New Revision: 7493

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7493&view=rev
Log:
IDP-704 - Add a system property to override base URL for command line tools

Modified:
    trunk/idp-distribution/src/main/resources/bin/runclass.bat
    trunk/idp-distribution/src/main/resources/bin/runclass.sh

Modified: trunk/idp-distribution/src/main/resources/bin/runclass.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/runclass.bat?rev=7493&r1=7492&r2=7493&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/runclass.bat	(original)
+++ trunk/idp-distribution/src/main/resources/bin/runclass.bat	Tue May  5 20:46:27 2015
@@ -11,6 +11,10 @@
   set JAVACMD="%JAVA_HOME%\bin\java.exe"
 )
 
+if not defined IDP_BASE_URL (
+  set IDP_BASE_URL="http://localhost"
+)
+
 if not exist %JAVACMD% (
   echo Error: JAVA_HOME is not defined correctly.
   echo Cannot execute %JAVACMD%
@@ -22,4 +26,4 @@
 
 REM Go to it !
 
-%JAVACMD% -cp "%LOCALCLASSPATH%" %*
+%JAVACMD% -cp "%LOCALCLASSPATH%" -Dnet.shibboleth.idp.cli.baseURL=%IDP_BASE_URL% %*

Modified: trunk/idp-distribution/src/main/resources/bin/runclass.sh
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/runclass.sh?rev=7493&r1=7492&r2=7493&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/runclass.sh	(original)
+++ trunk/idp-distribution/src/main/resources/bin/runclass.sh	Tue May  5 20:46:27 2015
@@ -31,16 +31,20 @@
   LOCALCLASSPATH=$CLASSPATH
 fi
 
+if [ -z "$IDP_BASE_URL" ] ; then
+  IDP_BASE_URL="http://localhost"
+fi
+
 # add in the dependency .jar files
 LOCALCLASSPATH="$LOCATION/../webapp/WEB-INF/lib/*":$LOCALCLASSPATH
 LOCALCLASSPATH="$LOCATION/lib/*":$LOCALCLASSPATH
 
 if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
-    LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar
+  LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar
 fi
 
 if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
-    LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip
+  LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip
 fi
 
-"$JAVACMD" '-classpath' "$LOCALCLASSPATH" "$@"
+"$JAVACMD" '-classpath' "$LOCALCLASSPATH" -Dnet.shibboleth.idp.cli.baseURL=$IDP_BASE_URL "$@"