Author: anil.saldhana(a)jboss.com
Date: 2011-01-31 18:10:53 -0500 (Mon, 31 Jan 2011)
New Revision: 691
Modified:
picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlConfiguration.java
Log:
use the saml parsers
Modified:
picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlConfiguration.java
===================================================================
---
picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlConfiguration.java 2011-01-31
23:10:21 UTC (rev 690)
+++
picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlConfiguration.java 2011-01-31
23:10:53 UTC (rev 691)
@@ -37,17 +37,13 @@
import java.util.List;
import java.util.Map;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-
+import org.picketlink.identity.federation.core.parsers.saml.SAMLParser;
import
org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntitiesDescriptorType;
import
org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.RoleDescriptorType;
+import
org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTChoiceType;
import
org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTDescriptorChoiceType;
import
org.picketlink.identity.federation.newmodel.saml.v2.metadata.IDPSSODescriptorType;
-import
org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTChoiceType;
+import org.picketlink.identity.federation.newmodel.saml.v2.metadata.RoleDescriptorType;
import org.picketlink.identity.seam.federation.jaxb.config.SamlConfigType;
import org.picketlink.identity.seam.federation.jaxb.config.SamlIdentityProviderType;
@@ -138,13 +134,21 @@
{
try
{
- JAXBContext jaxbContext =
JAXBContext.newInstance("org.picketlink.identity.federation.saml.v2.metadata");
+ InputStream samlEntitiesStream = getClass().getResourceAsStream(
SAML_ENTITIES_FILE );
+ if( samlEntitiesStream == null )
+ throw new RuntimeException( "SAML Entities File is missing" );
+
+ SAMLParser samlParser = new SAMLParser();
+ EntitiesDescriptorType entitiesDescriptor = (EntitiesDescriptorType)
samlParser.parse( samlEntitiesStream );
+
+ /*JAXBContext jaxbContext =
JAXBContext.newInstance("org.picketlink.identity.federation.saml.v2.metadata");
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
JAXBElement<?> o = (JAXBElement<?>)
unmarshaller.unmarshal(getClass().getResource(SAML_ENTITIES_FILE));
EntitiesDescriptorType entitiesDescriptor = (EntitiesDescriptorType)
o.getValue();
+ */
readEntitiesDescriptor(entitiesDescriptor);
}
- catch (JAXBException e)
+ catch ( Exception e)
{
throw new RuntimeException(e);
}
Show replies by date