[picketlink-commits] Picketlink SVN: r584 - in federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers: wsse and 1 other directories.

Author: anil.saldhana(a)jboss.com Date: 2010-12-01 10:44:48 -0500 (Wed, 01 Dec 2010) New Revision: 584 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLConditionsParser.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLStatusResponseTypeParser.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wsse/WSSecurityParser.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTRequestSecurityTokenParser.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTRequestSecurityTokenResponseParser.java Log: fixes Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLConditionsParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLConditionsParser.java 2010-12-01 15:38:54 UTC (rev 583) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLConditionsParser.java 2010-12-01 15:44:48 UTC (rev 584) @@ -101,6 +101,8 @@ nextEndElement = StaxParserUtil.getNextEndElement(xmlEventReader); break; } + else + throw new RuntimeException( "unknown end element:" + StaxParserUtil.getEndElementName(nextEndElement)); } String tag = null; Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLStatusResponseTypeParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLStatusResponseTypeParser.java 2010-12-01 15:38:54 UTC (rev 583) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLStatusResponseTypeParser.java 2010-12-01 15:44:48 UTC (rev 584) @@ -143,6 +143,8 @@ EndElement endElement = StaxParserUtil.getNextEndElement(xmlEventReader); if( StaxParserUtil.matches(endElement, STATUS )) break; + else + throw new RuntimeException( "unknown end element:" + StaxParserUtil.getEndElementName( endElement )); } } return status; Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java 2010-12-01 15:38:54 UTC (rev 583) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java 2010-12-01 15:44:48 UTC (rev 584) @@ -220,6 +220,8 @@ xmlEvent = StaxParserUtil.getNextEndElement(xmlEventReader); break; } + else + throw new RuntimeException( "unknown end element:" + tag ); } startElement = (StartElement) xmlEvent; tag = StaxParserUtil.getStartElementName(startElement); Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wsse/WSSecurityParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wsse/WSSecurityParser.java 2010-12-01 15:38:54 UTC (rev 583) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wsse/WSSecurityParser.java 2010-12-01 15:44:48 UTC (rev 584) @@ -151,6 +151,8 @@ endElement = StaxParserUtil.getNextEndElement(xmlEventReader); break; } + else + throw new RuntimeException( "unknown end element:" + tag ); } startElement = (StartElement) xmlEvent; Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTRequestSecurityTokenParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTRequestSecurityTokenParser.java 2010-12-01 15:38:54 UTC (rev 583) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTRequestSecurityTokenParser.java 2010-12-01 15:44:48 UTC (rev 584) @@ -86,7 +86,7 @@ if( endElementTag.equals( WSTrustConstants.RST ) ) break; else - throw new RuntimeException( "Unknown End Element:" + StaxParserUtil.getEndElementName( endElement ) ); + throw new RuntimeException( "Unknown End Element:" + endElementTag ); } try Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTRequestSecurityTokenResponseParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTRequestSecurityTokenResponseParser.java 2010-12-01 15:38:54 UTC (rev 583) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTRequestSecurityTokenResponseParser.java 2010-12-01 15:44:48 UTC (rev 584) @@ -92,7 +92,7 @@ if (endElementTag.equals(WSTrustConstants.RSTR)) break; else - throw new RuntimeException( "Unknown End Element:" + StaxParserUtil.getEndElementName( endElement ) ); + throw new RuntimeException( "Unknown End Element:" + endElementTag ); } try @@ -335,11 +335,14 @@ xmlEvent = StaxParserUtil.peek(xmlEventReader); if (xmlEvent instanceof EndElement) { - if (StaxParserUtil.getEndElementName((EndElement) xmlEvent).equals(WSTrustConstants.STATUS)) + String endElementTag = StaxParserUtil.getEndElementName((EndElement) xmlEvent); + if ( endElementTag.equals(WSTrustConstants.STATUS)) { xmlEvent = StaxParserUtil.getNextEndElement(xmlEventReader); break; - } + } + else + throw new RuntimeException( "unknown end element:" + endElementTag ); } startElement = (StartElement) xmlEvent; String tag = StaxParserUtil.getStartElementName(startElement); @@ -380,11 +383,14 @@ xmlEvent = StaxParserUtil.peek(xmlEventReader); if (xmlEvent instanceof EndElement) { - if (StaxParserUtil.getEndElementName((EndElement) xmlEvent).equals(WSTrustConstants.REQUESTED_TOKEN)) + String endElementTag = StaxParserUtil.getEndElementName( (EndElement) xmlEvent ); + if ( endElementTag.equals(WSTrustConstants.REQUESTED_TOKEN)) { xmlEvent = StaxParserUtil.getNextEndElement(xmlEventReader); break; } + else + throw new RuntimeException( "unknown end element:" + endElementTag ); } Element tokenElement = StaxParserUtil.getDOMElement(xmlEventReader); requestedSecurityTokenType.setAny(tokenElement);