You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2011/12/14 12:25:54 UTC

svn commit: r1214169 - in /santuario/xml-security-java/trunk: ./ samples/org/apache/xml/security/samples/ samples/org/apache/xml/security/samples/keys/ samples/org/apache/xml/security/samples/signature/ samples/org/apache/xml/security/samples/utils/ sr...

Author: coheigea
Date: Wed Dec 14 11:25:53 2011
New Revision: 1214169

URL: http://svn.apache.org/viewvc?rev=1214169&view=rev
Log:
Some more work on the samples + some cleanup

Removed:
    santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/ResolverUsageHTTP.java
    santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/TransformNoneUser.java
    santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/TransformPerformanceTester.java
    santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/keys/RetrievePublicKeys.java
Modified:
    santuario/xml-security-java/trunk/build.xml
    santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleSixteen.java
    santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleTwentyThree.java
    santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java
    santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/Base64Sample.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java

Modified: santuario/xml-security-java/trunk/build.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/build.xml?rev=1214169&r1=1214168&r2=1214169&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/build.xml (original)
+++ santuario/xml-security-java/trunk/build.xml Wed Dec 14 11:25:53 2011
@@ -388,7 +388,7 @@
 		<classpath refid="id.classpath.samples"/>
 	</java>
     </target>
-
+    
     <target name="encryptAndDecrypt"
 	    depends="encrypt, decrypt" 
 	    description="encrypts and decrypts an element's contents" />

Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleSixteen.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleSixteen.java?rev=1214169&r1=1214168&r2=1214169&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleSixteen.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleSixteen.java Wed Dec 14 11:25:53 2011
@@ -78,7 +78,7 @@ public class CreateMerlinsExampleSixteen
         String privateKeyAlias = "test";
         String privateKeyPass = "xmlsecurity";
         String certificateAlias = "test";
-        File signatureFile = new File("merlinsSixteenRecreatedNoRetrievalMethod.xml");
+        File signatureFile = new File("build/merlinsSixteenRecreatedNoRetrievalMethod.xml");
 
         KeyStore ks = KeyStore.getInstance(keystoreType);
         FileInputStream fis = new FileInputStream(keystoreFile);
@@ -400,7 +400,7 @@ public class CreateMerlinsExampleSixteen
         SignedInfo s = sig.getSignedInfo();
         for (int i = 0; i < s.getLength(); i++) {
             Reference r = s.item(i);
-            String fn = "merlin16_"+i+".html";
+            String fn = "build/merlin16_"+i+".html";
             System.out.println("Wrote Reference " + i + " to file " + fn);
             JavaUtils.writeBytesToFilename(fn, r.getHTMLRepresentation().getBytes());
         }

Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleTwentyThree.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleTwentyThree.java?rev=1214169&r1=1214168&r2=1214169&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleTwentyThree.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleTwentyThree.java Wed Dec 14 11:25:53 2011
@@ -79,7 +79,7 @@ public class CreateMerlinsExampleTwentyT
         String privateKeyAlias = "test";
         String privateKeyPass = "xmlsecurity";
         String certificateAlias = "test";
-        File signatureFile = new File("merlinsTwentyThreeRecreatedNoRetrievalMethod.xml");
+        File signatureFile = new File("build/merlinsTwentyThreeRecreatedNoRetrievalMethod.xml");
 
         KeyStore ks = KeyStore.getInstance(keystoreType);
         FileInputStream fis = new FileInputStream(keystoreFile);
@@ -400,7 +400,7 @@ public class CreateMerlinsExampleTwentyT
         SignedInfo s = sig.getSignedInfo();
         for (int i = 0; i < s.getLength(); i++) {
             Reference r = s.item(i);
-            String fn = "merlin16_"+i+".html";
+            String fn = "build/merlin16_"+i+".html";
             System.out.println("Wrote Reference " + i + " to file " + fn);
             JavaUtils.writeBytesToFilename(fn, r.getHTMLRepresentation().getBytes());
         }

Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java?rev=1214169&r1=1214168&r2=1214169&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java Wed Dec 14 11:25:53 2011
@@ -132,8 +132,7 @@ public class VerifyMerlinsExamplesSixtee
 
                     if (systemId.endsWith("xmldsig-core-schema.xsd")) {
                         try {
-                            return new org.xml.sax
-                            .InputSource(new FileInputStream(signatureSchemaFile));
+                            return new org.xml.sax.InputSource(new FileInputStream(signatureSchemaFile));
                         } catch (FileNotFoundException ex) {
                             throw new org.xml.sax.SAXException(ex);
                         }

Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/Base64Sample.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/Base64Sample.java?rev=1214169&r1=1214168&r2=1214169&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/Base64Sample.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/Base64Sample.java Wed Dec 14 11:25:53 2011
@@ -43,6 +43,8 @@ public class Base64Sample {
      * @throws Exception
      */
     public static void main(String[] unused) throws Exception {
+        
+        org.apache.xml.security.Init.init();
 
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
 

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java?rev=1214169&r1=1214168&r2=1214169&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java Wed Dec 14 11:25:53 2011
@@ -356,7 +356,7 @@ public class SignatureAlgorithm extends 
      * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI is already registered
      * @throws XMLSignatureException 
      */
-    public static void register(String algorithmURI, Class<SignatureAlgorithmSpi> implementingClass)
+    public static void register(String algorithmURI, Class<? extends SignatureAlgorithmSpi> implementingClass)
        throws AlgorithmAlreadyRegisteredException, ClassNotFoundException, 
            XMLSignatureException {
         if (log.isDebugEnabled()) {

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java?rev=1214169&r1=1214168&r2=1214169&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java Wed Dec 14 11:25:53 2011
@@ -78,13 +78,6 @@ public class X509IssuerSerialResolver ex
             return null;
         }
 
-        if (x509data == null) {
-            if (log.isDebugEnabled()) {
-                log.debug("I can't");
-            }
-            return null;
-        }
-
         if (!x509data.containsIssuerSerial()) {
             return null;
         }

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java?rev=1214169&r1=1214168&r2=1214169&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java Wed Dec 14 11:25:53 2011
@@ -204,7 +204,7 @@ public final class Transform extends Sig
      * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI 
      * is already registered
      */
-    public static void register(String algorithmURI, Class<TransformSpi> implementingClass)
+    public static void register(String algorithmURI, Class<? extends TransformSpi> implementingClass)
         throws AlgorithmAlreadyRegisteredException {
         // are we already registered?
         Class<? extends TransformSpi> transformSpi = transformSpiHash.get(algorithmURI);

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java?rev=1214169&r1=1214168&r2=1214169&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java Wed Dec 14 11:25:53 2011
@@ -289,7 +289,7 @@ public class Transforms extends Signatur
     
     private void checkSecureValidation(Transform transform) throws TransformationException {
         String uri = transform.getURI();
-        if (Transforms.TRANSFORM_XSLT.equals(uri)) {
+        if (secureValidation && Transforms.TRANSFORM_XSLT.equals(uri)) {
             Object exArgs[] = { uri };
 
             throw new TransformationException(

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java?rev=1214169&r1=1214168&r2=1214169&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java Wed Dec 14 11:25:53 2011
@@ -221,7 +221,7 @@ public class ResourceResolver {
      * @param className
      * @param start
      */
-    public static void register(Class<ResourceResolverSpi> className, boolean start) {
+    public static void register(Class<? extends ResourceResolverSpi> className, boolean start) {
         try {
             ResourceResolverSpi resourceResolverSpi = className.newInstance();
             register(resourceResolverSpi, start);