[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/ldap.properties idp-conf/src/main/resourc...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Oct 18 06:22:16 2014
New Revision: 6737

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6737&view=rev
Log:
IDP-488 Catch up on changes in the ant file.  Add better debugging support.  Add capture and processing of scope.  Fix the example metadata provider and add a couple of AD friendly comments to ldap.properties

Modified:
    trunk/idp-conf/src/main/resources/conf/ldap.properties
    trunk/idp-conf/src/main/resources/conf/metadata-providers.xml
    trunk/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
    trunk/idp-installer/src/main/wix/scripts/shib_write_configs.vbs

Modified: trunk/idp-conf/src/main/resources/conf/ldap.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/ldap.properties?rev=6737&r1=6736&r2=6737&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ldap.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/ldap.properties Sat Oct 18 06:22:16 2014
@@ -19,10 +19,12 @@
 idp.authn.LDAP.subtreeSearch					= false
 idp.authn.LDAP.userFilter						= (uid={user})
 # bind search configuration
+# for AD: idp.authn.LDAP.bindDN=adminuser at domain.com
 idp.authn.LDAP.bindDN           				= uid=myservice,ou=system
 idp.authn.LDAP.bindDNCredential 				= myServicePassword
 
 # Format DN resolution, used by directAuthenticator, adAuthenticator
+# for AD use !idp.authn.LDAP.dnFormat=%s at domain.com
 idp.authn.LDAP.dnFormat							= uid=%s,ou=people,dc=example,dc=org
 
 # LDAP attribute configuration, see attribute-resolver.xml

Modified: trunk/idp-conf/src/main/resources/conf/metadata-providers.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/metadata-providers.xml?rev=6737&r1=6736&r2=6737&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/metadata-providers.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/metadata-providers.xml Sat Oct 18 06:22:16 2014
@@ -33,12 +33,16 @@
 	     The EntityRoleWhiteList saves memory by only loading metadata from entity types
 	     that you will interoperate with. 
     
-	<MetadataProvider id="HTTPMetadata" xsi:type="FilesystemMetadataProvider"
-		metadataFile="%{idp.home}/metadata/example-metadata.xml">
+	<MetadataProvider id="HTTPMetadata"
+	                  xsi:type="metadata:FileBackedHTTPMetadataProvider"
+                      backingFile="%{idp.home}/metadata/localCopyFromXYZHTTP.xml"
+                      metadataURL="http://WHATEVER"> 
         
 		<MetadataFilter xsi:type="SignatureValidation"
 			requireSignedMetadata="false">
 			<PublicKey>
+                THIS IS AN EXAMPLE
+			
 				MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaX
 				uRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/
 				LspmBWxfZS+n+cc7I82E5yvCAPX67QsZgqgglp2W5dvK/FsMMCS6X6SVqzBLMP88

Modified: trunk/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs?rev=6737&r1=6736&r2=6737&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs (original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs Sat Oct 18 06:22:16 2014
@@ -64,7 +64,12 @@
         <Control Id="DnsName" Type="Edit" X="185" Y="146" Height="17" Width="150"
                  Property="DNSNAME" Text="[DNSNAME]"/>
 
-	  <!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
+	<Control Id="DescriptionLine5" Type="Text" X="25" Y="182" Height="36" Width="150"
+	         Text="Chose the scope that this IdP will assert. " />
+	<Control Id="IdpScope" Type="Edit" X="185" Y="182" Height="17" Width="150"
+	         Property="IDP_SCOPE" Text="[IDP_SCOPE]"/>
+
+	<!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
         <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />
         <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&amp;Back">
           <Publish  Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>

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=6737&r1=6736&r2=6737&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs (original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs Sat Oct 18 06:22:16 2014
@@ -49,7 +49,7 @@
         <Directory Id="INSTALLDIR" Name="Shibboleth" >
           <Merge Id="jetty" Language="1033" SourceFile="$(var.ProjectDir)\jetty-$(var.msitype).msm" DiskId="1"/>
             <Directory Id="IdPFolder" Name="IdP">

[... 99 lines stripped ...]