svn commit: r1199738 - in /santuario/xml-security-java/trunk: pom.xml src/main/java/org/apache/xml/security/encryption/TransformSerializer.java src/main/java/org/apache/xml/security/encryption/XMLCipher.java

[co...@apache.org]

Author: coheigea
Date: Wed Nov  9 13:18:29 2011
New Revision: 1199738

URL: http://svn.apache.org/viewvc?rev=1199738&view=rev
Log:
[SANTUARIO-252] - Made Xalan, Xerces + xml-apis optional in the project pom
 - Reverted to DocumentSerializer by default as it does not work without Xalan.
 - Xalan (+ xerces + xmlapis) are now optional and only required to support the XPath here() function

Modified:
    santuario/xml-security-java/trunk/pom.xml
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/TransformSerializer.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java

Modified: santuario/xml-security-java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/pom.xml?rev=1199738&r1=1199737&r2=1199738&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/pom.xml (original)
+++ santuario/xml-security-java/trunk/pom.xml Wed Nov  9 13:18:29 2011
@@ -288,18 +288,21 @@
             <artifactId>xalan</artifactId>
             <version>${xalan.version}</version>
             <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
             <version>${xerces.version}</version>
             <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>xml-apis</groupId>
             <artifactId>xml-apis</artifactId>
             <version>${xml.apis.version}</version>
             <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/TransformSerializer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/TransformSerializer.java?rev=1199738&r1=1199737&r2=1199738&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/TransformSerializer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/TransformSerializer.java Wed Nov  9 13:18:29 2011
@@ -31,7 +31,8 @@ import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.Node;
 
 /**
- * Converts <code>String</code>s into <code>Node</code>s and visa versa.
+ * Converts <code>String</code>s into <code>Node</code>s and visa versa. This requires Xalan to 
+ * work properly.
  */
 public class TransformSerializer extends AbstractSerializer {
     

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java?rev=1199738&r1=1199737&r2=1199738&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java Wed Nov  9 13:18:29 2011
@@ -271,7 +271,7 @@ public class XMLCipher {
         }
 
         if (serializer == null) {
-            serializer = new TransformSerializer();
+            serializer = new DocumentSerializer();
         }
         serializer.setCanonicalizer(this.canon);