Fix up some typos and synch up with minor schema file changes.

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

diff --git a/resources/conf/attribute-resolver.xml b/resources/conf/attribute-resolver.xml
index 56d3c25..f4843ee 100644 (file)
--- a/resources/conf/attribute-resolver.xml
+++ b/resources/conf/attribute-resolver.xml
@@ -496,8 +496,7 @@
     </resolver:DataConnector>
 
     <!-- Example Relational Database Connector -->
-    <resolver:DataConnector id="mySIS" xsi:type="RelationalDatabase" xmlns="urn:mace:shibboleth:2.0:resolver:dc"
-        validationQuery="SELECT 1 FROM DUAL">
+    <resolver:DataConnector id="mySIS" xsi:type="RelationalDatabase" xmlns="urn:mace:shibboleth:2.0:resolver:dc">
         <ApplicationManagedConnection jdbcDriver="oracle.jdbc.driver.OracleDriver"
             jdbcURL="jdbc:oracle:thin:@db.example.org:1521:SomeDB" jdbcUserName="myid" jdbcPassword="mypassword" />
         <QueryTemplate>
@@ -512,7 +511,7 @@
 
     <!-- Example LDAP Connector -->
     <resolver:DataConnector id="myLDAP" xsi:type="LDAPDirectory" xmlns="urn:mace:shibboleth:2.0:resolver:dc"
-        ldapUrl="ldap://ldap.example.org" baseDN="ou=people,dc=example,dc=org" principal="uid=myservice,ou=system"
+        ldapURL="ldap://ldap.example.org" baseDN="ou=people,dc=example,dc=org" principal="uid=myservice,ou=system"
         principalCredential="myServicePassword">
         <FilterTemplate>
             <![CDATA[

diff --git a/resources/conf/internal.xml b/resources/conf/internal.xml
index d5cf47f..cb4a910 100644 (file)
--- a/resources/conf/internal.xml
+++ b/resources/conf/internal.xml
@@ -73,17 +73,13 @@
                     <key>
                         <value>http://xml.org/sax/features/external-general-entities</value>
                     </key>
-                    <bean id="shibboleth.ExternalGeneralEntities" class="java.lang.Boolean">
-                        <constructor-arg value="true" />
-                    </bean>
+                    <util:constant static-field="java.lang.Boolean.FALSE"/>
                 </entry>
                 <entry>
                     <key>
                         <value>http://xml.org/sax/features/external-parameter-entities</value>
                     </key>
-                    <bean id="shibboleth.ExternalParameterEntities" class="java.lang.Boolean">
-                        <constructor-arg value="true" />
-                    </bean>
+                    <util:constant static-field="java.lang.Boolean.FALSE"/>
                 </entry>
             </map>
         </property>

diff --git a/resources/conf/relying-party.xml b/resources/conf/relying-party.xml
index e9c6b27..176f8cc 100644 (file)
--- a/resources/conf/relying-party.xml
+++ b/resources/conf/relying-party.xml
@@ -46,7 +46,7 @@
     <MetadataProvider id="ShibbolethMetadata" xsi:type="ChainingMetadataProvider" xmlns="urn:mace:shibboleth:2.0:metadata">
             
             <MetadataFilter xsi:type="ChainingFilter" xmlns="urn:mace:shibboleth:2.0:metadata">
-                <MetadataFilter xsi:tpe="SignatureValidation" trustEngineRef="shibboleth.SignatureTrustEngine" />
+                <MetadataFilter xsi:type="SignatureValidation" trustEngineRef="shibboleth.SignatureTrustEngine" />
                 <MetadataFilter xsi:type="EntityRoleWhiteList" xmlns="urn:mace:shibboleth:2.0:metadata">
                     <RetainedRole>samlmd:SPSSODescriptor</RetainedRole>
                 </MetadataFilter>
@@ -110,7 +110,7 @@
         <security:Rule xsi:type="samlsec:SAML2HTTPPostSimpleSign" trustEngineRef="shibboleth.SignatureTrustEngine" />
         <security:Rule xsi:type="security:ClientCertAuth" trustEngineRef="shibboleth.CredentialTrustEngine" />
         <security:Rule xsi:type="samlsec:MandatoryIssuer"/>
-        <Security:Rule xsi:type="security:MandatoryMessageAuthentication" />
+        <security:Rule xsi:type="security:MandatoryMessageAuthentication" />
     </security:SecurityPolicy>
     
 </RelyingPartyGroup>
\ No newline at end of file