[java-identity-provider COMMIT] in /trunk: idp-distribution/src/main/resources/bin/ant-jetty.xml idp-distribution/src...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Oct  8 15:26:27 2014
New Revision: 6655

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6655&view=rev
Log:
IDP-481
- change default entityID
- rename jetty.xml ant file
- update default install dir in ant script
- revise ant.sh to use classpath wildcards

Added:
    trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml
      - copied unchanged from r6653, trunk/idp-distribution/src/main/resources/bin/jetty.xml
Modified:
    trunk/idp-distribution/src/main/resources/bin/ant.sh
    trunk/idp-distribution/src/main/resources/bin/build.xml
    trunk/idp-distribution/src/main/resources/bin/jetty.xml
    trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
    trunk/idp-installer/src/main/wix/scripts/shib_write_configs.vbs

Modified: trunk/idp-distribution/src/main/resources/bin/ant.sh
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/ant.sh?rev=6655&r1=6654&r2=6655&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant.sh (original)
+++ trunk/idp-distribution/src/main/resources/bin/ant.sh Wed Oct  8 15:26:27 2014
@@ -35,33 +35,8 @@
 fi
 
 # add in the dependency .jar files
-DIRLIBS=${ANT_HOME}/../bin/lib/*.jar
-for i in ${DIRLIBS}
-do
-    # if the directory is empty, then it will return the input string
-    # this is stupid, so case for it
-    if [ "$i" != "${DIRLIBS}" ] ; then
-      if [ -z "$LOCALCLASSPATH" ] ; then
-        LOCALCLASSPATH=$i
-      else
-        LOCALCLASSPATH="$i":$LOCALCLASSPATH
-      fi
-    fi
-done
-
-WEBINFLIBS=${ANT_HOME}/../war/WEB-INF/lib/*.jar
-for i in ${WEBINFLIBS}
-do
-    # if the directory is empty, then it will return the input string
-    # this is stupid, so case for it
-    if [ "$i" != "${WEBINFLIBS}" ] ; then
-      if [ -z "$LOCALCLASSPATH" ] ; then
-        LOCALCLASSPATH=$i
-      else
-        LOCALCLASSPATH="$i":$LOCALCLASSPATH
-      fi
-    fi
-done
+LOCALCLASSPATH="${ANT_HOME}/../war/WEB-INF/lib/*":$LOCALCLASSPATH
+LOCALCLASSPATH="${ANT_HOME}/../bin/lib/*":$LOCALCLASSPATH
 
 if [ -n "$JAVA_HOME" ] ; then
   if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then

Modified: trunk/idp-distribution/src/main/resources/bin/build.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/build.xml?rev=6655&r1=6654&r2=6655&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Wed Oct  8 15:26:27 2014
@@ -58,7 +58,7 @@
 	</target>
 
 	<target name="geturisubjectaltname" if="idp.generate.altname" depends="checkproperties">
-		<property name="idp.uri.subject.alt.name" value="https://${idp.host.name}/shibboleth/idp" />
+		<property name="idp.uri.subject.alt.name" value="https://${idp.host.name}/idp/shibboleth" />
 	</target>
 
 	<target name="getkeystorepassword" if="idp.ask.keystore.password" depends="checkproperties">
@@ -99,7 +99,7 @@
 
 	<target name="target-nosrc-default" if="idp.src.dir.present">
 		<!-- if the source is set up then the default must not be basedir -->
-		<property name="idp.target.default" value="/opt/shibboleth/idp" />
+		<property name="idp.target.default" value="/opt/shibboleth-idp" />
 	</target>
 
 	<target name="prompttarget" if="idp.ask.target">
@@ -114,7 +114,7 @@
 	<target name="getentityid" if="idp.ask.entityid" depends="checkproperties">
 		<fail if="idp.noprompt">Input needed, silence demanded</fail>
 		<local name="entityid" />
-		<input message="EntityID" addproperty="entityid" defaultvalue="https://${idp.host.name}/shibboleth/idp" />
+		<input message="EntityID" addproperty="entityid" defaultvalue="https://${idp.host.name}/idp/shibboleth" />
 		<echo file="replace.properties" append="yes">
 			idp.entityID=${entityid}
 		</echo>

Modified: trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs?rev=6655&r1=6654&r2=6655&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs (original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs Wed Oct  8 15:26:27 2014
@@ -108,7 +108,7 @@
     <CustomAction Id="RunIdpAnt" Directory="ProgramFilesFolder" ExeCommand="[QtIdpAnt]" Execute="deferred" Impersonate="no"/>
     <CustomAction Id="QtIdpAnt" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no"/>
       
-    <CustomAction Id="SetJettyAnt" Property="QtJettyAnt" Value="&quot;[JAVA_EXECUTABLE]&quot; -cp &quot;[INSTALLDIR]\IdP\bin\lib\*;[INSTALLDIR]\IdP\war\WEB-INF\lib\*&quot; org.apache.tools.ant.Main -e -f &quot;[INSTALLDIR]\IdP\bin\jetty.xml&quot; -Djetty.property.file=jetty.install.properties install"/>

[... 29 lines stripped ...]