You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by bl...@apache.org on 2003/08/05 13:36:09 UTC

cvs commit: xml-security/c/src/transformers TXFMXPath.cpp TXFMXPath.hpp TXFMXPathFilter.cpp TXFMXSL.hpp

blautenb    2003/08/05 04:36:09

  Modified:    c/src/canon XSECC14n20010315.cpp
               c/src/dsig DSIGXPathHere.hpp
               c/src/samples simpleHMAC.cpp simpleValidate.cpp
               c/src/tools/checksig checksig.cpp
               c/src/tools/siginf siginf.cpp
               c/src/tools/templatesign templatesign.cpp
               c/src/tools/txfmout txfmout.cpp
               c/src/tools/xtest xtest.cpp
               c/src/transformers TXFMXPath.cpp TXFMXPath.hpp
                        TXFMXPathFilter.cpp TXFMXSL.hpp
  Log:
  Update for Xalan 1.6 sane include changes
  
  Revision  Changes    Path
  1.10      +7 -7      xml-security/c/src/canon/XSECC14n20010315.cpp
  
  Index: XSECC14n20010315.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/canon/XSECC14n20010315.cpp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- XSECC14n20010315.cpp	5 Jul 2003 10:30:30 -0000	1.9
  +++ XSECC14n20010315.cpp	5 Aug 2003 11:36:09 -0000	1.10
  @@ -84,12 +84,12 @@
   #ifndef XSEC_NO_XALAN
   
   // Xalan includes
  -#include <XalanDOM/XalanDocument.hpp>
  -#include <XercesParserLiaison/XercesDocumentWrapper.hpp>
  -#include <XercesParserLiaison/XercesDOMSupport.hpp>
  -#include <XercesParserLiaison/XercesParserLiaison.hpp>
  -#include <XPath/XPathEvaluator.hpp>
  -#include <XPath/NodeRefList.hpp>
  +#include <xalanc/XalanDOM/XalanDocument.hpp>
  +#include <xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp>
  +#include <xalanc/XercesParserLiaison/XercesDOMSupport.hpp>
  +#include <xalanc/XercesParserLiaison/XercesParserLiaison.hpp>
  +#include <xalanc/XPath/XPathEvaluator.hpp>
  +#include <xalanc/XPath/NodeRefList.hpp>
   
   // Namespace definitions
   XALAN_USING_XALAN(XPathEvaluator)
  
  
  
  1.5       +10 -10    xml-security/c/src/dsig/DSIGXPathHere.hpp
  
  Index: DSIGXPathHere.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/dsig/DSIGXPathHere.hpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DSIGXPathHere.hpp	5 Jul 2003 10:30:30 -0000	1.4
  +++ DSIGXPathHere.hpp	5 Aug 2003 11:36:09 -0000	1.5
  @@ -76,16 +76,16 @@
   
   #ifndef XSEC_NO_XALAN
   
  -#include <Include/PlatformDefinitions.hpp>
  -#include <XalanTransformer/XalanTransformer.hpp>
  -#include <XPath/XObjectFactory.hpp>
  -#include <XalanDOM/XalanElement.hpp>
  -#include <XalanDOM/XalanNode.hpp>
  -#include <XalanDOM/XalanDocument.hpp>
  -#include <XPath/Function.hpp>
  -#include <XPath/XObjectTypeCallback.hpp>
  -#include <XPath/MutableNodeRefList.hpp>
  -#include <XPath/NodeRefListBase.hpp>
  +#include <xalanc/Include/PlatformDefinitions.hpp>
  +#include <xalanc/XalanTransformer/XalanTransformer.hpp>
  +#include <xalanc/XPath/XObjectFactory.hpp>
  +#include <xalanc/XalanDOM/XalanElement.hpp>
  +#include <xalanc/XalanDOM/XalanNode.hpp>
  +#include <xalanc/XalanDOM/XalanDocument.hpp>
  +#include <xalanc/XPath/Function.hpp>
  +#include <xalanc/XPath/XObjectTypeCallback.hpp>
  +#include <xalanc/XPath/MutableNodeRefList.hpp>
  +#include <xalanc/XPath/NodeRefListBase.hpp>
   
   // Namespace usage
   
  
  
  
  1.4       +1 -1      xml-security/c/src/samples/simpleHMAC.cpp
  
  Index: simpleHMAC.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/samples/simpleHMAC.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- simpleHMAC.cpp	5 Jul 2003 10:30:35 -0000	1.3
  +++ simpleHMAC.cpp	5 Aug 2003 11:36:09 -0000	1.4
  @@ -86,7 +86,7 @@
   // Xalan
   
   #ifndef XSEC_NO_XALAN
  -#include <XalanTransformer/XalanTransformer.hpp>
  +#include <xalanc/XalanTransformer/XalanTransformer.hpp>
   XALAN_USING_XALAN(XalanTransformer)
   #endif
   
  
  
  
  1.4       +1 -1      xml-security/c/src/samples/simpleValidate.cpp
  
  Index: simpleValidate.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/samples/simpleValidate.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- simpleValidate.cpp	5 Jul 2003 10:30:35 -0000	1.3
  +++ simpleValidate.cpp	5 Aug 2003 11:36:09 -0000	1.4
  @@ -97,7 +97,7 @@
   
   // Xalan
   
  -#include <XalanTransformer/XalanTransformer.hpp>
  +#include <xalanc/XalanTransformer/XalanTransformer.hpp>
   XALAN_USING_XALAN(XalanTransformer)
   
   #endif
  
  
  
  1.22      +3 -3      xml-security/c/src/tools/checksig/checksig.cpp
  
  Index: checksig.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/tools/checksig/checksig.cpp,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- checksig.cpp	5 Jul 2003 10:30:35 -0000	1.21
  +++ checksig.cpp	5 Aug 2003 11:36:09 -0000	1.22
  @@ -135,8 +135,8 @@
   
   // XALAN
   
  -#include <XPath/XPathEvaluator.hpp>
  -#include <XalanTransformer/XalanTransformer.hpp>
  +#include <xalanc/XPath/XPathEvaluator.hpp>
  +#include <xalanc/XalanTransformer/XalanTransformer.hpp>
   
   XALAN_USING_XALAN(XPathEvaluator)
   XALAN_USING_XALAN(XalanTransformer)
  
  
  
  1.6       +3 -3      xml-security/c/src/tools/siginf/siginf.cpp
  
  Index: siginf.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/tools/siginf/siginf.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- siginf.cpp	5 Jul 2003 10:30:35 -0000	1.5
  +++ siginf.cpp	5 Aug 2003 11:36:09 -0000	1.6
  @@ -127,8 +127,8 @@
   
   // XALAN
   
  -#include <XPath/XPathEvaluator.hpp>
  -#include <XalanTransformer/XalanTransformer.hpp>
  +#include <xalanc/XPath/XPathEvaluator.hpp>
  +#include <xalanc/XalanTransformer/XalanTransformer.hpp>
   
   XALAN_USING_XALAN(XPathEvaluator)
   XALAN_USING_XALAN(XalanTransformer)
  
  
  
  1.11      +3 -3      xml-security/c/src/tools/templatesign/templatesign.cpp
  
  Index: templatesign.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/tools/templatesign/templatesign.cpp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- templatesign.cpp	5 Jul 2003 10:30:35 -0000	1.10
  +++ templatesign.cpp	5 Aug 2003 11:36:09 -0000	1.11
  @@ -115,8 +115,8 @@
   
   // XALAN
   
  -#include <XPath/XPathEvaluator.hpp>
  -#include <XalanTransformer/XalanTransformer.hpp>
  +#include <xalanc/XPath/XPathEvaluator.hpp>
  +#include <xalanc/XalanTransformer/XalanTransformer.hpp>
   
   XALAN_USING_XALAN(XPathEvaluator)
   XALAN_USING_XALAN(XalanTransformer)
  
  
  
  1.11      +3 -3      xml-security/c/src/tools/txfmout/txfmout.cpp
  
  Index: txfmout.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/tools/txfmout/txfmout.cpp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- txfmout.cpp	5 Jul 2003 10:30:35 -0000	1.10
  +++ txfmout.cpp	5 Aug 2003 11:36:09 -0000	1.11
  @@ -131,8 +131,8 @@
   
   // XALAN
   
  -#include <XPath/XPathEvaluator.hpp>
  -#include <XalanTransformer/XalanTransformer.hpp>
  +#include <xalanc/XPath/XPathEvaluator.hpp>
  +#include <xalanc/XalanTransformer/XalanTransformer.hpp>
   
   XALAN_USING_XALAN(XPathEvaluator)
   XALAN_USING_XALAN(XalanTransformer)
  
  
  
  1.17      +3 -3      xml-security/c/src/tools/xtest/xtest.cpp
  
  Index: xtest.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/tools/xtest/xtest.cpp,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- xtest.cpp	5 Jul 2003 10:30:35 -0000	1.16
  +++ xtest.cpp	5 Aug 2003 11:36:09 -0000	1.17
  @@ -98,8 +98,8 @@
   
   #ifndef XSEC_NO_XALAN
   
  -#include <XPath/XPathEvaluator.hpp>
  -#include <XalanTransformer/XalanTransformer.hpp>
  +#include <xalanc/XPath/XPathEvaluator.hpp>
  +#include <xalanc/XalanTransformer/XalanTransformer.hpp>
   
   XALAN_USING_XALAN(XPathEvaluator)
   XALAN_USING_XALAN(XalanTransformer)
  
  
  
  1.9       +3 -3      xml-security/c/src/transformers/TXFMXPath.cpp
  
  Index: TXFMXPath.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMXPath.cpp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TXFMXPath.cpp	5 Jul 2003 10:30:36 -0000	1.8
  +++ TXFMXPath.cpp	5 Aug 2003 11:36:09 -0000	1.9
  @@ -77,8 +77,8 @@
   
   #ifndef XSEC_NO_XALAN
   
  -#include <XPath/XObjectFactoryDefault.hpp>
  -#include <XPath/XPathExecutionContextDefault.hpp>
  +#include <xalanc/XPath/XObjectFactoryDefault.hpp>
  +#include <xalanc/XPath/XPathExecutionContextDefault.hpp>
   
   // Xalan namespace usage
   XALAN_USING_XALAN(XPathProcessorImpl)
  
  
  
  1.7       +12 -12    xml-security/c/src/transformers/TXFMXPath.hpp
  
  Index: TXFMXPath.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMXPath.hpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TXFMXPath.hpp	5 Jul 2003 10:30:36 -0000	1.6
  +++ TXFMXPath.hpp	5 Aug 2003 11:36:09 -0000	1.7
  @@ -83,17 +83,17 @@
   
   #ifndef XSEC_NO_XALAN
   
  -#include <XalanDOM/XalanDocument.hpp>
  -#include <XercesParserLiaison/XercesDocumentWrapper.hpp>
  -#include <XercesParserLiaison/XercesDOMSupport.hpp>
  -#include <XercesParserLiaison/XercesParserLiaison.hpp>
  -#include <XPath/XPathEvaluator.hpp>
  -#include <XPath/XPathProcessorImpl.hpp>
  -#include <XPath/XPathFactoryDefault.hpp>
  -#include <XPath/NodeRefList.hpp>
  -#include <XPath/XPathEnvSupportDefault.hpp>
  -#include <XPath/XPathConstructionContextDefault.hpp>
  -#include <XPath/ElementPrefixResolverProxy.hpp>
  +#include <xalanc/XalanDOM/XalanDocument.hpp>
  +#include <xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp>
  +#include <xalanc/XercesParserLiaison/XercesDOMSupport.hpp>
  +#include <xalanc/XercesParserLiaison/XercesParserLiaison.hpp>
  +#include <xalanc/XPath/XPathEvaluator.hpp>
  +#include <xalanc/XPath/XPathProcessorImpl.hpp>
  +#include <xalanc/XPath/XPathFactoryDefault.hpp>
  +#include <xalanc/XPath/NodeRefList.hpp>
  +#include <xalanc/XPath/XPathEnvSupportDefault.hpp>
  +#include <xalanc/XPath/XPathConstructionContextDefault.hpp>
  +#include <xalanc/XPath/ElementPrefixResolverProxy.hpp>
   
   #endif
   
  
  
  
  1.6       +16 -16    xml-security/c/src/transformers/TXFMXPathFilter.cpp
  
  Index: TXFMXPathFilter.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMXPathFilter.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TXFMXPathFilter.cpp	5 Jul 2003 10:30:36 -0000	1.5
  +++ TXFMXPathFilter.cpp	5 Aug 2003 11:36:09 -0000	1.6
  @@ -83,21 +83,21 @@
   
   #ifndef XSEC_NO_XALAN
   
  -#include <XalanDOM/XalanDocument.hpp>
  -#include <XalanDOM/XalanDOMString.hpp>
  -#include <XercesParserLiaison/XercesDocumentWrapper.hpp>
  -#include <XercesParserLiaison/XercesDOMSupport.hpp>
  -#include <XercesParserLiaison/XercesParserLiaison.hpp>
  -#include <XPath/XPathEvaluator.hpp>
  -#include <XPath/XPathProcessorImpl.hpp>
  -#include <XPath/XPathFactoryDefault.hpp>
  -#include <XPath/NodeRefList.hpp>
  -#include <XPath/XPathEnvSupportDefault.hpp>
  -#include <XPath/XPathConstructionContextDefault.hpp>
  -#include <XPath/ElementPrefixResolverProxy.hpp>
  -#include <XPath/XObjectFactoryDefault.hpp>
  -#include <XPath/XPathExecutionContextDefault.hpp>
  -#include <XSLT/XSLTResultTarget.hpp>
  +#include <xalanc/XalanDOM/XalanDocument.hpp>
  +#include <xalanc/XalanDOM/XalanDOMString.hpp>
  +#include <xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp>
  +#include <xalanc/XercesParserLiaison/XercesDOMSupport.hpp>
  +#include <xalanc/XercesParserLiaison/XercesParserLiaison.hpp>
  +#include <xalanc/XPath/XPathEvaluator.hpp>
  +#include <xalanc/XPath/XPathProcessorImpl.hpp>
  +#include <xalanc/XPath/XPathFactoryDefault.hpp>
  +#include <xalanc/XPath/NodeRefList.hpp>
  +#include <xalanc/XPath/XPathEnvSupportDefault.hpp>
  +#include <xalanc/XPath/XPathConstructionContextDefault.hpp>
  +#include <xalanc/XPath/ElementPrefixResolverProxy.hpp>
  +#include <xalanc/XPath/XObjectFactoryDefault.hpp>
  +#include <xalanc/XPath/XPathExecutionContextDefault.hpp>
  +#include <xalanc/XSLT/XSLTResultTarget.hpp>
   
   // Xalan namespace usage
   XALAN_USING_XALAN(XPathProcessorImpl)
  
  
  
  1.8       +8 -8      xml-security/c/src/transformers/TXFMXSL.hpp
  
  Index: TXFMXSL.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMXSL.hpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TXFMXSL.hpp	5 Jul 2003 10:30:36 -0000	1.7
  +++ TXFMXSL.hpp	5 Aug 2003 11:36:09 -0000	1.8
  @@ -78,13 +78,13 @@
   
   #ifndef XSEC_NO_XPATH
   
  -#include <XalanDOM/XalanDocument.hpp>
  -#include <XercesParserLiaison/XercesDocumentBridge.hpp>
  -#include <XercesParserLiaison/XercesDOMSupport.hpp>
  -#include <XercesParserLiaison/XercesParserLiaison.hpp>
  -#include <XPath/NodeRefList.hpp>
  -#include <XPath/ElementPrefixResolverProxy.hpp>
  -#include <XalanTransformer/XalanTransformer.hpp>
  +#include <xalanc/XalanDOM/XalanDocument.hpp>
  +#include <xalanc/XercesParserLiaison/XercesDocumentBridge.hpp>
  +#include <xalanc/XercesParserLiaison/XercesDOMSupport.hpp>
  +#include <xalanc/XercesParserLiaison/XercesParserLiaison.hpp>
  +#include <xalanc/XPath/NodeRefList.hpp>
  +#include <xalanc/XPath/ElementPrefixResolverProxy.hpp>
  +#include <xalanc/XalanTransformer/XalanTransformer.hpp>
   
   // Xalan Namespace usage
   XALAN_USING_XALAN(XercesDOMSupport)