cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From coli...@apache.org
Subject cvs commit: cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath Cart.xml Category.xml Checkout.xml ConfirmOrder.xml IncludeBottom.xml IncludeMyList.xml IncludeQuickHeader.xml IncludeTop.xml Item.xml NewAccountForm.xml NewOrderForm.xml Product.xml SearchProducts.xml ShippingForm.xml SignonForm.xml ViewOrder.xml index.xml
Date Wed, 23 Apr 2003 20:44:59 GMT
coliver     2003/04/23 13:44:59

  Modified:    src/scratchpad/src/org/apache/cocoon/generation
                        JXTemplate.java
               src/scratchpad/webapp/samples/petstore sitemap.xmap
               src/scratchpad/webapp/samples/petstore/view/jexl Cart.xml
                        Category.xml Checkout.xml ConfirmOrder.xml
                        IncludeBottom.xml IncludeMyList.xml
                        IncludeQuickHeader.xml IncludeTop.xml Item.xml
                        NewAccountForm.xml NewOrderForm.xml Product.xml
                        SearchProducts.xml ShippingForm.xml SignonForm.xml
                        ViewOrder.xml index.xml
               src/scratchpad/webapp/samples/petstore/view/jxpath Cart.xml
                        Category.xml Checkout.xml ConfirmOrder.xml
                        IncludeBottom.xml IncludeMyList.xml
                        IncludeQuickHeader.xml IncludeTop.xml Item.xml
                        NewAccountForm.xml NewOrderForm.xml Product.xml
                        SearchProducts.xml ShippingForm.xml SignonForm.xml
                        ViewOrder.xml index.xml
  Log:
  Created a transformer adapter for JXTemplate (JXTemplateTransformer and changed JXTemplate's namespace to http://cocoon.apache.org/templates/jx/1.0. Modified sample application accordingly
  
  Revision  Changes    Path
  1.4       +149 -75   cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation/JXTemplate.java
  
  Index: JXTemplate.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation/JXTemplate.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JXTemplate.java	22 Apr 2003 23:38:38 -0000	1.3
  +++ JXTemplate.java	23 Apr 2003 20:44:58 -0000	1.4
  @@ -67,6 +67,7 @@
   
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.transformation.AbstractTransformer;
   import org.apache.cocoon.components.flow.WebContinuation;
   import org.apache.cocoon.components.source.SourceUtil;
   import org.apache.cocoon.environment.Environment;
  @@ -114,6 +115,7 @@
   import org.xml.sax.helpers.LocatorImpl;
   /**
    *  <p>(<em>JX</em> for <a href="http://jakarta.apache.org/commons/jxpath">Apache <em>JX</em>Path</a> and <a href="http://jakarta.apache.org/commons/jexl">Apache <em>J</em>e<em>x</em>l</a>)</p>
  + *  <p>Uses the namespace <code>http://cocoon.apache.org/templates/jx/1.0</code></p>
    *  <p>Provides a generic page template with embedded JSTL and XPath expression substitution
    *  to access data sent by Cocoon Flowscripts.</p>
    *  The embedded expression language allows a page author to access an 
  @@ -674,7 +676,7 @@
   
   
       final static String NS = 
  -        "http://cocoon.apache.org/generation/jx/1.0";
  +        "http://cocoon.apache.org/templates/jx/1.0";
   
       final static String TEMPLATE = "template";
       final static String FOR_EACH = "forEach";
  @@ -805,7 +807,7 @@
           }
       }
   
  -    class Event {
  +    static class Event {
           final Locator location;
           Event next;
           Event(Locator location) {
  @@ -828,7 +830,7 @@
           
       }
   
  -    class TextEvent extends Event {
  +    static class TextEvent extends Event {
           TextEvent(Locator location, 
                     char[] chars, int start, int length) 
               throws SAXException {
  @@ -925,7 +927,7 @@
           final List substitutions = new LinkedList();
       }
   
  -    class Characters extends TextEvent {
  +    static class Characters extends TextEvent {
           Characters(Locator location, 
                      char[] chars, int start, int length) 
               throws SAXException {
  @@ -934,7 +936,7 @@
   
       }
   
  -    class StartDocument extends Event {
  +    static class StartDocument extends Event {
           StartDocument(Locator location) {
               super(location);
           }
  @@ -942,13 +944,13 @@
           EndDocument endDocument; // null if document fragment
       }
   
  -    class EndDocument extends Event {
  +    static class EndDocument extends Event {
           EndDocument(Locator location) {
               super(location);
           }
       }
   
  -    class EndElement extends Event {
  +    static class EndElement extends Event {
           EndElement(Locator location, 
                      StartElement startElement) {
               super(location);
  @@ -957,7 +959,7 @@
           final StartElement startElement;
       }
   
  -    class EndPrefixMapping extends Event {
  +    static class EndPrefixMapping extends Event {
           EndPrefixMapping(Locator location, String prefix) {
               super(location);
               this.prefix = prefix;
  @@ -965,7 +967,7 @@
           final String prefix;
       }
       
  -    class IgnorableWhitespace extends TextEvent {
  +    static class IgnorableWhitespace extends TextEvent {
           IgnorableWhitespace(Locator location, 
                               char[] chars, int start, int length) 
               throws SAXException {
  @@ -973,7 +975,7 @@
           }
       }
   
  -    class ProcessingInstruction extends Event {
  +    static class ProcessingInstruction extends Event {
           ProcessingInstruction(Locator location,
                                 String target, String data) {
               super(location);
  @@ -984,7 +986,7 @@
           final String data;
       }
   
  -    class SkippedEntity extends Event {
  +    static class SkippedEntity extends Event {
           SkippedEntity(Locator location, String name) {
               super(location);
               this.name = name;
  @@ -992,7 +994,7 @@
           final String name;
       }
   
  -    abstract class AttributeEvent {
  +    abstract static class AttributeEvent {
           AttributeEvent(String namespaceURI, String localName, String raw,
                          String type) {
               this.namespaceURI = namespaceURI;
  @@ -1006,7 +1008,7 @@
           final String type;
       }
       
  -    class CopyAttribute extends AttributeEvent {
  +    static class CopyAttribute extends AttributeEvent {
           CopyAttribute(String namespaceURI, 
                         String localName,
                         String raw,
  @@ -1017,24 +1019,24 @@
           final String value;
       }
       
  -    class Subst {
  +    static class Subst {
       }
       
  -    class Literal extends Subst {
  +    static class Literal extends Subst {
           Literal(String val) {
               this.value = val;
           }
           final String value;
       }
       
  -    class Expression extends Subst {
  +    static class Expression extends Subst {
           Expression(Object expr) {
               this.compiledExpression = expr;
           }
           final Object compiledExpression;
       }
   
  -    class SubstituteAttribute extends AttributeEvent {
  +    static class SubstituteAttribute extends AttributeEvent {
           SubstituteAttribute(String namespaceURI,
                               String localName,
                               String raw,
  @@ -1045,8 +1047,9 @@
           final List substitutions;
       }
   
  -    class StartElement extends Event {
  -        StartElement(Locator location, String namespaceURI,
  +    static class StartElement extends Event {
  +        StartElement(JXTemplate template,
  +                     Locator location, String namespaceURI,
                        String localName, String raw,
                        Attributes attrs) 
               throws SAXException {
  @@ -1085,7 +1088,7 @@
                                       Object compiledExpression;
                                       try {
                                           compiledExpression =
  -                                            compile(str, xpath);
  +                                            template.compile(str, xpath);
                                       } catch (Exception exc) {
                                           throw new SAXParseException(exc.getMessage(),
                                                                       location,
  @@ -1177,7 +1180,7 @@
           EndElement endElement;
       }
   
  -    class StartForEach extends Event {
  +    static class StartForEach extends Event {
           StartForEach(Locator location, Object items, String var,
                        int begin, int end, int step) {
               super(location);
  @@ -1195,13 +1198,13 @@
           EndForEach endForEach;
       }
       
  -    class EndForEach extends Event {
  +    static class EndForEach extends Event {
           EndForEach(Locator location) {
               super(location);
           }
       }
   
  -    class StartIf extends Event {
  +    static class StartIf extends Event {
           StartIf(Locator location, Object test) {
               super(location);
               this.test = test;
  @@ -1210,13 +1213,13 @@
           EndIf endIf;
       }
   
  -    class EndIf extends Event {
  +    static class EndIf extends Event {
           EndIf(Locator location) {
               super(location);
           }
       }
   
  -    class StartChoose extends Event {
  +    static class StartChoose extends Event {
           StartChoose(Locator location) {
               super(location);
           }
  @@ -1225,13 +1228,13 @@
           EndChoose endChoose;
       }
   
  -    class EndChoose extends Event {
  +    static class EndChoose extends Event {
           EndChoose(Locator location) {
               super(location);
           }
       }
   
  -    class StartWhen extends Event {
  +    static class StartWhen extends Event {
           StartWhen(Locator location, Object test) {
               super(location);
               this.test = test;
  @@ -1241,26 +1244,26 @@
           EndWhen endWhen;
       }
   
  -    class EndWhen extends Event {
  +    static class EndWhen extends Event {
           EndWhen(Locator location) {
               super(location);
           }
       }
   
  -    class StartOtherwise extends Event {
  +    static class StartOtherwise extends Event {
           StartOtherwise(Locator location) {
               super(location);
           }
           EndOtherwise endOtherwise;
       }
   
  -    class EndOtherwise extends Event {
  +    static class EndOtherwise extends Event {
           EndOtherwise(Locator location) {
               super(location);
           }
       }
   
  -    class StartPrefixMapping extends Event {
  +    static class StartPrefixMapping extends Event {
           StartPrefixMapping(Locator location, String prefix,
                              String uri) {
               super(location);
  @@ -1271,7 +1274,7 @@
           final String uri;
       }
   
  -    class Comment extends TextEvent {
  +    static class Comment extends TextEvent {
           Comment(Locator location, char[] chars,
                   int start, int length)
               throws SAXException {
  @@ -1279,19 +1282,19 @@
           }
       }
   
  -    class EndCDATA extends Event {
  +    static class EndCDATA extends Event {
           EndCDATA(Locator location) {
               super(location);
           }
       }
   
  -    class EndDTD extends Event {
  +    static class EndDTD extends Event {
           EndDTD(Locator location) {
               super(location);
           }
       }
   
  -    class EndEntity extends Event {
  +    static class EndEntity extends Event {
           EndEntity(Locator location, String name) {
               super(location);
               this.name = name;
  @@ -1299,13 +1302,13 @@
           final String name;
       }
   
  -    class StartCDATA extends Event {
  +    static class StartCDATA extends Event {
           StartCDATA(Locator location) {
               super(location);
           }
       }
   
  -    class StartDTD extends Event {
  +    static class StartDTD extends Event {
           StartDTD(Locator location, String name, 
                    String publicId, String systemId) {
               super(location);
  @@ -1318,7 +1321,7 @@
           final String systemId;
       }
       
  -    class StartEntity extends Event {
  +    static class StartEntity extends Event {
           public StartEntity(Locator location, String name) {
               super(location);
               this.name = name;
  @@ -1326,7 +1329,7 @@
           final String name;
       }
   
  -    class StartOut extends Event {
  +    static class StartOut extends Event {
           StartOut(Locator location, Object expr) {
               super(location);
               this.compiledExpression = expr;
  @@ -1334,13 +1337,13 @@
           final Object compiledExpression;
       }
   
  -    class EndOut extends Event {
  +    static class EndOut extends Event {
           EndOut(Locator location) {
               super(location);
           }
       }
   
  -    class StartImport extends Event {
  +    static class StartImport extends Event {
           StartImport(Locator location, AttributeEvent uri, 
                       Object select) {
               super(location);
  @@ -1352,26 +1355,26 @@
           EndImport endImport;
       }
   
  -    class EndImport extends Event {
  +    static class EndImport extends Event {
           EndImport(Locator location) {
               super(location);
           }
       }
   
  -    class StartTemplate extends Event {
  +    static class StartTemplate extends Event {
           StartTemplate(Locator location) {
               super(location);
           }
           EndTemplate endTemplate;
       }
   
  -    class EndTemplate extends Event {
  +    static class EndTemplate extends Event {
           EndTemplate(Locator location) {
               super(location);
           }
       }
   
  -    class StartDefine extends Event {
  +    static class StartDefine extends Event {
           StartDefine(Locator location, String namespace, String name) {
               super(location);
               this.namespace = namespace;
  @@ -1418,13 +1421,13 @@
           }
       }
   
  -    class EndDefine extends Event {
  +    static class EndDefine extends Event {
           EndDefine(Locator location) {
               super(location);
           }
       }
   
  -    class StartParameter extends Event {
  +    static class StartParameter extends Event {
           StartParameter(Locator location, String name, String optional,
                          String default_) {
               super(location);
  @@ -1438,13 +1441,13 @@
           EndParameter endParameter;
       }
   
  -    class EndParameter extends Event {
  +    static class EndParameter extends Event {
           EndParameter(Locator location) {
               super(location);
           }
       }
   
  -    class StartSet extends Event {
  +    static class StartSet extends Event {
           StartSet(Locator location, String var, Object value) {
               super(location);
               this.var = var;
  @@ -1455,20 +1458,25 @@
           EndSet endSet;
       }
   
  -    class EndSet extends Event {
  +    static class EndSet extends Event {
           EndSet(Locator location) {
               super(location);
           }
       }
   
  -    class Parser implements ContentHandler, LexicalHandler {
  +    static class Parser implements ContentHandler, LexicalHandler {
   
  +        JXTemplate template;
           StartDocument startEvent;
           Event lastEvent;
           Stack stack = new Stack();
           Locator locator;
           Locator charLocation;
           StringBuffer charBuf;
  +        
  +        public Parser(JXTemplate template) {
  +            this.template = template;
  +        }
   
           StartDocument getStartEvent() {
               return startEvent;
  @@ -1649,8 +1657,8 @@
                       begin = begin == -1 ? 0 : begin;
                       end = end == -1 ? Integer.MAX_VALUE: end;
                       Object expr;
  -                    expr = compileExpr(items == null ? select : items,
  -                                       null, locator);
  +                    expr = template.compileExpr(items == null ? select : items,
  +                                                null, locator);
                       StartForEach startForEach = 
                           new StartForEach(locator, expr, 
                                            var, begin, end, step);
  @@ -1668,7 +1676,7 @@
                           throw new SAXParseException("when: \"test\" is required", locator, null);
                       }
                       Object expr;
  -                    expr = compileExpr(test, "when: \"test\": ", locator);
  +                    expr = template.compileExpr(test, "when: \"test\": ", locator);
                       StartWhen startWhen = new StartWhen(locator, expr);
                       newEvent = startWhen;
                   } else if (localName.equals(OUT)) {
  @@ -1676,9 +1684,9 @@
                       if (value == null) {
                           throw new SAXParseException("out: \"value\" is required", locator, null);
                       }
  -                    Object expr = compileExpr(value, 
  -                                              "out: \"value\": ", 
  -                                              locator);
  +                    Object expr = template.compileExpr(value, 
  +                                                       "out: \"value\": ", 
  +                                                       locator);
                       newEvent = new StartOut(locator, expr);
                   } else if (localName.equals(OTHERWISE)) {
                       if (stack.size() == 0 ||
  @@ -1693,7 +1701,8 @@
                       if (test == null) {
                           throw new SAXParseException("if: \"test\" is required", locator, null);
                       }
  -                    Object expr = compileExpr(test, "if: \"test\": ", locator);
  +                    Object expr = 
  +                        template.compileExpr(test, "if: \"test\": ", locator);
                       StartIf startIf = 
                           new StartIf(locator, expr);
                       newEvent = startIf;
  @@ -1739,8 +1748,9 @@
                       String value = attrs.getValue("value");
                       Object valueExpr = null;
                       if (value != null) {
  -                        valueExpr = compileExpr(value, "set: \"value\":",
  -                                                locator);
  +                        valueExpr = 
  +                            template.compileExpr(value, "set: \"value\":",
  +                                                 locator);
                       } 
                       StartSet startSet = new StartSet(locator, var, valueExpr);
                       newEvent = startSet;
  @@ -1749,7 +1759,7 @@
                       // Allow expression substitution in "uri" attribute
                       AttributeEvent uri = null;
                       StartElement startElement = 
  -                        new StartElement(locator, namespaceURI,
  +                        new StartElement(template, locator, namespaceURI,
                                            localName, raw, attrs);
                       Iterator iter = startElement.attributeEvents.iterator();
                       while (iter.hasNext()) {
  @@ -1767,8 +1777,9 @@
                       String select = attrs.getValue("context");
                       Object expr = null;
                       if (select != null) {
  -                        expr = compileExpr(select, "import: \"context\": ",
  -                                           locator);
  +                        expr = 
  +                            template.compileExpr(select, "import: \"context\": ",
  +                                                 locator);
                       }
                       StartImport startImport = 
                           new StartImport(locator, uri, expr);
  @@ -1782,7 +1793,7 @@
                   }
               } else {
                   StartElement startElem = 
  -                    new StartElement(locator, namespaceURI,
  +                    new StartElement(template, locator, namespaceURI,
                                        localName, raw, attrs);
                   newEvent = startElem;
               }
  @@ -1826,6 +1837,57 @@
           }
       }
   
  +    /**
  +     * Adapter that makes this generator usable as a transformer
  +     * (Note there is a performance penalty for this however: 
  +     * you effectively recompile the template for every instance document)
  +     */
  +
  +    public static class TransformerAdapter extends AbstractTransformer {
  +
  +        static class TemplateConsumer extends Parser implements XMLConsumer {
  +
  +            public TemplateConsumer(SourceResolver resolver, Map objectModel,
  +                                    String src, Parameters parameters) 
  +                throws ProcessingException, SAXException, IOException {
  +                super(new JXTemplate());
  +                this.template.setup(resolver, objectModel, null, parameters);
  +            }
  +
  +            public void endDocument() throws SAXException {
  +                super.endDocument();
  +                template.execute(template.getConsumer(),
  +                                 template.getJexlContext(),
  +                                 template.getJXPathContext(),
  +                                 getStartEvent(), null);
  +            }
  +
  +            void setConsumer(XMLConsumer consumer) {
  +                template.setConsumer(consumer);
  +            }
  +        }
  +
  +        TemplateConsumer templateConsumer;
  +
  +        public void recycle() {
  +            super.recycle();
  +            templateConsumer = null;
  +        }
  +
  +        public void setup(SourceResolver resolver, Map objectModel,
  +                          String src, Parameters parameters)
  +            throws ProcessingException, SAXException, IOException {
  +            templateConsumer = new TemplateConsumer(resolver, objectModel,
  +                                                    src,
  +                                                    parameters);
  +        }
  +
  +        public void setConsumer(XMLConsumer xmlConsumer) {
  +            super.setConsumer(templateConsumer);
  +            templateConsumer.setConsumer(xmlConsumer);
  +        }
  +    }
  +
       private XMLConsumer consumer;
       private JXPathContext jxpathContext;
       private MyJexlContext globalJexlContext;
  @@ -1834,6 +1896,18 @@
       private Source inputSource;
       private Map definitions;
   
  +    private JXPathContext getJXPathContext() {
  +        return jxpathContext;
  +    }
  +
  +    private MyJexlContext getJexlContext() {
  +        return globalJexlContext;
  +    }
  +
  +    private XMLConsumer getConsumer() {
  +        return consumer;
  +    }
  +
       public void recycle() {
           super.recycle();
           consumer = null;
  @@ -1855,14 +1929,14 @@
               } catch (SourceException se) {
                   throw SourceUtil.handle("Error during resolving of '" + src + "'.", se);
               }
  -        }
  -        long lastMod = inputSource.getLastModified();
  -        String uri = inputSource.getURI();
  -        synchronized (cache) {
  -            StartDocument startEvent = (StartDocument)cache.get(uri);
  -            if (startEvent != null &&
  -                lastMod > startEvent.compileTime) {
  -                cache.remove(uri);
  +            long lastMod = inputSource.getLastModified();
  +            String uri = inputSource.getURI();
  +            synchronized (cache) {
  +                StartDocument startEvent = (StartDocument)cache.get(uri);
  +                if (startEvent != null &&
  +                    lastMod > startEvent.compileTime) {
  +                    cache.remove(uri);
  +                }
               }
           }
           // FIX ME: When we decide proper way to pass "bean" and "kont"
  @@ -1959,7 +2033,7 @@
           }
           if (startEvent == null) {
               long compileTime = inputSource.getLastModified();
  -            Parser parser = new Parser();
  +            Parser parser = new Parser(this);
               this.resolver.toSAX(this.inputSource, parser);
               startEvent = parser.getStartEvent();
               startEvent.compileTime = compileTime;
  @@ -2036,7 +2110,7 @@
                                       new DOMStreamer(consumer);
                                   streamer.stream((Node)val);
                                   continue;
  -                            }
  +                            } 
                               if (val != null) {
                                   chars = val.toString().toCharArray();
                               } else {
  @@ -2581,7 +2655,7 @@
                   }
                   if (doc == null) {
                       try {
  -                        Parser parser = new Parser();
  +                        Parser parser = new Parser(this);
                           this.resolver.toSAX(input, parser);
                           doc = parser.getStartEvent();
                           doc.compileTime = lastMod;
  
  
  
  1.15      +3 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/sitemap.xmap,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- sitemap.xmap	21 Apr 2003 05:34:46 -0000	1.14
  +++ sitemap.xmap	23 Apr 2003 20:44:58 -0000	1.15
  @@ -5,6 +5,7 @@
     <map:components> 
       <map:transformers default="xslt">
         <map:transformer name="xmlform" src="org.apache.cocoon.transformation.XMLFormTransformer" logger="xmlform.sitemap.transformer"/>
  +      <map:transformer name="jx" src="org.apache.cocoon.transformation.JXTemplateTransformer" logger="jx.sitemap.transformer"/>
       </map:transformers>
       <map:generators default="file">
           <map:generator label="content,data" logger="sitemap.generator.velocity" name="velocity" src="org.apache.cocoon.generation.FlowVelocityGenerator"/>
  @@ -110,7 +111,8 @@
           <map:serialize type="html"/>
        </map:match>
        <map:match pattern="view/*.jxpath">
  -        <map:generate src="view/jxpath/{1}.xml" type="jx" />
  +        <map:generate src="view/jxpath/{1}.xml" type="file" />
  +        <map:transform type="jx" />
           <map:transform src="stylesheets/site2html.xsl" />
           <map:serialize type="html"/>
        </map:match>
  
  
  
  1.6       +3 -3      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/Cart.xml
  
  Index: Cart.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/Cart.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Cart.xml	22 Apr 2003 23:52:49 -0000	1.5
  +++ Cart.xml	23 Apr 2003 20:44:58 -0000	1.6
  @@ -1,4 +1,4 @@
  -<html xmlns:t="http://cocoon.apache.org/generation/jx/1.0">
  +<html xmlns:t="http://cocoon.apache.org/templates/jx/1.0">
   <body>
   <t:import uri="view/jexl/IncludeTop.xml"/>
   <table border="0" width="100%" cellspacing="0" cellpadding="0">
  @@ -37,7 +37,7 @@
     <td align="center">
     <input type="text" size="3" name="${cartItem.item.ItemId}" value="${cartItem.quantity}" />
     </td>
  -  <td align="right">${fmt.formatNumber(item.listPrice, '$#,##0.00')}</td>
  +  <td align="right">${fmt.formatNumber(cartItem.item.listPrice, '$#,##0.00')}</td>
     <td><a href="removeItemFromCart.do?workingItemId=${cartItem.item.itemId}">
     <img border="0" src="images/button_remove.gif" /></a></td>
     </tr>
  @@ -53,7 +53,7 @@
   </table>
   </form>
   
  -<t:if test="${cartForm.cart.numberOfItems > 0}">
  +<t:if test="${cartForm.cart.numberOfItems.intValue() > 0}">
     <br /><center><a href="checkout.do"><img border="0" src="images/button_checkout.gif" /></a></center>
   </t:if>
   
  
  
  
  1.4       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/Category.xml
  
  Index: Category.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/Category.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Category.xml	21 Apr 2003 05:34:46 -0000	1.3
  +++ Category.xml	23 Apr 2003 20:44:58 -0000	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="${accountForm.signOn}" view="c">
           <backpointer name="Main Menu" do="index.do" />
           <category name="${category.name}">
  
  
  
  1.4       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/Checkout.xml
  
  Index: Checkout.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/Checkout.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Checkout.xml	21 Apr 2003 05:34:46 -0000	1.3
  +++ Checkout.xml	23 Apr 2003 20:44:58 -0000	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="${accountForm.signOn}" view="c">
           <cart name="Checkout Summary">
               <backpointer name="Shopping Cart" do="viewCart.do" />
  
  
  
  1.3       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/ConfirmOrder.xml
  
  Index: ConfirmOrder.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/ConfirmOrder.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConfirmOrder.xml	21 Apr 2003 05:34:46 -0000	1.2
  +++ ConfirmOrder.xml	23 Apr 2003 20:44:58 -0000	1.3
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="${accountForm.signOn}" view="jexl">
           <backpointer name="Main Menu" do="index.do" />
           <message>Please confirm the information below and then press continue...</message>
  
  
  
  1.3       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/IncludeBottom.xml
  
  Index: IncludeBottom.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/IncludeBottom.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IncludeBottom.xml	21 Apr 2003 05:34:46 -0000	1.2
  +++ IncludeBottom.xml	23 Apr 2003 20:44:58 -0000	1.3
  @@ -1,4 +1,4 @@
  -<c:template xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<c:template xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
   <br />
   <c:if test="${accountForm.account != null}">
     <c:if test="${accountForm.account.username != null}">
  
  
  
  1.3       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/IncludeMyList.xml
  
  Index: IncludeMyList.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/IncludeMyList.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IncludeMyList.xml	21 Apr 2003 05:34:46 -0000	1.2
  +++ IncludeMyList.xml	23 Apr 2003 20:44:58 -0000	1.3
  @@ -1,4 +1,4 @@
  -<t:template xmlns:t="http://cocoon.apache.org/generation/jx/1.0">
  +<t:template xmlns:t="http://cocoon.apache.org/templates/jx/1.0">
   <t:if test="${myList != null}">
   <p> </p>
   <table align="right" bgcolor="#008800" border="0" cellspacing="2" cellpadding="3">
  
  
  
  1.3       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/IncludeQuickHeader.xml
  
  Index: IncludeQuickHeader.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/IncludeQuickHeader.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IncludeQuickHeader.xml	21 Apr 2003 05:34:46 -0000	1.2
  +++ IncludeQuickHeader.xml	23 Apr 2003 20:44:58 -0000	1.3
  @@ -1,4 +1,4 @@
  -<t:template xmlns:t="http://cocoon.apache.org/generation/jx/1.0">
  +<t:template xmlns:t="http://cocoon.apache.org/templates/jx/1.0">
   
   <center>
   <a href="viewCategory.do?categoryId=FISH">
  
  
  
  1.3       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/IncludeTop.xml
  
  Index: IncludeTop.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/IncludeTop.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IncludeTop.xml	21 Apr 2003 05:34:46 -0000	1.2
  +++ IncludeTop.xml	23 Apr 2003 20:44:58 -0000	1.3
  @@ -1,4 +1,4 @@
  -<t:template xmlns:t="http://cocoon.apache.org/generation/jx/1.0">
  +<t:template xmlns:t="http://cocoon.apache.org/templates/jx/1.0">
   
   <table background="images/bkg-topbar.gif" border="0" cellspacing="0" cellpadding="5" width="100%">
     <tbody>
  
  
  
  1.3       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/Item.xml
  
  Index: Item.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/Item.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Item.xml	21 Apr 2003 05:34:46 -0000	1.2
  +++ Item.xml	23 Apr 2003 20:44:58 -0000	1.3
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="${accountForm.signOn}" view="jexl">
           <backpointer name="${product.name}" do="viewProduct.do?productId=${product.productId}"/>
           <item id="${item.itemId}">
  
  
  
  1.3       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/NewAccountForm.xml
  
  Index: NewAccountForm.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/NewAccountForm.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NewAccountForm.xml	21 Apr 2003 05:34:46 -0000	1.2
  +++ NewAccountForm.xml	23 Apr 2003 20:44:58 -0000	1.3
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="${accountForm.signOn}" view="jexl">
           <form method="POST" styleId="workingAccountForm" action="${continuation.id}.kont">
   <!--
  
  
  
  1.3       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/NewOrderForm.xml
  
  Index: NewOrderForm.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/NewOrderForm.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NewOrderForm.xml	21 Apr 2003 05:34:46 -0000	1.2
  +++ NewOrderForm.xml	23 Apr 2003 20:44:58 -0000	1.3
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="${accountForm.signOn}" view="jexl">
           <form method="POST" styleId="workingOrderForm" action="${continuation.id}.kont">
           <panel>
  
  
  
  1.3       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/Product.xml
  
  Index: Product.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/Product.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Product.xml	21 Apr 2003 05:34:46 -0000	1.2
  +++ Product.xml	23 Apr 2003 20:44:58 -0000	1.3
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="${accountForm.signOn}" view="jexl">
           <backpointer name="${product.category}" do="viewCategory.do?categoryId=${product.category}"/>
           <product name="${product.name}">
  
  
  
  1.5       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/SearchProducts.xml
  
  Index: SearchProducts.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/SearchProducts.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SearchProducts.xml	22 Apr 2003 20:03:43 -0000	1.4
  +++ SearchProducts.xml	23 Apr 2003 20:44:58 -0000	1.5
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="${accountForm.signOn}" view="jexl">
           <backpointer name="Main Menu" do="index.do" />
           <search>
  
  
  
  1.4       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/ShippingForm.xml
  
  Index: ShippingForm.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/ShippingForm.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ShippingForm.xml	21 Apr 2003 05:34:46 -0000	1.3
  +++ ShippingForm.xml	23 Apr 2003 20:44:58 -0000	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="${accountForm.signOn}" view="jexl">
           <backpointer name="Main Menu" do="index.do" />
           <form method="POST" styleId="workingOrderForm" action="${continuation.id}.kont">
  
  
  
  1.4       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/SignonForm.xml
  
  Index: SignonForm.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/SignonForm.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SignonForm.xml	21 Apr 2003 05:34:46 -0000	1.3
  +++ SignonForm.xml	23 Apr 2003 20:44:58 -0000	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="${accountForm.signOn}" view="jexl">
           <form method="POST" label="signon" action="${continuation.id}.kont">
               <message type="warning">${message}</message>
  
  
  
  1.4       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/ViewOrder.xml
  
  Index: ViewOrder.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/ViewOrder.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ViewOrder.xml	22 Apr 2003 23:52:49 -0000	1.3
  +++ ViewOrder.xml	23 Apr 2003 20:44:58 -0000	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="${accountForm.signOn}" view="jexl">
           <backpointer name="Main Menu" do="index.do" />
           <message></message>
  
  
  
  1.3       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/index.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.xml	21 Apr 2003 05:34:46 -0000	1.2
  +++ index.xml	23 Apr 2003 20:44:58 -0000	1.3
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="${accountForm.signOn}" view="jexl">
               <welcome>
                   <c:if test="${!accountForm.signOn}">
  
  
  
  1.8       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Cart.xml
  
  Index: Cart.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Cart.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Cart.xml	22 Apr 2003 20:03:43 -0000	1.7
  +++ Cart.xml	23 Apr 2003 20:44:59 -0000	1.8
  @@ -1,4 +1,4 @@
  -<html xmlns:t="http://cocoon.apache.org/generation/jx/1.0">
  +<html xmlns:t="http://cocoon.apache.org/templates/jx/1.0">
   <body>
   <t:import uri="view/jxpath/IncludeTop.xml"/>
   <table border="0" width="100%" cellspacing="0" cellpadding="0">
  
  
  
  1.4       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Category.xml
  
  Index: Category.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Category.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Category.xml	21 Apr 2003 05:34:47 -0000	1.3
  +++ Category.xml	23 Apr 2003 20:44:59 -0000	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="#{accountForm/signOn}" view="jxpath">
           <backpointer name="Main Menu" do="index.do" />
           <category name="#{category/name}">
  
  
  
  1.4       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Checkout.xml
  
  Index: Checkout.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Checkout.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Checkout.xml	21 Apr 2003 05:34:47 -0000	1.3
  +++ Checkout.xml	23 Apr 2003 20:44:59 -0000	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +1<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="#{accountForm/signOn}" view="jxpath">
           <cart name="Checkout Summary">
               <backpointer name="Shopping Cart" do="viewCart.do" />
  
  
  
  1.5       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/ConfirmOrder.xml
  
  Index: ConfirmOrder.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/ConfirmOrder.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ConfirmOrder.xml	21 Apr 2003 05:34:47 -0000	1.4
  +++ ConfirmOrder.xml	23 Apr 2003 20:44:59 -0000	1.5
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="#{accountForm/signOn}" view="jxpath">
           <backpointer name="Main Menu" do="index.do" />
           <message>Please confirm the information below and then press continue...</message>
  
  
  
  1.4       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/IncludeBottom.xml
  
  Index: IncludeBottom.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/IncludeBottom.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IncludeBottom.xml	21 Apr 2003 05:34:47 -0000	1.3
  +++ IncludeBottom.xml	23 Apr 2003 20:44:59 -0000	1.4
  @@ -1,4 +1,4 @@
  -<c:template xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<c:template xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
   <br />
   <c:if test="#{accountForm/account}">
     <c:if test="#{accountForm/account/username}">
  
  
  
  1.4       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/IncludeMyList.xml
  
  Index: IncludeMyList.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/IncludeMyList.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IncludeMyList.xml	21 Apr 2003 05:34:47 -0000	1.3
  +++ IncludeMyList.xml	23 Apr 2003 20:44:59 -0000	1.4
  @@ -1,4 +1,4 @@
  -<t:template xmlns:t="http://cocoon.apache.org/generation/jx/1.0">
  +<t:template xmlns:t="http://cocoon.apache.org/templates/jx/1.0">
   <t:if test="#{myList}">
   <p> </p>
   <table align="right" bgcolor="#008800" border="0" cellspacing="2" cellpadding="3">
  
  
  
  1.3       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/IncludeQuickHeader.xml
  
  Index: IncludeQuickHeader.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/IncludeQuickHeader.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IncludeQuickHeader.xml	21 Apr 2003 05:34:47 -0000	1.2
  +++ IncludeQuickHeader.xml	23 Apr 2003 20:44:59 -0000	1.3
  @@ -1,4 +1,4 @@
  -<t:template xmlns:t="http://cocoon.apache.org/generation/jx/1.0">
  +<t:template xmlns:t="http://cocoon.apache.org/templates/jx/1.0">
   
   <center>
   <a href="viewCategory.do?categoryId=FISH">
  
  
  
  1.4       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/IncludeTop.xml
  
  Index: IncludeTop.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/IncludeTop.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IncludeTop.xml	21 Apr 2003 05:34:47 -0000	1.3
  +++ IncludeTop.xml	23 Apr 2003 20:44:59 -0000	1.4
  @@ -1,4 +1,4 @@
  -<t:template xmlns:t="http://cocoon.apache.org/generation/jx/1.0">
  +<t:template xmlns:t="http://cocoon.apache.org/templates/jx/1.0">
   
   <table background="images/bkg-topbar.gif" border="0" cellspacing="0" cellpadding="5" width="100%">
     <tbody>
  
  
  
  1.4       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Item.xml
  
  Index: Item.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Item.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Item.xml	21 Apr 2003 05:34:47 -0000	1.3
  +++ Item.xml	23 Apr 2003 20:44:59 -0000	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="#{accountForm/signOn}" view="jxpath">
           <backpointer name="#{product/name}" do="viewProduct.do?productId=#{product/productId}"/>
           <item id="#{item/itemId}">
  
  
  
  1.4       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/NewAccountForm.xml
  
  Index: NewAccountForm.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/NewAccountForm.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NewAccountForm.xml	21 Apr 2003 05:34:47 -0000	1.3
  +++ NewAccountForm.xml	23 Apr 2003 20:44:59 -0000	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="#{accountForm/signOn}" view="jxpath">
           <form method="POST" styleId="workingAccountForm" action="#{$continuation/id}.kont">
   <!--
  
  
  
  1.6       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/NewOrderForm.xml
  
  Index: NewOrderForm.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/NewOrderForm.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- NewOrderForm.xml	21 Apr 2003 05:34:47 -0000	1.5
  +++ NewOrderForm.xml	23 Apr 2003 20:44:59 -0000	1.6
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="#{accountForm/signOn}" view="jxpath">
           <form method="POST" styleId="workingOrderForm" action="#{$continuation/id}.kont">
           <panel>
  
  
  
  1.4       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Product.xml
  
  Index: Product.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Product.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Product.xml	21 Apr 2003 05:34:47 -0000	1.3
  +++ Product.xml	23 Apr 2003 20:44:59 -0000	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="#{accountForm/signOn}" view="jxpath">
           <backpointer name="#{product/category}" do="viewCategory.do?categoryId=#{product/category}"/>
           <product name="#{product/name}">
  
  
  
  1.5       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/SearchProducts.xml
  
  Index: SearchProducts.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/SearchProducts.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SearchProducts.xml	22 Apr 2003 20:03:43 -0000	1.4
  +++ SearchProducts.xml	23 Apr 2003 20:44:59 -0000	1.5
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="#{accountForm/signOn}" view="jxpath">
           <backpointer name="Main Menu" do="index.do" />
           <search>
  
  
  
  1.4       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/ShippingForm.xml
  
  Index: ShippingForm.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/ShippingForm.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ShippingForm.xml	21 Apr 2003 05:34:47 -0000	1.3
  +++ ShippingForm.xml	23 Apr 2003 20:44:59 -0000	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="#{accountForm/signOn}" view="jxpath">
           <backpointer name="Main Menu" do="index.do" />
           <form method="POST" styleId="workingOrderForm" action="#{$continuation/id}.kont">
  
  
  
  1.4       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/SignonForm.xml
  
  Index: SignonForm.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/SignonForm.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SignonForm.xml	21 Apr 2003 05:34:47 -0000	1.3
  +++ SignonForm.xml	23 Apr 2003 20:44:59 -0000	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +1<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="#{accountForm/signOn}" view="jxpath">
           <form method="POST" label="signon" action="#{$continuation/id}.kont">
               <message type="warning">#{//message}</message>
  
  
  
  1.5       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/ViewOrder.xml
  
  Index: ViewOrder.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/ViewOrder.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ViewOrder.xml	21 Apr 2003 05:34:47 -0000	1.4
  +++ ViewOrder.xml	23 Apr 2003 20:44:59 -0000	1.5
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="#{accountForm/signOn}" view="jxpath">
           <backpointer name="Main Menu" do="index.do" />
           <message></message>
  
  
  
  1.4       +1 -1      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/index.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index.xml	21 Apr 2003 05:34:47 -0000	1.3
  +++ index.xml	23 Apr 2003 20:44:59 -0000	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<page xmlns:c="http://cocoon.apache.org/generation/jx/1.0">
  +<page xmlns:c="http://cocoon.apache.org/templates/jx/1.0">
       <site signOn="#{accountForm/signOn}" view="jxpath">
               <welcome>
                   <c:if test="#{not(accountForm/signOn)}">
  
  
  

Mime
View raw message