cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation SourceWritingTransformer.java
Date Fri, 07 Feb 2003 06:59:25 GMT
cziegeler    2003/02/06 22:59:25

  Modified:    src/java/org/apache/cocoon/transformation Tag:
                        cocoon_2_0_3_branch XIncludeTransformer.java
                        FragmentExtractorTransformer.java
                        AbstractSAXTransformer.java TraxTransformer.java
                        CIncludeTransformer.java
                        CachingCIncludeTransformer.java
                        ReadDOMSessionTransformer.java LDAPTransformer.java
                        WriteDOMSessionTransformer.java
                        I18nTransformer.java Transformer.java
                        XTTransformer.java RoleFilterTransformer.java
                        AbstractTransformer.java EncodeURLTransformer.java
                        SQLTransformer.java FilterTransformer.java
                        LogTransformer.java
               src/webapp Tag: cocoon_2_0_3_branch sitemap.xmap
               src/java/org/apache/cocoon/transformation/helpers Tag:
                        cocoon_2_0_3_branch NOPRecorder.java
                        ParametersRecorder.java TextRecorder.java
  Added:       src/java/org/apache/cocoon/transformation Tag:
                        cocoon_2_0_3_branch SourceWritingTransformer.java
  Removed:     src/scratchpad/src/org/apache/cocoon/transformation Tag:
                        cocoon_2_0_3_branch SourceWritingTransformer.java
  Log:
  Sync with head:
  - moving source-write transformer out of scratchpad
  - changed some copyright statements from 2002 to 2003
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.2  +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
  
  Index: XIncludeTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java,v
  retrieving revision 1.11.2.1
  retrieving revision 1.11.2.2
  diff -u -r1.11.2.1 -r1.11.2.2
  --- XIncludeTransformer.java	29 Nov 2002 08:52:16 -0000	1.11.2.1
  +++ XIncludeTransformer.java	7 Feb 2003 06:59:23 -0000	1.11.2.2
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  1.13.2.2  +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/Attic/FragmentExtractorTransformer.java
  
  Index: FragmentExtractorTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/Attic/FragmentExtractorTransformer.java,v
  retrieving revision 1.13.2.1
  retrieving revision 1.13.2.2
  diff -u -r1.13.2.1 -r1.13.2.2
  --- FragmentExtractorTransformer.java	22 Oct 2002 04:15:28 -0000	1.13.2.1
  +++ FragmentExtractorTransformer.java	7 Feb 2003 06:59:23 -0000	1.13.2.2
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  1.2.2.4   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
  
  Index: AbstractSAXTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java,v
  retrieving revision 1.2.2.3
  retrieving revision 1.2.2.4
  diff -u -r1.2.2.3 -r1.2.2.4
  --- AbstractSAXTransformer.java	31 Jan 2003 12:37:54 -0000	1.2.2.3
  +++ AbstractSAXTransformer.java	7 Feb 2003 06:59:23 -0000	1.2.2.4
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  1.21.2.7  +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/TraxTransformer.java
  
  Index: TraxTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/TraxTransformer.java,v
  retrieving revision 1.21.2.6
  retrieving revision 1.21.2.7
  diff -u -r1.21.2.6 -r1.21.2.7
  --- TraxTransformer.java	31 Jan 2003 07:00:49 -0000	1.21.2.6
  +++ TraxTransformer.java	7 Feb 2003 06:59:23 -0000	1.21.2.7
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  1.6.2.2   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java
  
  Index: CIncludeTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- CIncludeTransformer.java	31 Jan 2003 12:37:54 -0000	1.6.2.1
  +++ CIncludeTransformer.java	7 Feb 2003 06:59:23 -0000	1.6.2.2
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  1.7.2.1   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/CachingCIncludeTransformer.java
  
  Index: CachingCIncludeTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/CachingCIncludeTransformer.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- CachingCIncludeTransformer.java	22 Feb 2002 07:03:56 -0000	1.7
  +++ CachingCIncludeTransformer.java	7 Feb 2003 06:59:23 -0000	1.7.2.1
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  1.7.2.2   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/ReadDOMSessionTransformer.java
  
  Index: ReadDOMSessionTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/ReadDOMSessionTransformer.java,v
  retrieving revision 1.7.2.1
  retrieving revision 1.7.2.2
  diff -u -r1.7.2.1 -r1.7.2.2
  --- ReadDOMSessionTransformer.java	23 Oct 2002 04:17:55 -0000	1.7.2.1
  +++ ReadDOMSessionTransformer.java	7 Feb 2003 06:59:23 -0000	1.7.2.2
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  1.6.2.3   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/Attic/LDAPTransformer.java
  
  Index: LDAPTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/Attic/LDAPTransformer.java,v
  retrieving revision 1.6.2.2
  retrieving revision 1.6.2.3
  diff -u -r1.6.2.2 -r1.6.2.3
  --- LDAPTransformer.java	31 Jan 2003 07:51:14 -0000	1.6.2.2
  +++ LDAPTransformer.java	7 Feb 2003 06:59:23 -0000	1.6.2.3
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  1.9.2.2   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java
  
  Index: WriteDOMSessionTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java,v
  retrieving revision 1.9.2.1
  retrieving revision 1.9.2.2
  diff -u -r1.9.2.1 -r1.9.2.2
  --- WriteDOMSessionTransformer.java	31 Jan 2003 07:00:49 -0000	1.9.2.1
  +++ WriteDOMSessionTransformer.java	7 Feb 2003 06:59:23 -0000	1.9.2.2
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  1.13.2.8  +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/I18nTransformer.java
  
  Index: I18nTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/I18nTransformer.java,v
  retrieving revision 1.13.2.7
  retrieving revision 1.13.2.8
  diff -u -r1.13.2.7 -r1.13.2.8
  --- I18nTransformer.java	31 Jan 2003 07:51:15 -0000	1.13.2.7
  +++ I18nTransformer.java	7 Feb 2003 06:59:23 -0000	1.13.2.8
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  1.4.2.1   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/Transformer.java
  
  Index: Transformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/Transformer.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- Transformer.java	22 Feb 2002 07:03:56 -0000	1.4
  +++ Transformer.java	7 Feb 2003 06:59:23 -0000	1.4.2.1
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  1.9.2.2   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/Attic/XTTransformer.java
  
  Index: XTTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/Attic/XTTransformer.java,v
  retrieving revision 1.9.2.1
  retrieving revision 1.9.2.2
  diff -u -r1.9.2.1 -r1.9.2.2
  --- XTTransformer.java	31 Jan 2003 07:00:49 -0000	1.9.2.1
  +++ XTTransformer.java	7 Feb 2003 06:59:23 -0000	1.9.2.2
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  1.6.2.2   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/RoleFilterTransformer.java
  
  Index: RoleFilterTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/RoleFilterTransformer.java,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- RoleFilterTransformer.java	31 Jan 2003 07:00:49 -0000	1.6.2.1
  +++ RoleFilterTransformer.java	7 Feb 2003 06:59:23 -0000	1.6.2.2
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  1.4.2.1   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/AbstractTransformer.java
  
  Index: AbstractTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/AbstractTransformer.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- AbstractTransformer.java	22 Feb 2002 07:03:56 -0000	1.4
  +++ AbstractTransformer.java	7 Feb 2003 06:59:23 -0000	1.4.2.1
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  1.1.2.5   +3 -4      xml-cocoon2/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
  
  Index: EncodeURLTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- EncodeURLTransformer.java	31 Jan 2003 07:51:16 -0000	1.1.2.4
  +++ EncodeURLTransformer.java	7 Feb 2003 06:59:23 -0000	1.1.2.5
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  @@ -291,7 +291,6 @@
        */
       public void startElement(String uri, String name, String raw, Attributes attributes)
       throws SAXException {
  -
           if (this.isEncodeURLNeeded && this.elementAttributeMatching != null) {
               String lname = name;
               if (attributes != null && attributes.getLength() > 0) {
  
  
  
  1.10.2.6  +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/Attic/SQLTransformer.java
  
  Index: SQLTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/Attic/SQLTransformer.java,v
  retrieving revision 1.10.2.5
  retrieving revision 1.10.2.6
  diff -u -r1.10.2.5 -r1.10.2.6
  --- SQLTransformer.java	31 Jan 2003 07:51:15 -0000	1.10.2.5
  +++ SQLTransformer.java	7 Feb 2003 06:59:24 -0000	1.10.2.6
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  1.7.2.2   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/FilterTransformer.java
  
  Index: FilterTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/FilterTransformer.java,v
  retrieving revision 1.7.2.1
  retrieving revision 1.7.2.2
  diff -u -r1.7.2.1 -r1.7.2.2
  --- FilterTransformer.java	22 Oct 2002 04:08:53 -0000	1.7.2.1
  +++ FilterTransformer.java	7 Feb 2003 06:59:24 -0000	1.7.2.2
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  1.7.2.1   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/LogTransformer.java
  
  Index: LogTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/LogTransformer.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- LogTransformer.java	22 Feb 2002 07:03:56 -0000	1.7
  +++ LogTransformer.java	7 Feb 2003 06:59:24 -0000	1.7.2.1
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.17.2.1  +14 -21    xml-cocoon2/src/java/org/apache/cocoon/transformation/SourceWritingTransformer.java
  
  Index: SourceWritingTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/SourceWritingTransformer.java,v
  retrieving revision 1.17
  retrieving revision 1.17.2.1
  diff -u -r1.17 -r1.17.2.1
  --- SourceWritingTransformer.java	6 Feb 2003 12:19:46 -0000	1.17
  +++ SourceWritingTransformer.java	7 Feb 2003 06:59:23 -0000	1.17.2.1
  @@ -57,17 +57,15 @@
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.components.parser.Parser;
   import org.apache.cocoon.components.source.SourceUtil;
  -import org.apache.cocoon.components.source.WriteableSAXSource;
  +import org.apache.cocoon.environment.Source;
   import org.apache.cocoon.environment.SourceResolver;
  +import org.apache.cocoon.environment.WriteableSource;
   import org.apache.cocoon.serialization.Serializer;
   import org.apache.cocoon.xml.XMLUtils;
   import org.apache.cocoon.xml.dom.DOMStreamer;
   import org.apache.cocoon.xml.dom.DOMUtil;
  -import org.apache.excalibur.source.ModifiableSource;
  -import org.apache.excalibur.source.Source;
  -import org.apache.excalibur.source.SourceException;
  -import org.apache.excalibur.xml.dom.DOMParser;
   import org.w3c.dom.DOMException;
   import org.w3c.dom.Document;
   import org.w3c.dom.DocumentFragment;
  @@ -625,13 +623,13 @@
           String message = "";
           String target = systemID;
           try {
  -            source = this.resolver.resolveURI( systemID );
  -            if ( ! (source instanceof ModifiableSource)) {
  +            source = this.resolver.resolve( systemID );
  +            if ( ! (source instanceof WriteableSource)) {
                   throw new ProcessingException("Source '"+systemID+"' is not writeable.");
               }
  -            ModifiableSource ws = (ModifiableSource)source;
  +            WriteableSource ws = (WriteableSource)source;
               exists = ws.exists();
  -            target = source.getURI();
  +            target = source.getSystemId();
               if ( exists == true && this.state == STATE_INSERT ) {
                                   message = "content inserted at: " + path;
                   resource = SourceUtil.toDOM( source, this.manager );
  @@ -652,9 +650,9 @@
                               if (overwrite == true) {
                                   if (parent.getNodeType() == Node.DOCUMENT_NODE) {
                                       // replacing of the document element is not allowed
  -                                    DOMParser parser = (DOMParser)this.manager.lookup(DOMParser.ROLE);
  +                                    Parser parser = (Parser)this.manager.lookup(Parser.ROLE);
                                       try {
  -                                        resource = parser.createDocument();
  +                                        resource = parser.newDocument();
                                       } finally {
                                           this.manager.release( (Component)parser );
                                       }
  @@ -691,9 +689,9 @@
                       parent.appendChild(importNode);
                   }
               } else if (create == true) {
  -                DOMParser parser = (DOMParser)this.manager.lookup(DOMParser.ROLE);
  +                Parser parser = (Parser)this.manager.lookup(Parser.ROLE);
                   try {
  -                    resource = parser.createDocument();
  +                    resource = parser.newDocument();
                   } finally {
                       this.manager.release( (Component)parser );
                   }
  @@ -718,8 +716,8 @@
               // write source
               if ( resource != null) {
                   resource.normalize();
  -                if (source instanceof WriteableSAXSource) {
  -                    ContentHandler contentHandler = ((WriteableSAXSource)ws).getContentHandler();
  +                if (source instanceof WriteableSource) {
  +                    ContentHandler contentHandler = ((WriteableSource)ws).getContentHandler();
                       DOMStreamer streamer = new DOMStreamer(contentHandler);
                       streamer.stream(resource);
                       localSerializer = "null";
  @@ -777,13 +775,8 @@
                   this.getLogger().debug("FAIL exception: "+ce, ce);
               }
               message = "There was a problem looking up a component: " + ce;
  -        } catch (SourceException se) {
  -            if (this.getLogger().isDebugEnabled() == true) {
  -                this.getLogger().debug("FAIL exception: "+se, se);
  -            }
  -            message = "There was a problem resolving that source: [" + systemID + "] :
" + se;
           } finally {
  -            this.resolver.release( source );
  +            if ( null != source ) source.recycle();
           }
   
           // Report result
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.46.2.7  +3 -0      xml-cocoon2/src/webapp/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sitemap.xmap,v
  retrieving revision 1.46.2.6
  retrieving revision 1.46.2.7
  diff -u -r1.46.2.6 -r1.46.2.7
  --- sitemap.xmap	4 Feb 2003 15:44:10 -0000	1.46.2.6
  +++ sitemap.xmap	7 Feb 2003 06:59:24 -0000	1.46.2.7
  @@ -134,6 +134,9 @@
   
      <map:transformer name="readDOMsession"  logger="sitemap.transformer.readDOMsession"
                       src="org.apache.cocoon.transformation.ReadDOMSessionTransformer"/>
  +   <map:transformer logger="sitemap.transformer.write-source" 
  +                    name="write-source" 
  +                    src="org.apache.cocoon.transformation.SourceWritingTransformer"/>
      <map:transformer name="encodeURL"       logger="sitemap.transformer.encodeURL"
                       src="org.apache.cocoon.transformation.EncodeURLTransformer"/>
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/NOPRecorder.java
  
  Index: NOPRecorder.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/NOPRecorder.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- NOPRecorder.java	2 Apr 2002 14:13:34 -0000	1.1
  +++ NOPRecorder.java	7 Feb 2003 06:59:25 -0000	1.1.2.1
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  1.1.2.3   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/ParametersRecorder.java
  
  Index: ParametersRecorder.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/ParametersRecorder.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- ParametersRecorder.java	30 Jan 2003 16:20:21 -0000	1.1.2.2
  +++ ParametersRecorder.java	7 Feb 2003 06:59:25 -0000	1.1.2.3
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  1.1.2.1   +2 -2      xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/TextRecorder.java
  
  Index: TextRecorder.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/TextRecorder.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- TextRecorder.java	2 Apr 2002 14:13:34 -0000	1.1
  +++ TextRecorder.java	7 Feb 2003 06:59:25 -0000	1.1.2.1
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message