Minor default config file changes

Change generated entity ID to https://host/idp/shibboleth

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2596 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/build.xml b/build.xml
index 7b4327e..1d29a34 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -204,7 +204,7 @@
                 <mkdir dir="${idp.home}/metadata" />
                 <mkdir dir="${idp.home}/war" />
 
-                <var name="idp.entity.id" value="https://${idp.hostname}/shibboleth" />
+                <var name="idp.entity.id" value="https://${idp.hostname}/idp/shibboleth" />
 
                 <regexSplit input="${idp.hostname}" regex="^.*\.(.*\..*$)" addproperty="idp.scope" />
 

diff --git a/resources/conf/logging.xml b/resources/conf/logging.xml
index f040431..f2fb3ab 100644 (file)
--- a/resources/conf/logging.xml
+++ b/resources/conf/logging.xml
@@ -4,7 +4,7 @@
     
     <!--
         Loggers define indicate which packages/categories are logged, at which level, and to which appender.
-        Levels: ALL, ERROR, WARN, INFO, DEBUG, OFF
+        Levels: ALL, ERROR, WARN, INFO, DEBUG, TRACE, OFF
     -->
     <!-- Logs IdP, but not OpenSAML, messages -->
     <logger name="edu.internet2.middleware.shibboleth">
@@ -69,13 +69,6 @@
             <Pattern>%date{HH:mm:ss.SSS} %level [%logger:%line] - %msg%n%ex{full}%n</Pattern>
         </layout>
     </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>
-    </appender>   
   
     <logger name="Shibboleth-Access">
         <level value="ALL" />
@@ -92,7 +85,7 @@
     </logger>
     
     <logger name="org.apache.catalina">
-        <level value="OFF" />
+        <level value="ERROR" />
     </logger>    
 
     <root>

diff --git a/resources/conf/relying-party.xml b/resources/conf/relying-party.xml
index 2efe476..5ef5398 100644 (file)
--- a/resources/conf/relying-party.xml
+++ b/resources/conf/relying-party.xml
@@ -49,10 +49,9 @@
         <!--
         <MetadataProvider id="URLMD" xsi:type="FileBackedHTTPMetadataProvider" xmlns="urn:mace:shibboleth:2.0:metadata"
                           metadataURL="http://example.org/my/metadata/file.xml" 
-                          backingFile="$IDP_HOME$/temp/metadata/somefile.xml">
-            <MetadataFilter xsi:type="SignatureValidation" trustEngineRef="shibboleth.MetadataTrustEngine" />           
-        </MetadataProvider>
-        -->              
+                          backingFile="$IDP_HOME$/metadata/somefile.xml" />
+        -->
+        
 
         <!-- MetadataProvider reading metadata from the filesystem -->
         <!-- Fill in metadataFile attribute with deployment specific information -->
@@ -73,23 +72,19 @@
     <!--     Security Configurations                -->
     <!-- ========================================== -->
     <security:Credential id="IdPCredential" xsi:type="security:X509Filesystem">
-        <security:PrivateKey password="changeit">$IDP_HOME$/credentials/idp.key</security:PrivateKey>
+        <security:PrivateKey>$IDP_HOME$/credentials/idp.key</security:PrivateKey>
         <security:Certificate>$IDP_HOME$/credentials/idp.crt</security:Certificate>
     </security:Credential>
     
     <!-- Trust engine used to evaluate the signature on loaded metadata. -->
+    <!--
     <security:TrustEngine id="shibboleth.MetadataTrustEngine" xsi:type="security:StaticExplicitKeySignature">
-        <security:Credential id="IdPMetadataCredentials" xsi:type="security:X509Filesystem">
-            <security:Certificate>$IDP_HOME$/credentials/idp.crt</security:Certificate>
-        </security:Credential>
-        <!-- Add additional credentials for each federation signing key -->
-        <!--
-        <security:Credential id="IdPMetadataCredentials" xsi:type="security:X509Filesystem">
+        <security:Credential id="MyFederation1Credentials" xsi:type="security:X509Filesystem">
             <security:Certificate>$IDP_HOME$/credentials/federation1.crt</security:Certificate>
         </security:Credential>
-        -->
     </security:TrustEngine>
-    
+     -->
+     
     <!-- DO NOT EDIT BELOW THIS POINT -->
     <!-- 
         The following trust engines and rules control every aspect of security related to incoming messages.