svn commit: r1562115 - in /cxf/branches/2.7.x-fixes/rt: frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java

[coheigea]

Author: coheigea
Date: Tue Jan 28 16:41:35 2014
New Revision: 1562115

URL: http://svn.apache.org/r1562115
Log:
Merged revisions 1562114 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1562114 | coheigea | 2014-01-28 16:35:49 +0000 (Tue, 28 Jan 2014) | 2 lines

  Spelling correction + fix to get DOM-based signature code working with 
streaming code

........

Modified:
    
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
    
cxf/branches/2.7.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java

Modified: 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java?rev=1562115&r1=1562114&r2=1562115&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
 Tue Jan 28 16:41:35 2014
@@ -262,7 +262,7 @@ public class JAXBElementProvider<T> exte
             if (is == null) {
                 Reader reader = 
getStreamHandlerFromCurrentMessage(Reader.class);
                 if (reader == null) {
-                    LOG.severe("No InputStream, Reader, or XMStreamReader is 
available");
+                    LOG.severe("No InputStream, Reader, or XMLStreamReader is 
available");
                     throw new InternalServerErrorException();
                 }
                 xmlReader = StaxUtils.createXMLStreamReader(reader);
@@ -567,7 +567,7 @@ public class JAXBElementProvider<T> exte
         if (os == null) {
             Writer writer = getStreamHandlerFromCurrentMessage(Writer.class);
             if (writer == null) {
-                LOG.severe("No OutputStream, Writer, or XMStreamWriter is 
available");
+                LOG.severe("No OutputStream, Writer, or XMLStreamWriter is 
available");
                 throw new InternalServerErrorException();
             }
             ms.marshal(obj, writer);

Modified: 
cxf/branches/2.7.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java?rev=1562115&r1=1562114&r2=1562115&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java
 Tue Jan 28 16:41:35 2014
@@ -113,6 +113,9 @@ public class AbstractXmlSigInHandler ext
             if (signedElement.hasAttributeNS(null, "ID")) {
                 signedElement.setIdAttributeNS(null, "ID", true);
             }
+            if (signedElement.hasAttributeNS(null, "Id")) {
+                signedElement.setIdAttributeNS(null, "Id", true);
+            }
             
             // See also WSS4J SAMLUtil.getCredentialFromKeyInfo 
             KeyInfo keyInfo = signature.getKeyInfo();