Accept old snytax in idp configuration file.
authorwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Wed, 2 Mar 2005 02:22:24 +0000 (02:22 +0000)
committerwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Wed, 2 Mar 2005 02:22:24 +0000 (02:22 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1260 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

src/edu/internet2/middleware/shibboleth/idp/IdPConfig.java
src/schemas/shibboleth-idpconfig-1.0.xsd
src/schemas/xenc-schema.xsd

index 6c92185..e722e49 100644 (file)
@@ -54,7 +54,8 @@ public class IdPConfig {
 
        public IdPConfig(Element config) throws ShibbolethConfigurationException {
 
-               if (!config.getTagName().equals("IdPConfig")) { throw new ShibbolethConfigurationException(
+               if (!config.getTagName().equals("IdPConfig") && !config.getTagName().equals("ShibbolethOriginConfig")) { 
+                       throw new ShibbolethConfigurationException(
                                "Unexpected configuration data.  <IdPConfig/> is needed."); }
 
                log.debug("Loading global configuration properties.");
index 8d65337..470f3fe 100644 (file)
 
        <xs:import namespace="urn:mace:shibboleth:credentials:1.0" schemaLocation="credentials.xsd"/>
        <xs:import namespace="urn:mace:shibboleth:namemapper:1.0" schemaLocation="namemapper.xsd"/>
-
-       <xs:element name="IdPConfig" type="idp:ShibbolethOriginConfig"/>
-
+       
+       <xs:choice>
+               <xs:element name="IdPConfig" type="idp:IdPConfigType"/>
+               <xs:element name="ShibbolethOriginConfig" type="idp:IdPConfigType"/>
+       </xs:choice>
+       
        <xs:simpleType name="LevelType">
                <xs:restriction base="xs:string">
                        <xs:enumeration value="OFF"/>
@@ -40,7 +43,7 @@
                </xs:restriction>
        </xs:simpleType>
 
-               <xs:complexType name="ShibbolethOriginConfig">
+               <xs:complexType name="IdPConfigType">
                        <xs:sequence>
                                <xs:sequence>
                                        <xs:element name="RelyingParty" maxOccurs="unbounded">
index 85af68b..a0a26e2 100644 (file)
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE schema  PUBLIC "-//W3C//DTD XMLSchema 200102//EN"
- "http://www.w3.org/2001/XMLSchema.dtd"
- [
-   <!ATTLIST schema
-     xmlns:xenc CDATA #FIXED 'http://www.w3.org/2001/04/xmlenc#'
-     xmlns:ds CDATA #FIXED 'http://www.w3.org/2000/09/xmldsig#'>
-   <!ENTITY xenc 'http://www.w3.org/2001/04/xmlenc#'>
-   <!ENTITY % p ''>
-   <!ENTITY % s ''>
-  ]>
+
 
 <schema xmlns='http://www.w3.org/2001/XMLSchema' version='1.0'
         xmlns:xenc='http://www.w3.org/2001/04/xmlenc#'