You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by lg...@apache.org on 2005/04/19 16:15:07 UTC

svn commit: r161893 - in cocoon/blocks/unsupported/template/trunk: java/org/apache/cocoon/xml/ test/org/apache/cocoon/template/jxtg/

Author: lgawron
Date: Tue Apr 19 07:15:05 2005
New Revision: 161893

URL: http://svn.apache.org/viewcvs?view=rev&rev=161893
Log:
missing license
missing svn properties

Modified:
    cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumer.java   (contents, props changed)
    cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumerImpl.java   (contents, props changed)
    cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxAttribute-output.xml   (contents, props changed)
    cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxAttribute.xml   (contents, props changed)
    cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxDynamicMacro-output.xml   (contents, props changed)
    cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxDynamicMacro.xml   (contents, props changed)
    cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxForEach-output.xml   (props changed)
    cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxForEach.xml   (props changed)
    cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxMacro-output.xml   (contents, props changed)
    cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxMacro.xml   (contents, props changed)
    cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxSet-output.xml   (contents, props changed)
    cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxSet.xml   (contents, props changed)

Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumer.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumer.java?view=diff&r1=161892&r2=161893
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumer.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumer.java Tue Apr 19 07:15:05 2005
@@ -1,11 +1,23 @@
-/*
- * Created on 2005-04-16
- */
-package org.apache.cocoon.xml;
-
-import org.xml.sax.SAXException;
-
-public interface AttributeAwareXMLConsumer extends XMLConsumer {
-    public void attribute(String uri, String localName, String qName,
-            String type, String value) throws SAXException;
-}
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.xml;
+
+import org.xml.sax.SAXException;
+
+public interface AttributeAwareXMLConsumer extends XMLConsumer {
+    public void attribute(String uri, String localName, String qName,
+            String type, String value) throws SAXException;
+}

Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumer.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumerImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumerImpl.java?view=diff&r1=161892&r2=161893
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumerImpl.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumerImpl.java Tue Apr 19 07:15:05 2005
@@ -1,207 +1,219 @@
-/*
- * Created on 2005-04-16
- */
-package org.apache.cocoon.xml;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.AttributesImpl;
-
-public class AttributeAwareXMLConsumerImpl implements AttributeAwareXMLConsumer {
-    private StartElement currentElement;
-    private List saxbits;
-    private Locator locator;
-
-    private XMLConsumer delegate;
-
-    public AttributeAwareXMLConsumerImpl(XMLConsumer consumer) {
-        this.delegate = consumer;
-        this.saxbits = new ArrayList();
-    }
-
-    public void setDocumentLocator(Locator locator) {
-        this.locator = locator;
-        delegate.setDocumentLocator(locator);
-    }
-
-    public void startDocument() throws SAXException {
-        delegate.startDocument();
-    }
-
-    public void endDocument() throws SAXException {
-        playCache();
-        delegate.endDocument();
-    }
-
-    public void startPrefixMapping(String prefix, String uri)
-            throws SAXException {
-        playCache();
-        delegate.startPrefixMapping(prefix, uri);
-    }
-
-    public void endPrefixMapping(String prefix) throws SAXException {
-        playCache();
-        delegate.endPrefixMapping(prefix);
-    }
-
-    public void startElement(String namespaceURI, String localName,
-            String qName, Attributes attrs) throws SAXException {
-        playCache();
-        this.currentElement = new StartElement(namespaceURI, localName, qName, attrs);
-    }
-
-    public void endElement(String namespaceURI, String localName, String qName)
-            throws SAXException {
-        playCache();
-        delegate.endElement(namespaceURI, localName, qName);
-    }
-
-    public void characters(char[] ch, int start, int length)
-            throws SAXException {
-        if (this.currentElement != null)
-            this.saxbits.add(new Characters(ch, start, length));
-        else
-            delegate.characters(ch, start, length);
-
-    }
-
-    public void ignorableWhitespace(char[] ch, int start, int length)
-            throws SAXException {
-        if (this.currentElement != null)
-            this.saxbits.add(new IgnorableWhitespace(ch, start, length));
-        else
-            delegate.ignorableWhitespace(ch, start, length);
-    }
-
-    public void processingInstruction(String target, String data)
-            throws SAXException {
-        playCache();
-        delegate.processingInstruction(target, data);
-    }
-
-    public void skippedEntity(String name) throws SAXException {
-        playCache();
-        delegate.skippedEntity(name);
-    }
-
-    public void startDTD(String name, String publicId, String systemId)
-            throws SAXException {
-        playCache();
-        delegate.startDTD(name, publicId, systemId);
-    }
-
-    public void endDTD() throws SAXException {
-        playCache();
-        delegate.endDTD();
-    }
-
-    public void startEntity(String name) throws SAXException {
-        playCache();
-        delegate.startEntity(name);
-    }
-
-    public void endEntity(String name) throws SAXException {
-        playCache();
-        delegate.endEntity(name);
-    }
-
-    public void startCDATA() throws SAXException {
-        playCache();
-        delegate.startCDATA();
-    }
-
-    public void endCDATA() throws SAXException {
-        playCache();
-        delegate.endCDATA();
-    }
-
-    public void comment(char[] ch, int start, int length) throws SAXException {
-        playCache();
-        delegate.comment(ch, start, length);
-    }
-
-    public void attribute(String uri, String localName, String qName,
-            String type, String value) throws SAXException {
-        if (this.currentElement == null)
-            throw new SAXParseException("attribute event not allowed here",
-                    this.locator);
-        else
-            this.currentElement.attribute(uri, localName, qName, type, value);
-    }
-
-    interface SaxBit {
-        public void send(ContentHandler contentHandler) throws SAXException;
-    }
-
-    private class StartElement implements SaxBit {
-        private String namespaceURI;
-        private String localName;
-        private String qName;
-        private AttributesImpl attrs;
-
-        public StartElement(String namespaceURI, String localName,
-                String qName, Attributes attrs) {
-            this.namespaceURI = namespaceURI;
-            this.localName = localName;
-            this.qName = qName;
-            this.attrs = new AttributesImpl(attrs);
-        }
-
-        public void send(ContentHandler contentHandler) throws SAXException {
-            contentHandler.startElement(this.namespaceURI, this.localName,
-                    this.qName, this.attrs);
-        }
-
-        public void attribute(String uri, String localName, String qName,
-                String type, String value) {
-            this.attrs.addAttribute(uri, localName, qName, type, value);
-        }
-    }
-
-    public final static class Characters implements SaxBit {
-        public final char[] ch;
-
-        public Characters(char[] ch, int start, int length) {
-            this.ch = new char[length];
-            System.arraycopy(ch, start, this.ch, 0, length);
-        }
-
-        public void send(ContentHandler contentHandler) throws SAXException {
-            contentHandler.characters(ch, 0, ch.length);
-        }
-    }
-
-    public final static class IgnorableWhitespace implements SaxBit {
-        public final char[] ch;
-
-        public IgnorableWhitespace(char[] ch, int start, int length) {
-            this.ch = new char[length];
-            System.arraycopy(ch, start, this.ch, 0, length);
-        }
-
-        public void send(ContentHandler contentHandler) throws SAXException {
-            contentHandler.ignorableWhitespace(ch, 0, ch.length);
-        }
-    }
-
-    public void playCache() throws SAXException {
-        if (this.currentElement != null) {
-            this.currentElement.send(delegate);
-            this.currentElement = null;
-        }
-
-        Iterator it = this.saxbits.iterator();
-        while (it.hasNext()) {
-            SaxBit saxBit = (SaxBit) it.next();
-            saxBit.send(delegate);
-        }
-        this.saxbits.clear();
-    }
-}
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.xml;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.AttributesImpl;
+
+public class AttributeAwareXMLConsumerImpl implements AttributeAwareXMLConsumer {
+    private StartElement currentElement;
+    private List saxbits;
+    private Locator locator;
+
+    private XMLConsumer delegate;
+
+    public AttributeAwareXMLConsumerImpl(XMLConsumer consumer) {
+        this.delegate = consumer;
+        this.saxbits = new ArrayList();
+    }
+
+    public void setDocumentLocator(Locator locator) {
+        this.locator = locator;
+        delegate.setDocumentLocator(locator);
+    }
+
+    public void startDocument() throws SAXException {
+        delegate.startDocument();
+    }
+
+    public void endDocument() throws SAXException {
+        playCache();
+        delegate.endDocument();
+    }
+
+    public void startPrefixMapping(String prefix, String uri)
+            throws SAXException {
+        playCache();
+        delegate.startPrefixMapping(prefix, uri);
+    }
+
+    public void endPrefixMapping(String prefix) throws SAXException {
+        playCache();
+        delegate.endPrefixMapping(prefix);
+    }
+
+    public void startElement(String namespaceURI, String localName,
+            String qName, Attributes attrs) throws SAXException {
+        playCache();
+        this.currentElement = new StartElement(namespaceURI, localName, qName, attrs);
+    }
+
+    public void endElement(String namespaceURI, String localName, String qName)
+            throws SAXException {
+        playCache();
+        delegate.endElement(namespaceURI, localName, qName);
+    }
+
+    public void characters(char[] ch, int start, int length)
+            throws SAXException {
+        if (this.currentElement != null)
+            this.saxbits.add(new Characters(ch, start, length));
+        else
+            delegate.characters(ch, start, length);
+
+    }
+
+    public void ignorableWhitespace(char[] ch, int start, int length)
+            throws SAXException {
+        if (this.currentElement != null)
+            this.saxbits.add(new IgnorableWhitespace(ch, start, length));
+        else
+            delegate.ignorableWhitespace(ch, start, length);
+    }
+
+    public void processingInstruction(String target, String data)
+            throws SAXException {
+        playCache();
+        delegate.processingInstruction(target, data);
+    }
+
+    public void skippedEntity(String name) throws SAXException {
+        playCache();
+        delegate.skippedEntity(name);
+    }
+
+    public void startDTD(String name, String publicId, String systemId)
+            throws SAXException {
+        playCache();
+        delegate.startDTD(name, publicId, systemId);
+    }
+
+    public void endDTD() throws SAXException {
+        playCache();
+        delegate.endDTD();
+    }
+
+    public void startEntity(String name) throws SAXException {
+        playCache();
+        delegate.startEntity(name);
+    }
+
+    public void endEntity(String name) throws SAXException {
+        playCache();
+        delegate.endEntity(name);
+    }
+
+    public void startCDATA() throws SAXException {
+        playCache();
+        delegate.startCDATA();
+    }
+
+    public void endCDATA() throws SAXException {
+        playCache();
+        delegate.endCDATA();
+    }
+
+    public void comment(char[] ch, int start, int length) throws SAXException {
+        playCache();
+        delegate.comment(ch, start, length);
+    }
+
+    public void attribute(String uri, String localName, String qName,
+            String type, String value) throws SAXException {
+        if (this.currentElement == null)
+            throw new SAXParseException("attribute event not allowed here",
+                    this.locator);
+        else
+            this.currentElement.attribute(uri, localName, qName, type, value);
+    }
+
+    interface SaxBit {
+        public void send(ContentHandler contentHandler) throws SAXException;
+    }
+
+    private class StartElement implements SaxBit {
+        private String namespaceURI;
+        private String localName;
+        private String qName;
+        private AttributesImpl attrs;
+
+        public StartElement(String namespaceURI, String localName,
+                String qName, Attributes attrs) {
+            this.namespaceURI = namespaceURI;
+            this.localName = localName;
+            this.qName = qName;
+            this.attrs = new AttributesImpl(attrs);
+        }
+
+        public void send(ContentHandler contentHandler) throws SAXException {
+            contentHandler.startElement(this.namespaceURI, this.localName,
+                    this.qName, this.attrs);
+        }
+
+        public void attribute(String uri, String localName, String qName,
+                String type, String value) {
+            this.attrs.addAttribute(uri, localName, qName, type, value);
+        }
+    }
+
+    public final static class Characters implements SaxBit {
+        public final char[] ch;
+
+        public Characters(char[] ch, int start, int length) {
+            this.ch = new char[length];
+            System.arraycopy(ch, start, this.ch, 0, length);
+        }
+
+        public void send(ContentHandler contentHandler) throws SAXException {
+            contentHandler.characters(ch, 0, ch.length);
+        }
+    }
+
+    public final static class IgnorableWhitespace implements SaxBit {
+        public final char[] ch;
+
+        public IgnorableWhitespace(char[] ch, int start, int length) {
+            this.ch = new char[length];
+            System.arraycopy(ch, start, this.ch, 0, length);
+        }
+
+        public void send(ContentHandler contentHandler) throws SAXException {
+            contentHandler.ignorableWhitespace(ch, 0, ch.length);
+        }
+    }
+
+    public void playCache() throws SAXException {
+        if (this.currentElement != null) {
+            this.currentElement.send(delegate);
+            this.currentElement = null;
+        }
+
+        Iterator it = this.saxbits.iterator();
+        while (it.hasNext()) {
+            SaxBit saxBit = (SaxBit) it.next();
+            saxBit.send(delegate);
+        }
+        this.saxbits.clear();
+    }
+}

Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumerImpl.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxAttribute-output.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxAttribute-output.xml?view=diff&r1=161892&r2=161893
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxAttribute-output.xml (original)
+++ cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxAttribute-output.xml Tue Apr 19 07:15:05 2005
@@ -1,11 +1,11 @@
-<?xml version="1.0"?>
-<root xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-	<one foo="bar">
-	</one>
-	<two second="twoAttr">
-	  xyz
-	</two>
-	<three foo="bar" foo2="bar2" dd="dd">
-	  <abc>def</abc>
-	</three>
-</root>
+<?xml version="1.0"?>
+<root xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+	<one foo="bar">
+	</one>
+	<two second="twoAttr">
+	  xyz
+	</two>
+	<three foo="bar" foo2="bar2" dd="dd">
+	  <abc>def</abc>
+	</three>
+</root>

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxAttribute-output.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxAttribute-output.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxAttribute.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxAttribute.xml?view=diff&r1=161892&r2=161893
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxAttribute.xml (original)
+++ cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxAttribute.xml Tue Apr 19 07:15:05 2005
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
-<root xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-    <one>
-        <jx:attribute name="foo" value="bar"/>
-    </one>
-    <jx:set var="a" value="dd"/>
-    <two>
-        <jx:if test="${a == 'dd'}">
-            <jx:attribute name="second" value="twoAttr"/>
-        </jx:if> xyz </two>
-    <three foo="bar">
-        <jx:attribute name="foo2" value="bar2"/>
-        <jx:attribute name="${a}" value="${a}"/>
-        <abc>def</abc>
-    </three>
-</root>
+<?xml version="1.0"?>
+<root xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+    <one>
+        <jx:attribute name="foo" value="bar"/>
+    </one>
+    <jx:set var="a" value="dd"/>
+    <two>
+        <jx:if test="${a == 'dd'}">
+            <jx:attribute name="second" value="twoAttr"/>
+        </jx:if> xyz </two>
+    <three foo="bar">
+        <jx:attribute name="foo2" value="bar2"/>
+        <jx:attribute name="${a}" value="${a}"/>
+        <abc>def</abc>
+    </three>
+</root>

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxAttribute.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxAttribute.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxDynamicMacro-output.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxDynamicMacro-output.xml?view=diff&r1=161892&r2=161893
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxDynamicMacro-output.xml (original)
+++ cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxDynamicMacro-output.xml Tue Apr 19 07:15:05 2005
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
-
-<root>
-
-  <p>I'm about to invoke a dynamic tag:</p>
-  <em>This tag was invoked dynamically</em>
-
-</root>
+<?xml version="1.0"?>
+
+<root>
+
+  <p>I'm about to invoke a dynamic tag:</p>
+  <em>This tag was invoked dynamically</em>
+
+</root>

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxDynamicMacro-output.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxDynamicMacro-output.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxDynamicMacro.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxDynamicMacro.xml?view=diff&r1=161892&r2=161893
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxDynamicMacro.xml (original)
+++ cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxDynamicMacro.xml Tue Apr 19 07:15:05 2005
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
-
-<root xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-
-  <jx:set var="tags" value="${java.util.HashMap()}"/>
-
-  <jx:macro name="dynamic-tag">
-    <jx:parameter name="id"/>
-    <jx:set var="ignored" value="${tags.put(id, macro.body)}"/>
-  </jx:macro>
-
-  <dynamic-tag id="example">
-    <em>This tag was invoked dynamically</em>
-  </dynamic-tag>
-
-  <p>I'm about to invoke a dynamic tag:</p>
-  <jx:eval select="${tags.example}"/> 
-
-</root>
+<?xml version="1.0"?>
+
+<root xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+
+  <jx:set var="tags" value="${java.util.HashMap()}"/>
+
+  <jx:macro name="dynamic-tag">
+    <jx:parameter name="id"/>
+    <jx:set var="ignored" value="${tags.put(id, macro.body)}"/>
+  </jx:macro>
+
+  <dynamic-tag id="example">
+    <em>This tag was invoked dynamically</em>
+  </dynamic-tag>
+
+  <p>I'm about to invoke a dynamic tag:</p>
+  <jx:eval select="${tags.example}"/> 
+
+</root>

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxDynamicMacro.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxDynamicMacro.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxForEach-output.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxForEach-output.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxForEach.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxForEach.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxMacro-output.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxMacro-output.xml?view=diff&r1=161892&r2=161893
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxMacro-output.xml (original)
+++ cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxMacro-output.xml Tue Apr 19 07:15:05 2005
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
-<root>
-	<m>
-		<macroTest a="foo">
-			<content b="3"/>
-		</macroTest>
-	</m>
-	<n>
-		<macroTest a="bar">
-			<content b="5"/>
-		</macroTest>
-	</n>
-</root>
+<?xml version="1.0"?>
+<root>
+	<m>
+		<macroTest a="foo">
+			<content b="3"/>
+		</macroTest>
+	</m>
+	<n>
+		<macroTest a="bar">
+			<content b="5"/>
+		</macroTest>
+	</n>
+</root>

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxMacro-output.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxMacro-output.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxMacro.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxMacro.xml?view=diff&r1=161892&r2=161893
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxMacro.xml (original)
+++ cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxMacro.xml Tue Apr 19 07:15:05 2005
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
-<root xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-	<jx:macro name="d">
-		<jx:parameter name="p"/>
-		<macroTest a="${p}">
-			<jx:evalBody/>
-		</macroTest>
-	</jx:macro>
-	<m>
-		<d p="foo">
-			<content b="${1+2}"/>
-		</d>
-	</m>
-	<n>
-		<jx:set var="macroName" value="d"/>
-		<jx:call macro="${macroName}">
-			<jx:withParam name="p" value="bar"/>
-			<content b="${2+3}"/>
-		</jx:call>
-	</n>
-</root>
+<?xml version="1.0"?>
+<root xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+	<jx:macro name="d">
+		<jx:parameter name="p"/>
+		<macroTest a="${p}">
+			<jx:evalBody/>
+		</macroTest>
+	</jx:macro>
+	<m>
+		<d p="foo">
+			<content b="${1+2}"/>
+		</d>
+	</m>
+	<n>
+		<jx:set var="macroName" value="d"/>
+		<jx:call macro="${macroName}">
+			<jx:withParam name="p" value="bar"/>
+			<content b="${2+3}"/>
+		</jx:call>
+	</n>
+</root>

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxMacro.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxMacro.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxSet-output.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxSet-output.xml?view=diff&r1=161892&r2=161893
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxSet-output.xml (original)
+++ cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxSet-output.xml Tue Apr 19 07:15:05 2005
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
-
-<root>
-
-  <test1>
-    foo
-  </test1>
-
-  <test2>
-    bar
-  </test2>
-
-</root>
+<?xml version="1.0"?>
+
+<root>
+
+  <test1>
+    foo
+  </test1>
+
+  <test2>
+    bar
+  </test2>
+
+</root>

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxSet-output.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxSet-output.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxSet.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxSet.xml?view=diff&r1=161892&r2=161893
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxSet.xml (original)
+++ cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxSet.xml Tue Apr 19 07:15:05 2005
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
-
-<root xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-
-  <test1>
-    <jx:set var="var1" value="foo"/>
-    <jx:out value="${var1}"/>
-  </test1>
-
-  <test2>
-    <jx:set var="map" value="${java.util.HashMap()}"/>
-    <jx:set var="ignored" value="${map.put('foo', 'bar')}"/>
-    <jx:out value="${map.foo}"/>
-  </test2>
-
-</root>
+<?xml version="1.0"?>
+
+<root xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+
+  <test1>
+    <jx:set var="var1" value="foo"/>
+    <jx:out value="${var1}"/>
+  </test1>
+
+  <test2>
+    <jx:set var="map" value="${java.util.HashMap()}"/>
+    <jx:set var="ignored" value="${map.put('foo', 'bar')}"/>
+    <jx:out value="${map.foo}"/>
+  </test2>
+
+</root>

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxSet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/jxSet.xml
------------------------------------------------------------------------------
    svn:keywords = Id