cvs commit: cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components CopletThread.java

[cziegeler]

cziegeler    2003/05/16 00:19:44

  Modified:    
src/blocks/session-fw/java/org/apache/cocoon/webapps/session/transformation
                        SessionPostTransformer.java
               
src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components
                        CopletThread.java
  Log:
  Finished removing automatic conversion
  
  Revision  Changes    Path
  1.3       +3 -2      
cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/transformation/SessionPostTransformer.java
  
  Index: SessionPostTransformer.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/transformation/SessionPostTransformer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SessionPostTransformer.java       4 May 2003 20:19:39 -0000       1.2
  +++ SessionPostTransformer.java       16 May 2003 07:19:43 -0000      1.3
  @@ -60,6 +60,7 @@
   import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.acting.ValidatorActionResult;
  +import org.apache.cocoon.components.source.SourceUtil;
   import org.apache.cocoon.environment.Session;
   import org.apache.cocoon.webapps.session.SessionConstants;
   import org.apache.cocoon.xml.XMLUtils;
  @@ -378,7 +379,7 @@
                   try {
                       Source resource = this.resolver.resolveURI(source);
                       SAXConfigurationHandler saxBuilder = new 
SAXConfigurationHandler();
  -                    resolver.toSAX(resource, saxBuilder);
  +                    SourceUtil.parse(this.manager, resource, saxBuilder);
   
                       conf = saxBuilder.getConfiguration();
                       session = this.getSessionManager().getSession(true);
  
  
  
  1.2       +2 -2      
cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/CopletThread.java
  
  Index: CopletThread.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/CopletThread.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CopletThread.java 9 Mar 2003 00:05:17 -0000       1.1
  +++ CopletThread.java 16 May 2003 07:19:44 -0000      1.2
  @@ -207,7 +207,7 @@
                                                             null, 
                                                             (handlesParameters 
== true ? p : null), 
                                                             resolver);
  -                            resolver.toSAX(source, xc);
  +                            SourceUtil.toSAX(source, xc);
                           } finally {
                               resolver.release(source);
                           }