cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r240034 - in /cocoon: blocks/profiler/trunk/java/org/apache/cocoon/profiler/debugging/ trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ trunk/src/java/org/apache/cocoon/sitemap/ trunk/src/java/org/apache/cocoon/sitemap/impl/
Date Thu, 25 Aug 2005 10:04:17 GMT
Author: cziegeler
Date: Thu Aug 25 03:04:05 2005
New Revision: 240034

URL: http://svn.apache.org/viewcvs?rev=240034&view=rev
Log:
Add original pattern to sitemap executor for prepared matcher

Modified:
    cocoon/blocks/profiler/trunk/java/org/apache/cocoon/profiler/debugging/RemoteDebuggingSitemapExecutor.java
    cocoon/blocks/profiler/trunk/java/org/apache/cocoon/profiler/debugging/SimpleSitemapExecutor.java
    cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PreparableMatchNode.java
    cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapExecutor.java
    cocoon/trunk/src/java/org/apache/cocoon/sitemap/impl/DefaultExecutor.java

Modified: cocoon/blocks/profiler/trunk/java/org/apache/cocoon/profiler/debugging/RemoteDebuggingSitemapExecutor.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/profiler/trunk/java/org/apache/cocoon/profiler/debugging/RemoteDebuggingSitemapExecutor.java?rev=240034&r1=240033&r2=240034&view=diff
==============================================================================
--- cocoon/blocks/profiler/trunk/java/org/apache/cocoon/profiler/debugging/RemoteDebuggingSitemapExecutor.java
(original)
+++ cocoon/blocks/profiler/trunk/java/org/apache/cocoon/profiler/debugging/RemoteDebuggingSitemapExecutor.java
Thu Aug 25 03:04:05 2005
@@ -116,17 +116,18 @@
     }
     
     /**
-     * @see org.apache.cocoon.sitemap.SitemapExecutor#invokePreparableMatcher(org.apache.cocoon.sitemap.ExecutionContext,
java.util.Map, org.apache.cocoon.matching.PreparableMatcher, java.lang.Object, org.apache.avalon.framework.parameters.Parameters)
+     * @see org.apache.cocoon.sitemap.SitemapExecutor#invokePreparableMatcher(org.apache.cocoon.sitemap.ExecutionContext,
java.util.Map, org.apache.cocoon.matching.PreparableMatcher, java.lang.String, java.lang.Object,
org.apache.avalon.framework.parameters.Parameters)
      */
     public Map invokePreparableMatcher(ExecutionContext  context,
                                        Map               objectModel,
                                        PreparableMatcher matcher,
+                                       String            pattern,
                                        Object            preparedPattern,
                                        Parameters        resolvedParams )
     throws PatternException {
         final Debugger debugger = Debugger.getDebugger(objectModel);
         if (debugger != null) {
-            String p = Debugger.xmlElement("pattern", preparedPattern.toString());
+            String p = Debugger.xmlElement("pattern", pattern);
             debugger.sendSitemapElement("match", p, resolvedParams);
         }
         final Map result = matcher.preparedMatch(preparedPattern, objectModel, resolvedParams);
@@ -332,9 +333,8 @@
                                                       PipelineComponentDescription desc)
{
         final Debugger debugger = Debugger.getDebugger(objectModel);
         if (debugger != null) {
-            String configuration = Debugger.xmlElement("src", desc.source);
             debugger.sendSitemapElement("serialize", 
-                                        configuration, 
+                                        null,
                                         desc.parameters);
         }
         return desc;

Modified: cocoon/blocks/profiler/trunk/java/org/apache/cocoon/profiler/debugging/SimpleSitemapExecutor.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/profiler/trunk/java/org/apache/cocoon/profiler/debugging/SimpleSitemapExecutor.java?rev=240034&r1=240033&r2=240034&view=diff
==============================================================================
--- cocoon/blocks/profiler/trunk/java/org/apache/cocoon/profiler/debugging/SimpleSitemapExecutor.java
(original)
+++ cocoon/blocks/profiler/trunk/java/org/apache/cocoon/profiler/debugging/SimpleSitemapExecutor.java
Thu Aug 25 03:04:05 2005
@@ -68,9 +68,9 @@
      * @see org.apache.cocoon.sitemap.SitemapExecutor#invokeMatcher(org.apache.cocoon.sitemap.ExecutionContext,
java.util.Map, org.apache.cocoon.matching.Matcher, java.lang.String, org.apache.avalon.framework.parameters.Parameters)
      */
     public Map invokeMatcher(ExecutionContext context, 
-                             Map objectModel,
-                             Matcher matcher, 
-                             String pattern, 
+                             Map              objectModel,
+                             Matcher          matcher,
+                             String           pattern,
                              Parameters resolvedParams)
     throws PatternException {
         this.getLogger().info("- Invoking matcher '" + context.getType() + "' (" +
@@ -85,11 +85,12 @@
     }
     
     /**
-     * @see org.apache.cocoon.sitemap.SitemapExecutor#invokePreparableMatcher(org.apache.cocoon.sitemap.ExecutionContext,
java.util.Map, org.apache.cocoon.matching.PreparableMatcher, java.lang.Object, org.apache.avalon.framework.parameters.Parameters)
+     * @see org.apache.cocoon.sitemap.SitemapExecutor#invokePreparableMatcher(org.apache.cocoon.sitemap.ExecutionContext,
java.util.Map, org.apache.cocoon.matching.PreparableMatcher, java.lang.String, java.lang.Object,
org.apache.avalon.framework.parameters.Parameters)
      */
     public Map invokePreparableMatcher(ExecutionContext  context,
                                        Map               objectModel,
                                        PreparableMatcher matcher,
+                                       String            pattern,
                                        Object            preparedPattern,
                                        Parameters        resolvedParams )
     throws PatternException {

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PreparableMatchNode.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PreparableMatchNode.java?rev=240034&r1=240033&r2=240034&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PreparableMatchNode.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PreparableMatchNode.java
Thu Aug 25 03:04:05 2005
@@ -99,6 +99,7 @@
             result = this.executor.invokePreparableMatcher(this,
                                                            objectModel,
                                                            matcher,
+                                                           this.pattern,
                                                            preparedPattern,
                                                            resolvedParams);
         } finally {

Modified: cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapExecutor.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapExecutor.java?rev=240034&r1=240033&r2=240034&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapExecutor.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/sitemap/SitemapExecutor.java Thu Aug 25 03:04:05
2005
@@ -80,6 +80,7 @@
     Map invokePreparableMatcher(ExecutionContext context,
                       Map               objectModel,
                       PreparableMatcher matcher,
+                      String            pattern,
                       Object            preparedPattern,
                       Parameters        parameters )
     throws PatternException;

Modified: cocoon/trunk/src/java/org/apache/cocoon/sitemap/impl/DefaultExecutor.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/sitemap/impl/DefaultExecutor.java?rev=240034&r1=240033&r2=240034&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/sitemap/impl/DefaultExecutor.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/sitemap/impl/DefaultExecutor.java Thu Aug 25 03:04:05
2005
@@ -68,11 +68,12 @@
     }
     
     /**
-     * @see org.apache.cocoon.sitemap.SitemapExecutor#invokePreparableMatcher(org.apache.cocoon.sitemap.ExecutionContext,
java.util.Map, org.apache.cocoon.matching.PreparableMatcher, java.lang.Object, org.apache.avalon.framework.parameters.Parameters)
+     * @see org.apache.cocoon.sitemap.SitemapExecutor#invokePreparableMatcher(org.apache.cocoon.sitemap.ExecutionContext,
java.util.Map, org.apache.cocoon.matching.PreparableMatcher, java.lang.String, java.lang.Object,
org.apache.avalon.framework.parameters.Parameters)
      */
     public Map invokePreparableMatcher(ExecutionContext  context,
                                        Map               objectModel,
                                        PreparableMatcher matcher,
+                                       String            pattern,
                                        Object            preparedPattern,
                                        Parameters        resolvedParams )
     throws PatternException {
@@ -80,7 +81,7 @@
     }
     
     /**
-     * @see org.apache.cocoon.sitemap.SitemapExecutor#invokeSelector(org.apache.cocoon.sitemap.ExecutionContext,
java.util.Map, java.lang.String, org.apache.avalon.framework.parameters.Parameters)
+     * @see org.apache.cocoon.sitemap.SitemapExecutor#invokeSelector(org.apache.cocoon.sitemap.ExecutionContext,
java.util.Map, org.apache.cocoon.selection.Selector, java.lang.String, org.apache.avalon.framework.parameters.Parameters)
      */
     public boolean invokeSelector(ExecutionContext context, Map objectModel,
             Selector selector, String expression, Parameters parameters) {



Mime
View raw message