svn commit: r1562114 - in /cxf/trunk/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:35:49 2014
New Revision: 1562114

URL: http://svn.apache.org/r1562114
Log:
Spelling correction + fix to get DOM-based signature code working with 
streaming code

Modified:
    
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
    
cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java

Modified: 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java?rev=1562114&r1=1562113&r2=1562114&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
 Tue Jan 28 16:35:49 2014
@@ -271,7 +271,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);
@@ -580,7 +580,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/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java?rev=1562114&r1=1562113&r2=1562114&view=diff
==============================================================================
--- 
cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java
 (original)
+++ 
cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java
 Tue Jan 28 16:35:49 2014
@@ -115,6 +115,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);
+            }
             
             X509Certificate cert = null;
             PublicKey publicKey = null;