[jboss-cvs] Picketlink SVN: r745 - in federation/trunk: picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/response and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 7 23:13:29 EST 2011
Author: anil.saldhana at jboss.com
Date: 2011-02-07 23:13:27 -0500 (Mon, 07 Feb 2011)
New Revision: 745
Modified:
federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/request/SAML2Request.java
federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/response/SAML2Response.java
federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/sig/SAML2Signature.java
federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/util/KeyUtil.java
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/metadata/store/FileBasedMetadataConfigurationStore.java
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java
federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/filters/SPFilter.java
federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java
federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/CircleOfTrustServlet.java
federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/SOAPSAMLXACMLServlet.java
federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/RedirectBindingSignatureUtil.java
Log:
remove jaxb remnants
Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/request/SAML2Request.java
===================================================================
--- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/request/SAML2Request.java 2011-02-08 03:51:59 UTC (rev 744)
+++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/request/SAML2Request.java 2011-02-08 04:13:27 UTC (rev 745)
@@ -28,11 +28,7 @@
import java.io.OutputStream;
import java.io.Writer;
import java.net.URI;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.parsers.ParserConfigurationException;
@@ -48,10 +44,8 @@
import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil;
import org.picketlink.identity.federation.core.saml.v2.writers.SAMLRequestWriter;
import org.picketlink.identity.federation.core.saml.v2.writers.SAMLResponseWriter;
-import org.picketlink.identity.federation.core.util.JAXBUtil;
import org.picketlink.identity.federation.core.util.StaxUtil;
import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.protocol.XACMLAuthzDecisionQueryType;
import org.picketlink.identity.federation.newmodel.saml.v2.protocol.AuthnRequestType;
import org.picketlink.identity.federation.newmodel.saml.v2.protocol.LogoutRequestType;
import org.picketlink.identity.federation.newmodel.saml.v2.protocol.NameIDPolicyType;
@@ -143,25 +137,14 @@
{
if(is == null)
throw new IllegalStateException("InputStream is null");
-
+
Document samlDocument = DocumentUtil.getDocument(is);
-
- /*try
- {*/
- /*Binder<Node> binder = getBinder();
- JAXBElement<SAML2Object> jaxbAuthnRequestType = (JAXBElement<SAML2Object>) binder.unmarshal(samlDocument);
- SAML2Object requestType = jaxbAuthnRequestType.getValue();*/
-
- SAMLParser samlParser = new SAMLParser();
- SAML2Object requestType = (SAML2Object) samlParser.parse( DocumentUtil.getNodeAsStream( samlDocument ));
-
- samlDocumentHolder = new SAMLDocumentHolder(requestType, samlDocument);
- return requestType;
- /*}
- catch (JAXBException e)
- {
- throw new ParsingException(e);
- }*/
+
+ SAMLParser samlParser = new SAMLParser();
+ SAML2Object requestType = (SAML2Object) samlParser.parse( DocumentUtil.getNodeAsStream( samlDocument ));
+
+ samlDocumentHolder = new SAMLDocumentHolder(requestType, samlDocument);
+ return requestType;
}
/**
@@ -184,9 +167,6 @@
SAMLParser samlParser = new SAMLParser();
RequestAbstractType requestType = (RequestAbstractType) samlParser.parse( DocumentUtil.getNodeAsStream(samlDocument));
- /*Binder<Node> binder = getBinder();
- JAXBElement<RequestAbstractType> jaxbAuthnRequestType = (JAXBElement<RequestAbstractType>) binder.unmarshal(samlDocument);
- RequestAbstractType requestType = jaxbAuthnRequestType.getValue();*/
samlDocumentHolder = new SAMLDocumentHolder(requestType, samlDocument);
return requestType;
}
@@ -203,20 +183,14 @@
public AuthnRequestType getAuthnRequestType(InputStream is) throws ConfigurationException, ProcessingException, ParsingException
{
if(is == null)
- throw new IllegalStateException("InputStream is null");
- //String key = PicketLinkFederationConstants.JAXB_SCHEMA_VALIDATION;
- //boolean validate = Boolean.parseBoolean(SecurityActions.getSystemProperty(key, "false"));
+ throw new IllegalStateException("InputStream is null");
Document samlDocument = DocumentUtil.getDocument( is );
SAMLParser samlParser = new SAMLParser();
AuthnRequestType requestType = (AuthnRequestType) samlParser.parse( DocumentUtil.getNodeAsStream(samlDocument));
samlDocumentHolder = new SAMLDocumentHolder(requestType, samlDocument);
- return requestType;
-
- /*Unmarshaller un = JBossSAMLAuthnRequestFactory.getValidatingUnmarshaller(validate);
- JAXBElement<AuthnRequestType> jaxbAuthnRequestType = (JAXBElement<AuthnRequestType>) un.unmarshal(is);
- return jaxbAuthnRequestType.getValue();*/
+ return requestType;
}
@@ -250,48 +224,6 @@
}
/**
- * Parse an XACML Authorization Decision Query from an xml file
- * @param resourceName
- * @return
- * @throws JAXBException
- */
- public XACMLAuthzDecisionQueryType parseXACMLDecisionQuery(String resourceName) throws JAXBException
- {
- ClassLoader tcl = SecurityActions.getContextClassLoader();
- InputStream is = tcl.getResourceAsStream(resourceName);
- return this.parseXACMLDecisionQuery(is);
- }
-
- /**
- * XACMLAuthorizationDecisionQuery from an input stream
- * @param is The InputStream where the xacml query exists
- * @return
- * @throws JAXBException
- */
- @SuppressWarnings("unchecked")
- public XACMLAuthzDecisionQueryType parseXACMLDecisionQuery(InputStream is) throws JAXBException
- {
- if(is == null)
- throw new IllegalArgumentException("Inputstream is null");
-
- String samlPath = "org.picketlink.identity.federation.saml.v2.protocol";
- String xacmlPath = "org.jboss.security.xacml.core.model.context";
- String xsAssert = "org.picketlink.identity.federation.saml.v2.profiles.xacml.assertion";
- String xsProto = "org.picketlink.identity.federation.saml.v2.profiles.xacml.protocol";
- String path = samlPath + ":" + xacmlPath + ":" + xsAssert + ":" + xsProto;
-
- JAXBContext jaxb = JAXBUtil.getJAXBContext(path);
- Unmarshaller un = jaxb.createUnmarshaller();
-
- JAXBElement<RequestAbstractType> jaxbRequestType = (JAXBElement<RequestAbstractType>) un.unmarshal(is);
- RequestAbstractType req = jaxbRequestType.getValue();
- if(req instanceof XACMLAuthzDecisionQueryType == false)
- throw new IllegalStateException("Not of type XACMLAuthzDecisionQueryType");
-
- return (XACMLAuthzDecisionQueryType) req;
- }
-
- /**
* Return the DOM object
* @param rat
* @return
@@ -299,9 +231,6 @@
* @throws ParsingException
* @throws ConfigurationException
*/
- /*public Document convert(RequestAbstractType rat)
- throws SAXException, IOException, JAXBException, ConfigurationException */
-
public Document convert(RequestAbstractType rat)
throws ProcessingException, ConfigurationException, ParsingException
{
@@ -317,21 +246,13 @@
writer.write( (LogoutRequestType) rat);
}
- return DocumentUtil.getDocument( new String( bos.toByteArray() ));
-
- /*JAXBContext jaxb = JAXBUtil.getJAXBContext(RequestAbstractType.class);
- Binder<Node> binder = jaxb.createBinder();
-
- Document doc = DocumentUtil.createDocument();
- binder.marshal(JAXBElementMappingUtil.get(rat), doc);
- return doc;*/
+ return DocumentUtil.getDocument( new String( bos.toByteArray() ));
}
/**
* Convert a SAML2 Response into a Document
* @param responseType
- * @return
- * @throws JAXBException
+ * @return
* @throws ParserConfigurationException
*/
public Document convert( ResponseType responseType) throws ProcessingException, ParsingException, ConfigurationException
@@ -347,19 +268,11 @@
/**
* Marshall the AuthnRequestType to an output stream
* @param requestType
- * @param os
- * @throws JAXBException
+ * @param os
* @throws SAXException
*/
public void marshall(RequestAbstractType requestType, OutputStream os) throws ProcessingException
- {
- /*String key = PicketLinkFederationConstants.JAXB_SCHEMA_VALIDATION;
- boolean validate = Boolean.parseBoolean(SecurityActions.getSystemProperty(key, "false"));
-
- Marshaller marshaller = JBossSAMLAuthnRequestFactory.getValidatingMarshaller(validate);
- JAXBElement<?> j = JAXBElementMappingUtil.get(requestType);
- marshaller.marshal(j, os);
- */
+ {
SAMLRequestWriter samlRequestWriter = new SAMLRequestWriter( StaxUtil.getXMLStreamWriter(os));
if( requestType instanceof AuthnRequestType )
{
@@ -376,19 +289,11 @@
/**
* Marshall the AuthnRequestType to a writer
* @param requestType
- * @param writer
- * @throws JAXBException
+ * @param writer
* @throws SAXException
*/
public void marshall(RequestAbstractType requestType, Writer writer) throws ProcessingException
- {
- /*String key = PicketLinkFederationConstants.JAXB_SCHEMA_VALIDATION;
- boolean validate = Boolean.parseBoolean(SecurityActions.getSystemProperty(key, "false"));
-
- Marshaller marshaller = JBossSAMLAuthnRequestFactory.getValidatingMarshaller(validate);
- JAXBElement<?> j = JAXBElementMappingUtil.get(requestType);
- marshaller.marshal(j, writer);*/
-
+ {
SAMLRequestWriter samlRequestWriter = new SAMLRequestWriter( StaxUtil.getXMLStreamWriter( writer ));
if( requestType instanceof AuthnRequestType )
{
Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/response/SAML2Response.java
===================================================================
--- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/response/SAML2Response.java 2011-02-08 03:51:59 UTC (rev 744)
+++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/response/SAML2Response.java 2011-02-08 04:13:27 UTC (rev 745)
@@ -32,7 +32,6 @@
import java.net.URI;
import java.util.Arrays;
-import javax.xml.bind.JAXBException;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
import javax.xml.parsers.ParserConfigurationException;
@@ -358,7 +357,6 @@
* @return
* @throws ParsingException
* @throws ConfigurationException
- * @throws JAXBException
* @throws ParserConfigurationException
*/
public Document convert( StatusResponseType responseType) throws ProcessingException, ConfigurationException, ParsingException
Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/sig/SAML2Signature.java
===================================================================
--- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/sig/SAML2Signature.java 2011-02-08 03:51:59 UTC (rev 744)
+++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/sig/SAML2Signature.java 2011-02-08 04:13:27 UTC (rev 745)
@@ -25,8 +25,7 @@
import java.security.GeneralSecurityException;
import java.security.KeyPair;
import java.security.PublicKey;
-
-import javax.xml.bind.JAXBException;
+
import javax.xml.crypto.MarshalException;
import javax.xml.crypto.dsig.DigestMethod;
import javax.xml.crypto.dsig.SignatureMethod;
@@ -87,14 +86,13 @@
* @param signatureMethod (Example: SignatureMethod.DSA_SHA1)
* @return
* @throws ParserConfigurationException
- * @throws JAXBException
* @throws IOException
* @throws SAXException
* @throws XMLSignatureException
* @throws MarshalException
* @throws GeneralSecurityException
*/
- public Document sign(RequestAbstractType request, KeyPair keypair) throws SAXException, IOException, JAXBException, ParserConfigurationException, GeneralSecurityException, MarshalException, XMLSignatureException
+ public Document sign(RequestAbstractType request, KeyPair keypair) throws SAXException, IOException, ParserConfigurationException, GeneralSecurityException, MarshalException, XMLSignatureException
{
SAML2Request saml2Request = new SAML2Request();
Document doc = saml2Request.convert(request);
@@ -115,13 +113,12 @@
* @param digestMethod (Example: DigestMethod.SHA1)
* @param signatureMethod (Example: SignatureMethod.DSA_SHA1)
* @return
- * @throws ParserConfigurationException
- * @throws JAXBException
+ * @throws ParserConfigurationException
* @throws XMLSignatureException
* @throws MarshalException
* @throws GeneralSecurityException
*/
- public Document sign(ResponseType response,KeyPair keypair) throws JAXBException, ParserConfigurationException, GeneralSecurityException, MarshalException, XMLSignatureException
+ public Document sign(ResponseType response,KeyPair keypair) throws ParserConfigurationException, GeneralSecurityException, MarshalException, XMLSignatureException
{
SAML2Response saml2Request = new SAML2Response();
Document doc = saml2Request.convert(response);
@@ -137,15 +134,14 @@
* @param digestMethod (Example: DigestMethod.SHA1)
* @param signatureMethod (Example: SignatureMethod.DSA_SHA1)
* @return
- * @throws ParserConfigurationException
- * @throws JAXBException
+ * @throws ParserConfigurationException
* @throws XMLSignatureException
* @throws MarshalException
* @throws GeneralSecurityException
*/
public Document sign(Document doc,
String referenceID,
- KeyPair keypair) throws JAXBException,
+ KeyPair keypair) throws
ParserConfigurationException, GeneralSecurityException, MarshalException, XMLSignatureException
{
String referenceURI = "#" + referenceID;
@@ -163,8 +159,7 @@
* @param keypair
* @param referenceURI
* @return
- * @throws ParserConfigurationException
- * @throws JAXBException
+ * @throws ParserConfigurationException
* @throws TransformerException
* @throws TransformerFactoryConfigurationError
* @throws XPathException
@@ -175,7 +170,7 @@
public Document sign(ResponseType response,
String idValueOfAssertion,
KeyPair keypair,
- String referenceURI) throws JAXBException, ParserConfigurationException, XPathException, TransformerFactoryConfigurationError, TransformerException, GeneralSecurityException, MarshalException, XMLSignatureException
+ String referenceURI) throws ParserConfigurationException, XPathException, TransformerFactoryConfigurationError, TransformerException, GeneralSecurityException, MarshalException, XMLSignatureException
{
SAML2Response saml2Response = new SAML2Response();
Document doc = saml2Response.convert(response);
@@ -190,7 +185,6 @@
* @param keypair
* @param referenceURI
* @return
- * @throws JAXBException
* @throws ParserConfigurationException
* @throws XPathException
* @throws TransformerFactoryConfigurationError
@@ -202,7 +196,7 @@
public Document sign(Document doc,
String idValueOfAssertion,
KeyPair keypair,
- String referenceURI) throws JAXBException, ParserConfigurationException, XPathException, TransformerFactoryConfigurationError, TransformerException, GeneralSecurityException, MarshalException, XMLSignatureException
+ String referenceURI) throws ParserConfigurationException, XPathException, TransformerFactoryConfigurationError, TransformerException, GeneralSecurityException, MarshalException, XMLSignatureException
{
Node assertionNode = DocumentUtil.getNodeWithAttribute(doc,
Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/util/KeyUtil.java
===================================================================
--- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/util/KeyUtil.java 2011-02-08 03:51:59 UTC (rev 744)
+++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/util/KeyUtil.java 2011-02-08 04:13:27 UTC (rev 745)
@@ -28,8 +28,6 @@
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
-import javax.xml.bind.JAXBException;
-
import org.picketlink.identity.federation.core.exceptions.ConfigurationException;
import org.picketlink.identity.federation.core.exceptions.ParsingException;
import org.picketlink.identity.federation.core.exceptions.ProcessingException;
@@ -60,8 +58,7 @@
/**
* Given a certificate, build a keyinfo type
* @param certificate
- * @return
- * @throws JAXBException
+ * @return
* @throws CertificateException
* @throws ProcessingException
* @throws ParsingException
Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/metadata/store/FileBasedMetadataConfigurationStore.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/metadata/store/FileBasedMetadataConfigurationStore.java 2011-02-08 03:51:59 UTC (rev 744)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/metadata/store/FileBasedMetadataConfigurationStore.java 2011-02-08 04:13:27 UTC (rev 745)
@@ -182,23 +182,7 @@
catch (ParsingException e)
{
throw new RuntimeException( e );
- }/*
- Unmarshaller un;
- try
- {
-
- un = JAXBUtil.getUnmarshaller(pkgName);
- JAXBElement<EntityDescriptorType> je =
- (JAXBElement<EntityDescriptorType>) un.unmarshal(persistedFile);
- return je.getValue();
}
- catch (JAXBException e)
- {
- IOException ioe =new IOException(e.getLocalizedMessage());
- ioe.initCause(e);
- throw ioe;
- }*/
-
}
/**
Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java 2011-02-08 03:51:59 UTC (rev 744)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java 2011-02-08 04:13:27 UTC (rev 745)
@@ -37,8 +37,6 @@
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
import javax.xml.namespace.QName;
import org.apache.log4j.Logger;
@@ -47,7 +45,6 @@
import org.picketlink.identity.federation.core.config.STSType;
import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil;
import org.picketlink.identity.federation.core.util.Base64;
-import org.picketlink.identity.federation.core.util.JAXBUtil;
import org.picketlink.identity.federation.core.util.XMLEncryptionUtil;
import org.picketlink.identity.federation.core.wstrust.wrappers.Lifetime;
import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityToken;
@@ -78,7 +75,6 @@
*
* @author <a href="mailto:sguilhen at redhat.com">Stefan Guilhen</a>
*/
- at SuppressWarnings("unchecked")
public class WSTrustUtil
{
@@ -284,10 +280,9 @@
* Marshall the {@code STSType} to an outputstream
* </p>
* @param stsConfiguration
- * @param outputStream
- * @throws JAXBException
+ * @param outputStream
*/
- public static void persistSTSConfiguration(STSType stsConfiguration, OutputStream outputStream) throws JAXBException
+ public static void persistSTSConfiguration(STSType stsConfiguration, OutputStream outputStream)
{
throw new RuntimeException();
Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/filters/SPFilter.java
===================================================================
--- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/filters/SPFilter.java 2011-02-08 03:51:59 UTC (rev 744)
+++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/filters/SPFilter.java 2011-02-08 04:13:27 UTC (rev 745)
@@ -50,7 +50,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import javax.xml.bind.JAXBException;
import javax.xml.crypto.MarshalException;
import javax.xml.crypto.dsig.CanonicalizationMethod;
import javax.xml.crypto.dsig.XMLSignatureException;
@@ -591,7 +590,7 @@
protected void sendRequestToIDP(AuthnRequestType authnRequest, String relayState,
HttpServletResponse response)
- throws IOException, SAXException, JAXBException,GeneralSecurityException
+ throws IOException, SAXException, GeneralSecurityException
{
SAML2Request saml2Request = new SAML2Request();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -607,7 +606,7 @@
String destination,
HttpServletResponse response,
boolean request)
- throws IOException, SAXException, JAXBException,GeneralSecurityException
+ throws IOException, SAXException, GeneralSecurityException
{
if(!ignoreSignatures)
{
Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java
===================================================================
--- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java 2011-02-08 03:51:59 UTC (rev 744)
+++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java 2011-02-08 04:13:27 UTC (rev 745)
@@ -315,18 +315,7 @@
{
throw new ProcessingException( e );
}
- /*catch(JAXBException pe)
- {
- throw new ProcessingException(pe);
- }
- catch(IOException pe)
- {
- throw new ProcessingException(pe);
- }
- catch(SAXException pe)
- {
- throw new ProcessingException(pe);
- }*/
+
return;
}
Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/CircleOfTrustServlet.java
===================================================================
--- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/CircleOfTrustServlet.java 2011-02-08 03:51:59 UTC (rev 744)
+++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/CircleOfTrustServlet.java 2011-02-08 04:13:27 UTC (rev 745)
@@ -33,7 +33,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import javax.xml.bind.JAXBException;
import org.picketlink.identity.federation.core.saml.v2.metadata.store.FileBasedMetadataConfigurationStore;
import org.picketlink.identity.federation.core.saml.v2.metadata.store.IMetadataConfigurationStore;
@@ -147,7 +146,7 @@
}
private void addIDP(HttpServletRequest request, HttpServletResponse response)
- throws IOException, JAXBException
+ throws IOException
{
String spName = request.getParameter("spname");
String idpName = request.getParameter("idpname");
@@ -179,7 +178,7 @@
}
private void addSP(HttpServletRequest request, HttpServletResponse response)
- throws JAXBException, IOException
+ throws IOException
{
String idpName = request.getParameter("idpname");
String spName = request.getParameter("spname");
@@ -209,7 +208,7 @@
}
- private EntityDescriptorType getMetaData(String metadataURL) throws JAXBException, IOException
+ private EntityDescriptorType getMetaData(String metadataURL) throws IOException
{
throw new RuntimeException();
Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/SOAPSAMLXACMLServlet.java
===================================================================
--- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/SOAPSAMLXACMLServlet.java 2011-02-08 03:51:59 UTC (rev 744)
+++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/SOAPSAMLXACMLServlet.java 2011-02-08 04:13:27 UTC (rev 745)
@@ -281,12 +281,6 @@
//Create a SOAP Envelope to hold the SAML response
envelope = this.createEnvelope(jaxbResponse); */
}
- /*catch (JAXBException e)r
- {
- String id = IDGenerator.create();
- log.error(id + "::Exception parsing SOAP:", e);
- envelope = this.createEnvelope(this.createFault("Parsing Error. Reference::" + id));
- } */
catch ( Exception e )
{
e.printStackTrace();
Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/RedirectBindingSignatureUtil.java
===================================================================
--- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/RedirectBindingSignatureUtil.java 2011-02-08 03:51:59 UTC (rev 744)
+++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/RedirectBindingSignatureUtil.java 2011-02-08 04:13:27 UTC (rev 745)
@@ -31,8 +31,6 @@
import java.security.PrivateKey;
import java.security.PublicKey;
-import javax.xml.bind.JAXBException;
-
import org.picketlink.identity.federation.api.saml.v2.request.SAML2Request;
import org.picketlink.identity.federation.api.saml.v2.response.SAML2Response;
import org.picketlink.identity.federation.core.exceptions.ConfigurationException;
@@ -60,13 +58,12 @@
* @param relayState
* @param signingKey
* @return
- * @throws JAXBException
* @throws SAXException
* @throws IOException
* @throws GeneralSecurityException
*/
public static String getSAMLRequestURLWithSignature(AuthnRequestType authRequest, String relayState,
- PrivateKey signingKey) throws SAXException, JAXBException, IOException, GeneralSecurityException
+ PrivateKey signingKey) throws SAXException, IOException, GeneralSecurityException
{
SAML2Request saml2Request = new SAML2Request();
@@ -94,11 +91,10 @@
* @param signingKey
* @return
* @throws IOException
- * @throws GeneralSecurityException
- * @throws JAXBException
+ * @throws GeneralSecurityException
*/
public static String getSAMLResponseURLWithSignature(ResponseType responseType, String relayState,
- PrivateKey signingKey) throws IOException, GeneralSecurityException, JAXBException
+ PrivateKey signingKey) throws IOException, GeneralSecurityException
{
SAML2Response saml2Response = new SAML2Response();
More information about the jboss-cvs-commits
mailing list