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 AsynchronousCIncludeTransformer.java
Date Fri, 31 Jan 2003 12:37:41 GMT
cziegeler    2003/01/31 04:37:41

  Modified:    src/scratchpad/src/org/apache/cocoon/transformation Tag:
                        cocoon_2_0_3_branch
                        AsynchronousCIncludeTransformer.java
  Log:
  Backporting session, authentication and portal framework
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +15 -14    xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/Attic/AsynchronousCIncludeTransformer.java
  
  Index: AsynchronousCIncludeTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/Attic/AsynchronousCIncludeTransformer.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- AsynchronousCIncludeTransformer.java	9 Jan 2003 22:34:40 -0000	1.1.2.1
  +++ AsynchronousCIncludeTransformer.java	31 Jan 2003 12:37:41 -0000	1.1.2.2
  @@ -154,7 +154,7 @@
   										String source, Parameters parameters)
       throws ProcessingException, SAXException, IOException {
   
  -		this.sourceResolver = resolver;
  +        super.setup(resolver, objectModel , source, parameters);
   		processingOn = false;
   		idSourceMap = new HashMap();
   		if (compiler == null)  compiler = new XMLByteStreamCompiler();
  @@ -218,10 +218,11 @@
   
   					// do serial processing
   					getLogger().debug("doing serial processing of node "+raw);
  -					super.processCIncludeElement(attr.getValue("",CINCLUDE_INCLUDE_ELEMENT_SRC_ATTRIBUTE),
  -																			 attr.getValue("",CINCLUDE_INCLUDE_ELEMENT_ELEMENT_ATTRIBUTE),
  -																			 attr.getValue("",CINCLUDE_INCLUDE_ELEMENT_NS_ATTRIBUTE),
  -																			 attr.getValue("",CINCLUDE_INCLUDE_ELEMENT_PREFIX_ATTRIBUTE));
  +                    this.processCIncludeElement(attr.getValue("",CINCLUDE_INCLUDE_ELEMENT_SRC_ATTRIBUTE),
  +                                                attr.getValue("",CINCLUDE_INCLUDE_ELEMENT_ELEMENT_ATTRIBUTE),
  +                                                attr.getValue("",CINCLUDE_INCLUDE_ELEMENT_SELECT_ATTRIBUTE),
  +                                                attr.getValue("",CINCLUDE_INCLUDE_ELEMENT_NS_ATTRIBUTE),
  +                                                attr.getValue("",CINCLUDE_INCLUDE_ELEMENT_PREFIX_ATTRIBUTE));
   				} else {
   					
   					// Async processing; save CInclude element to async block cache and process to file.
  @@ -238,7 +239,7 @@
   					// currently, this is done by urlencoding a unique id into the src url string
   					// however, the Asynchronous processor should provide its own uniqueness guarantee.
   					
  -					helper.process(sourceResolver, src);
  +					helper.process(this.resolver, src);
   				}
   				
   			} else if (name.equals(ASYNC_BLOCK_ELEMENT)) {
  @@ -269,14 +270,14 @@
   
   		if (uri != null && name != null
   				&& uri.equals(CINCLUDE_NAMESPACE_URI) ) {
  -			if (name.equals(CINCLUDE_INCLUDE_ELEMENT)) {
  -				compiler.endElement(uri, name, raw);
  -				return;
  -			} else if (name.equals(ASYNC_BLOCK_ELEMENT)) {
  -				getLogger().debug("END Asynchronous Block");
  -				processingOn = false;
  -				processAll();
  -				return;
  +    		if (name.equals(CINCLUDE_INCLUDE_ELEMENT)) {
  +    			compiler.endElement(uri, name, raw);
  +    			return;
  +    		} else if (name.equals(ASYNC_BLOCK_ELEMENT)) {
  +    			getLogger().debug("END Asynchronous Block");
  +    			processingOn = false;
  +    			processAll();
  +    			return;
   			}
   		}
   		
  
  
  

----------------------------------------------------------------------
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