You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by ra...@apache.org on 2005/03/23 18:49:32 UTC

cvs commit: xml-security/src/org/apache/xml/security/transforms TransformSpi.java

raul        2005/03/23 09:49:32

  Modified:    src/org/apache/xml/security/transforms/implementations
                        TransformXSLT.java TransformC14N.java
                        TransformBase64Decode.java
                        TransformC14NWithComments.java
                        TransformC14NExclusiveWithComments.java
                        TransformC14NExclusive.java TransformXPointer.java
                        TransformEnvelopedSignature.java
               src/org/apache/xml/security/transforms TransformSpi.java
  Log:
  Remove wantsOctectStream wantsNodeSet and his returns pair they are not used, right now and some are incorrect.
  
  Revision  Changes    Path
  1.10      +1 -10     xml-security/src/org/apache/xml/security/transforms/implementations/TransformXSLT.java
  
  Index: TransformXSLT.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/transforms/implementations/TransformXSLT.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TransformXSLT.java	23 Sep 2004 20:23:19 -0000	1.9
  +++ TransformXSLT.java	23 Mar 2005 17:49:32 -0000	1.10
  @@ -59,16 +59,7 @@
      static final String XSLTSpecNS              = "http://www.w3.org/1999/XSL/Transform";
      static final String defaultXSLTSpecNSprefix = "xslt";
      static final String XSLTSTYLESHEET          = "stylesheet";
  -   
  -   /** @inheritDoc */
  -   public boolean wantsOctetStream ()   { return false; }
  -   /** @inheritDoc */
  -   public boolean wantsNodeSet ()       { return true; }
  -   /** @inheritDoc */
  -   public boolean returnsOctetStream () { return true; }
  -   /** @inheritDoc */
  -   public boolean returnsNodeSet ()     { return true; }
  -   //J+
  +
   
      /**
       * Method engineGetURI
  
  
  
  1.12      +0 -10     xml-security/src/org/apache/xml/security/transforms/implementations/TransformC14N.java
  
  Index: TransformC14N.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/transforms/implementations/TransformC14N.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- TransformC14N.java	23 Sep 2004 20:23:19 -0000	1.11
  +++ TransformC14N.java	23 Mar 2005 17:49:32 -0000	1.12
  @@ -45,16 +45,6 @@
      public static final String implementedTransformURI =
         Transforms.TRANSFORM_C14N_OMIT_COMMENTS;
   
  -   //J-
  -   /** @inheritDoc */
  -   public boolean wantsOctetStream ()   { return true; }
  -   /** @inheritDoc */
  -   public boolean wantsNodeSet ()       { return true; }
  -   /** @inheritDoc */
  -   public boolean returnsOctetStream () { return true; }
  -   /** @inheritDoc */
  -   public boolean returnsNodeSet ()     { return false; }
  -   //J+
   
      /**
       * @inheritDoc 
  
  
  
  1.20      +0 -11     xml-security/src/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java
  
  Index: TransformBase64Decode.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- TransformBase64Decode.java	11 Feb 2005 18:13:01 -0000	1.19
  +++ TransformBase64Decode.java	23 Mar 2005 17:49:32 -0000	1.20
  @@ -81,17 +81,6 @@
         return TransformBase64Decode.implementedTransformURI;
      }
   
  -   //J-
  -   /** @inheritDoc */
  -   public boolean wantsOctetStream ()   { return true; }
  -   /** @inheritDoc */
  -   public boolean wantsNodeSet ()       { return true; }
  -   /** @inheritDoc */
  -   public boolean returnsOctetStream () { return true; }
  -   /** @inheritDoc */
  -   public boolean returnsNodeSet ()     { return false; }
  -   //J+
  -
      /**
       * Method enginePerformTransform
       *
  
  
  
  1.11      +0 -10     xml-security/src/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java
  
  Index: TransformC14NWithComments.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- TransformC14NWithComments.java	23 Sep 2004 20:23:19 -0000	1.10
  +++ TransformC14NWithComments.java	23 Mar 2005 17:49:32 -0000	1.11
  @@ -45,16 +45,6 @@
      public static final String implementedTransformURI =
         Transforms.TRANSFORM_C14N_WITH_COMMENTS;
   
  -   //J-
  -   /** @inheritDoc */
  -   public boolean wantsOctetStream ()   { return true; }
  -   /** @inheritDoc */
  -   public boolean wantsNodeSet ()       { return true; }
  -   /** @inheritDoc */
  -   public boolean returnsOctetStream () { return true; }
  -   /** @inheritDoc */
  -   public boolean returnsNodeSet ()     { return false; }
  -   //J+
   
      /** @inheritDoc */
      protected String engineGetURI() {
  
  
  
  1.9       +0 -10     xml-security/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusiveWithComments.java
  
  Index: TransformC14NExclusiveWithComments.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusiveWithComments.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TransformC14NExclusiveWithComments.java	23 Sep 2004 20:23:19 -0000	1.8
  +++ TransformC14NExclusiveWithComments.java	23 Mar 2005 17:49:32 -0000	1.9
  @@ -47,16 +47,6 @@
      public static final String implementedTransformURI =
         Transforms.TRANSFORM_C14N_EXCL_WITH_COMMENTS;
   
  -   //J-
  -   /** @inheritDoc */
  -   public boolean wantsOctetStream ()   { return false; }
  -   /** @inheritDoc */
  -   public boolean wantsNodeSet ()       { return true; }
  -   /** @inheritDoc */
  -   public boolean returnsOctetStream () { return true; }
  -   /** @inheritDoc */
  -   public boolean returnsNodeSet ()     { return false; }
  -   //J+
   
      /**
       * Method engineGetURI
  
  
  
  1.10      +1 -11     xml-security/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java
  
  Index: TransformC14NExclusive.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TransformC14NExclusive.java	23 Sep 2004 20:23:19 -0000	1.9
  +++ TransformC14NExclusive.java	23 Mar 2005 17:49:32 -0000	1.10
  @@ -47,16 +47,6 @@
      public static final String implementedTransformURI =
         Transforms.TRANSFORM_C14N_EXCL_OMIT_COMMENTS;
   
  -   //J-
  -   /** @inheritDoc */
  -   public boolean wantsOctetStream ()   { return false; }
  -   /** @inheritDoc */
  -   public boolean wantsNodeSet ()       { return true; }
  -   /** @inheritDoc */
  -   public boolean returnsOctetStream () { return true; }
  -   /** @inheritDoc */
  -   public boolean returnsNodeSet ()     { return false; }
  -   //J+
   
      /**
       * Method engineGetURI
  
  
  
  1.7       +0 -10     xml-security/src/org/apache/xml/security/transforms/implementations/TransformXPointer.java
  
  Index: TransformXPointer.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/transforms/implementations/TransformXPointer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TransformXPointer.java	24 Sep 2004 20:54:28 -0000	1.6
  +++ TransformXPointer.java	23 Mar 2005 17:49:32 -0000	1.7
  @@ -38,16 +38,6 @@
      public static final String implementedTransformURI =
         Transforms.TRANSFORM_XPOINTER;
   
  -   //J-
  -   /** @inheritDoc */
  -   public boolean wantsOctetStream ()   { return false; }
  -   /** @inheritDoc */
  -   public boolean wantsNodeSet ()       { return true; }
  -   /** @inheritDoc */
  -   public boolean returnsOctetStream () { return false; }
  -   /** @inheritDoc */
  -   public boolean returnsNodeSet ()     { return true; }
  -   //J+
   
      /** @inheritDoc */
      protected String engineGetURI() {
  
  
  
  1.15      +0 -11     xml-security/src/org/apache/xml/security/transforms/implementations/TransformEnvelopedSignature.java
  
  Index: TransformEnvelopedSignature.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/transforms/implementations/TransformEnvelopedSignature.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- TransformEnvelopedSignature.java	12 Feb 2005 12:04:36 -0000	1.14
  +++ TransformEnvelopedSignature.java	23 Mar 2005 17:49:32 -0000	1.15
  @@ -47,17 +47,6 @@
      public static final String implementedTransformURI =
         Transforms.TRANSFORM_ENVELOPED_SIGNATURE;
   
  -   //J-
  -   /** @inheritDoc */
  -   public boolean wantsOctetStream ()   { return true; }
  -   /** @inheritDoc */
  -   public boolean wantsNodeSet ()       { return true; }
  -   /** @inheritDoc */
  -   public boolean returnsOctetStream () { return true; }
  -   /** @inheritDoc */
  -   public boolean returnsNodeSet ()     { return false; }
  -   //J+
  -
      /**
       * Method engineGetURI
       *
  
  
  
  1.7       +0 -27     xml-security/src/org/apache/xml/security/transforms/TransformSpi.java
  
  Index: TransformSpi.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/transforms/TransformSpi.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TransformSpi.java	23 Sep 2004 20:23:20 -0000	1.6
  +++ TransformSpi.java	23 Mar 2005 17:49:32 -0000	1.7
  @@ -46,33 +46,6 @@
      protected void setTransform(Transform transform) {
         this._transformObject = transform;
      }
  -   /**
  -    * Tests whether Transform implemenation class is need Octect Stream as input of Transformation
  -    *
  -    * @return true if need Octect Stream as input
  -    */
  -   public abstract boolean wantsOctetStream();
  -
  -   /**
  -    * Tests whether Transform implemenation class is need Octect Stream as input of Transformation
  -    *
  -    * @return true if need Node Set as input
  -    */
  -   public abstract boolean wantsNodeSet();
  -
  -   /**
  -    * Tests whether Transform implemenation class will generate Octect Stream as output of result of Transformation
  -    *
  -    * @return true if will returns Octect Stream as output
  -    */
  -   public abstract boolean returnsOctetStream();
  -
  -  /**
  -    * Tests whether Transform implemenation class will generate Node Set as output of result of Transformation
  -    *
  -    * @return true if will returns node set as output
  -    */
  -   public abstract boolean returnsNodeSet();
   
      /**
       * The mega method which MUST be implemented by the Transformation Algorithm.