imported 1.1.2

4 files changed, 42 insertions, 15 deletions

diff --git a/src/installer/resources/build.xml b/src/installer/resources/build.xml
index ba7a5cd..b4201d8 100644
--- a/src/installer/resources/build.xml
+++ b/src/installer/resources/build.xml
@@ -17,7 +17,7 @@
     <!-- install - for deployment -->
     <target name="install" description="Creates the discovery service home directory, install configuration files, and create the service's WAR.">
 
-        <input message="Where should the Shibboleth Discovert Service software be installed?"
+        <input message="Where should the Shibboleth Discovery Service software be installed?"
                addproperty="ds.home.input"
                defaultvalue="${ds.home}" />
         <var name="ds.home" value="${ds.home.input}" />
diff --git a/src/installer/resources/install.properties b/src/installer/resources/install.properties
index 6de85c4..4b9d0de 100644
--- a/src/installer/resources/install.properties
+++ b/src/installer/resources/install.properties
@@ -1,2 +1 @@
-#Mon Jun 28 14:25:15 CEST 2010
-ds.home=/opt/shibboleth-ds
+ds.home = /opt/shibboleth-ds
\ No newline at end of file
diff --git a/src/installer/resources/logging.xml b/src/installer/resources/logging.xml
index 77fefd6..3e01593 100644
--- a/src/installer/resources/logging.xml
+++ b/src/installer/resources/logging.xml
@@ -7,22 +7,22 @@
      -->
     <appender name="DS_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <File>$DS_HOME$/logs/discoveryService.log</File>
-        <ImmediateFlush>true</ImmediateFlush>
 
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <FileNamePattern>$DS_HOME$/logs/discovery-%d{yyyy-MM-dd}.log</FileNamePattern>
         </rollingPolicy>
 
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>%date{HH:mm:ss.SSS} %level [%logger] %msg%n%ex{full}%n</Pattern>
-        </layout>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <charset>UTF-8</charset>
+            <Pattern>%date{HH:mm:ss.SSS} - %level [%logger:%line] - %msg%n%ex{full}%n</Pattern>
+        </encoder>
     </appender>
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <ImmediateFlush>true</ImmediateFlush>
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>%date{HH:mm:ss.SSS} %level [%logger] %msg%n%ex{full}%n</Pattern>
-        </layout>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <charset>UTF-8</charset>
+            <Pattern>%date{HH:mm:ss.SSS} - %level [%logger:%line] - %msg%n%ex{full}%n</Pattern>
+        </encoder>
     </appender>
     
     <!--
diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml
index a797b54..7a65e7d 100644
--- a/src/installer/resources/wayfconfig.xml
+++ b/src/installer/resources/wayfconfig.xml
@@ -37,7 +37,7 @@
      warnOnBadBinding describes what to do iof the metadata has a badly 
      formed <DiscoveryResponse> false (or not present) means that the bad 
      SP is removed from the metadata and an error written to the log file.
-     True means that we just noter this in the log file.
+     True means that we just note this in the log file.
      THIS SETTING IS SYSTEM WIDE ONLY.
 -->
 
@@ -70,14 +70,14 @@
      NOTE - for windows installation with an explicit DOS device ("C:\etc\discoveryservice")
      The url below should be "file://C:\program files/metadata/sites.xml
      
-      -->
+-->
 
         <MetadataProvider 
                 displayName="Federation Name"
                 identifier="FirstSite"
                 url="file://$DS_HOME$/metadata/sites.xml"/>
 
-<!-- If the WAYF is to handle data from more than one metadata source
+<!-- If the DS is to handle data from more than one metadata source
      then more metadataproviders can be provided, as below
         
        <MetadataProvider 
@@ -85,8 +85,36 @@
                 identifier="SecondSite"
                 backingFile="$DS_HOME$/metadata/ukfed_store.xml"
                 url="http://metadata.ukfederation.org.uk/ukfederation-metadata.xml"/>
+
+      White and black list providers are defined as filters inside a provider:
+      
+       <MetadataProvider 
+
+                displayName="WhiteListed Metadata"
+                identifier="White"
+                type="edu.internet2.middleware.shibboleth.metadata.provider.XMLMetadata"
+                backingFile="$DS_HOME$/metadata/whitelist_store.xml"
+                url="http://metadata.ukfederation.org.uk/ukfederation-test.xml">
+
+          <Filter identifier="false" 
+                type="edu.internet2.middleware.shibboleth.wayf.plugins.provider.ListFilter"
+                excludeEntries="true">
+              <EntityId>https://idp.edina.ac.uk/shibboleth</EntityId>
+              <EntityId>https://dlib-adidp.ucs.ed.ac.uk/shibboleth</EntityId>
+              <EntityId>https://idp.edina.ac.uk/shibboleth-devel</EntityId>
+              <EntityId>https://idp.edina.ac.uk/shibboleth-devel-13</EntityId>
+         </Filter>
+       </MetadataProvider>
+
+     NOTE that the resulting metadata has to include any SP which may need service from
+     this DS.   
+     
+     For a black list, set excludeEntries="true" (the listed Entities will be excluded), for 
+     a while list, set it to "false" (the listed entries will be included). 
+
 -->
 
+
 <!-- Plugins are extensible, the identifier is required, as is the
      type, the rest is for the plugin to define -->
 
@@ -139,7 +167,7 @@
     </DiscoveryServiceHandler>
    
  <!-- The ClearCache handler causes the cookie to be deleted.  The jsp shipped
-     with the WAYF refers to this handler -->
+     with the DS refers to this handler -->
         
     <DiscoveryServiceHandler
         location=".+/ClearCache.wayf">