You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gk...@apache.org on 2007/07/19 10:08:08 UTC

svn commit: r557517 - in /cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template: JXTemplateGenerator.java script/Invoker.java

Author: gkossakowski
Date: Thu Jul 19 01:08:07 2007
New Revision: 557517

URL: http://svn.apache.org/viewvc?view=rev&rev=557517
Log:
COCOON-2094: Fix namespaces handling.

Modified:
    cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java
    cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/Invoker.java

Modified: cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java?view=diff&rev=557517&r1=557516&r2=557517
==============================================================================
--- cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java (original)
+++ cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java Thu Jul 19 01:08:07 2007
@@ -124,6 +124,7 @@
         }
 
         this.objectModel = FlowObjectModelHelper.getNewObjectModelWithFOM(objectModel, parameters);
+        this.namespaces = new NamespacesTable();
         this.definitions = new HashMap();
     }
 

Modified: cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/Invoker.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/Invoker.java?view=diff&rev=557517&r1=557516&r2=557517
==============================================================================
--- cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/Invoker.java (original)
+++ cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/Invoker.java Thu Jul 19 01:08:07 2007
@@ -63,7 +63,7 @@
                         .getDefinitions().get(startElement.getQname());
                 if (def == null) {
                     ev = ev.execute(consumer, objectModel,
-                            executionContext, macroContext, null, startEvent, endEvent);
+                            executionContext, macroContext, namespaces, startEvent, endEvent);
                     continue;
                 }
 
@@ -72,7 +72,7 @@
                         executionContext, macroContext, null, startEvent, endEvent);
             } else
                 ev = ev.execute(consumer, objectModel, executionContext,
-                        macroContext, null, startEvent, endEvent);
+                        macroContext, namespaces, startEvent, endEvent);
         }
     }