cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lgaw...@apache.org
Subject svn commit: r169630 [2/2] - in /cocoon/blocks/unsupported/template/trunk: WEB-INF/xconf/ java/org/apache/cocoon/template/jxtg/instruction/ java/org/apache/cocoon/template/jxtg/script/ test/org/apache/cocoon/template/jxtg/
Date Wed, 11 May 2005 11:51:21 GMT
Added: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Out.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Out.java?rev=169630&view=auto
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Out.java
(added)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Out.java
Wed May 11 04:51:20 2005
@@ -0,0 +1,71 @@
+/*
+ * Copyright 1999-2005 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.template.jxtg.instruction;
+
+import java.util.Stack;
+
+import org.apache.cocoon.components.expression.ExpressionContext;
+import org.apache.cocoon.template.jxtg.environment.ExecutionContext;
+import org.apache.cocoon.template.jxtg.expression.JXTExpression;
+import org.apache.cocoon.template.jxtg.script.Invoker;
+import org.apache.cocoon.template.jxtg.script.event.Event;
+import org.apache.cocoon.template.jxtg.script.event.StartElement;
+import org.apache.cocoon.xml.XMLConsumer;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+/**
+ * @version SVN $Id$
+ */
+public class Out extends Instruction {
+    private final JXTExpression compiledExpression;
+
+    public Out(StartElement raw, Attributes attrs, Stack stack)
+        throws SAXException {
+
+        super(raw);
+        Locator locator = getLocation();
+        String value = attrs.getValue("value");
+        if (value != null) {
+            this.compiledExpression =
+                JXTExpression.compileExpr(value, "out: \"value\": ", locator);
+            String lenientValue = attrs.getValue("lenient");
+            Boolean lenient = lenientValue == null ? null : Boolean.valueOf(lenientValue);
+
+            // Why can out be lenient?
+            if ( lenient != null)
+                this.compiledExpression.setLenient(lenient);
+        } else {
+            throw new SAXParseException("out: \"value\" is required", locator, null);
+        }
+    }
+
+    public Event execute(final XMLConsumer consumer,
+                         ExpressionContext expressionContext, ExecutionContext executionContext,
+                         MacroContext macroContext, Event startEvent, Event endEvent) 
+        throws SAXException {
+        Object val;
+        try {
+            val = this.compiledExpression.getNode(expressionContext);
+            Invoker.executeNode(consumer, val);
+        } catch (Exception e) {
+            throw new SAXParseException(e.getMessage(), getLocation(), e);
+        }
+        return getNext();
+    }
+}

Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Out.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Out.java
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Parameter.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Parameter.java?rev=169630&view=auto
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Parameter.java
(added)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Parameter.java
Wed May 11 04:51:20 2005
@@ -0,0 +1,55 @@
+/*
+ * Copyright 1999-2005 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.template.jxtg.instruction;
+
+import java.util.Stack;
+
+import org.apache.cocoon.template.jxtg.script.event.StartElement;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+/**
+ * @version SVN $Id$
+ */
+public class Parameter extends Instruction {
+    final String name;
+    final String optional;
+    private final String defaultValue;
+
+    public Parameter(StartElement raw, Attributes attrs, Stack stack) 
+        throws SAXException {
+
+        super(raw);
+
+        Locator locator = getLocation();
+        if (stack.size() == 0 || !(stack.peek() instanceof Define)) {
+            throw new SAXParseException("<parameter> not allowed here", locator, null);
+        } else {
+            this.name = attrs.getValue("name");
+            this.optional = attrs.getValue("optional");
+            this.defaultValue = attrs.getValue("default");
+            if (this.name == null) {
+                throw new SAXParseException("parameter: \"name\" is required", locator, null);
+            }
+        }
+    }
+
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+}

Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Parameter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Parameter.java
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/ParameterInstance.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/ParameterInstance.java?rev=169630&view=auto
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/ParameterInstance.java
(added)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/ParameterInstance.java
Wed May 11 04:51:20 2005
@@ -0,0 +1,109 @@
+/*
+ * Copyright 1999-2005 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.template.jxtg.instruction;
+
+import java.util.Stack;
+
+import org.apache.cocoon.components.expression.ExpressionContext;
+import org.apache.cocoon.template.jxtg.environment.ErrorHolder;
+import org.apache.cocoon.template.jxtg.expression.JXTExpression;
+import org.apache.cocoon.template.jxtg.script.event.AttributeEvent;
+import org.apache.cocoon.template.jxtg.script.event.CopyAttribute;
+import org.apache.cocoon.template.jxtg.script.event.StartElement;
+import org.apache.cocoon.template.jxtg.script.event.SubstituteAttribute;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+/**
+ * @version SVN $Id$
+ */
+public class ParameterInstance extends Instruction {
+    final String name;
+    private final Object value;
+
+    public ParameterInstance(StartElement raw, Attributes attrs,
+            Stack stack) throws SAXException {
+        super(raw);
+        Locator locator = getLocation();
+        if (stack.size() == 0 || !(stack.peek() instanceof Call)) {
+            throw new SAXParseException("<parameter> not allowed here",
+                    locator, null);
+        } else {
+            this.name = attrs.getValue("name");
+            if (this.name == null) {
+                throw new SAXParseException("parameter: \"name\" is required",
+                        locator, null);
+            }
+
+            String val = attrs.getValue("value");
+            if (val == null)
+                throw new SAXParseException("parameter: \"value\" is required",
+                        locator, null);
+
+            this.value = JXTExpression.compileExpr(val,
+                    "parameter: \"value\": ", locator);
+        }
+    }
+
+    public ParameterInstance(AttributeEvent event) {
+        super((Locator) null);
+        this.name = event.getLocalName();
+        this.value = event;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Object getValue(ExpressionContext expressionContext)
+            throws SAXException {
+        if (this.value instanceof JXTExpression)
+            return getExpressionValue((JXTExpression) this.value,
+                    expressionContext);
+        else if (this.value instanceof CopyAttribute) {
+            CopyAttribute copy = (CopyAttribute) this.value;
+            return copy.getValue();
+        } else if (this.value instanceof SubstituteAttribute) {
+            SubstituteAttribute substEvent = (SubstituteAttribute) this.value;
+            if (substEvent.getSubstitutions().size() == 1
+                    && substEvent.getSubstitutions().get(0) instanceof JXTExpression)
+                return getExpressionValue((JXTExpression) substEvent
+                        .getSubstitutions().get(0), expressionContext);
+            else
+                return substEvent.getSubstitutions().toString(getLocation(),
+                        expressionContext);
+
+        } else {
+            throw new Error("this shouldn't have happened");
+        }
+    }
+
+    private Object getExpressionValue(JXTExpression expr,
+            ExpressionContext expressionContext) throws SAXException {
+        Object val;
+        try {
+            val = expr.getNode(expressionContext);
+        } catch (Exception e) {
+            throw new SAXParseException(e.getMessage(), getLocation(), e);
+        } catch (Error err) {
+            throw new SAXParseException(err.getMessage(), getLocation(),
+                    new ErrorHolder(err));
+        }
+        return val != null ? val : "";
+    }
+}

Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/ParameterInstance.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/ParameterInstance.java
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Set.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Set.java?rev=169630&view=auto
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Set.java
(added)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Set.java
Wed May 11 04:51:20 2005
@@ -0,0 +1,97 @@
+/*
+ * Copyright 1999-2005 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.template.jxtg.instruction;
+
+import java.util.Stack;
+
+import org.apache.cocoon.components.expression.ExpressionContext;
+import org.apache.cocoon.template.jxtg.environment.ExecutionContext;
+import org.apache.cocoon.template.jxtg.expression.JXTExpression;
+import org.apache.cocoon.template.jxtg.script.Invoker;
+import org.apache.cocoon.template.jxtg.script.event.Event;
+import org.apache.cocoon.template.jxtg.script.event.StartElement;
+import org.apache.cocoon.xml.XMLConsumer;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+/**
+ * @version SVN $Id$
+ */
+public class Set extends Instruction {
+
+    private final JXTExpression var;
+    private final JXTExpression value;
+
+    public Set(StartElement raw, Attributes attrs, Stack stack)
+        throws SAXException {
+
+        super(raw);
+
+        Locator locator = getLocation();
+        String var = attrs.getValue("var");
+        String value = attrs.getValue("value");
+        JXTExpression varExpr = null;
+        JXTExpression valueExpr = null;
+        if (var != null) {
+            varExpr = JXTExpression.compileExpr(var, "set: \"var\":", locator);
+        }
+        if (value != null) {
+            valueExpr = JXTExpression.compileExpr(value, "set: \"value\":", locator);
+        }
+        this.var = varExpr;
+        this.value = valueExpr;
+    }
+
+    public Event execute(final XMLConsumer consumer,
+                         ExpressionContext expressionContext, ExecutionContext executionContext,
+                         MacroContext macroContext, Event startEvent, Event endEvent) 
+        throws SAXException {
+
+        Object value = null;
+        String var = null;
+        try {
+            if (this.var != null) {
+                var = this.var.getStringValue(expressionContext);
+            }
+            if (this.value != null) {
+                value = this.value.getNode(expressionContext);
+            }
+        } catch (Exception exc) {
+            throw new SAXParseException(exc.getMessage(), getLocation(), exc);
+        }
+        if (value == null) {
+            NodeList nodeList =
+                Invoker.toDOMNodeList("set", this,
+                                      expressionContext, executionContext,
+                                      macroContext);
+            // JXPath doesn't handle NodeList, so convert it to an array
+            int len = nodeList.getLength();
+            Node[] nodeArr = new Node[len];
+            for (int i = 0; i < len; i++) {
+                nodeArr[i] = nodeList.item(i);
+            }
+            value = nodeArr;
+        }
+        if (var != null) {
+            expressionContext.put(var, value);
+        }
+        return getEndInstruction().getNext();
+    }
+}

Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Set.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Set.java
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Template.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Template.java?rev=169630&view=auto
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Template.java
(added)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Template.java
Wed May 11 04:51:20 2005
@@ -0,0 +1,43 @@
+/*
+ * Copyright 1999-2005 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.template.jxtg.instruction;
+
+import java.util.Stack;
+
+import org.apache.cocoon.components.expression.ExpressionContext;
+import org.apache.cocoon.template.jxtg.environment.ExecutionContext;
+import org.apache.cocoon.template.jxtg.script.event.Event;
+import org.apache.cocoon.template.jxtg.script.event.StartElement;
+import org.apache.cocoon.xml.XMLConsumer;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * @version SVN $Id$
+ */
+public class Template extends Instruction {
+    public Template(StartElement raw, Attributes attrs, Stack stack) {
+        super(raw);
+    }
+
+    public Event execute(final XMLConsumer consumer,
+                         ExpressionContext expressionContext, ExecutionContext executionContext,
+                         MacroContext macroContext, Event startEvent, Event endEvent) 
+        throws SAXException {
+        // EMPTY
+        return getNext();
+    }
+}

Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Template.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/Template.java
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/When.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/When.java?rev=169630&view=auto
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/When.java
(added)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/When.java
Wed May 11 04:51:20 2005
@@ -0,0 +1,76 @@
+/*
+ * Copyright 1999-2005 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.template.jxtg.instruction;
+
+import java.util.Stack;
+
+import org.apache.cocoon.template.jxtg.expression.JXTExpression;
+import org.apache.cocoon.template.jxtg.script.event.StartElement;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+/**
+ * @version SVN $Id$
+ */
+public class When extends Instruction {
+    private final JXTExpression test;
+    private When nextChoice;
+
+    public When(StartElement raw, Attributes attrs, Stack stack) 
+        throws SAXException {
+
+        super(raw);
+
+        Locator locator = getLocation();
+
+        if (stack.size() == 0 || !(stack.peek() instanceof Choose)) {
+            throw new SAXParseException("<when> must be within <choose>", locator,
null);
+        }
+        String test = attrs.getValue("test");
+        if (test != null) {
+            this.test = JXTExpression.compileExpr(test, "when: \"test\": ", locator);
+            // Why is test lenient?
+            this.test.setLenient(Boolean.TRUE);
+            
+            Choose startChoose = (Choose) stack.peek();
+            if (startChoose.getFirstChoice() != null) {
+                When w = startChoose.getFirstChoice();
+                while (w.getNextChoice() != null) {
+                    w = w.getNextChoice();
+                }
+                w.setNextChoice(this);
+            } else {
+                startChoose.setFirstChoice(this);
+            }
+        } else {
+            throw new SAXParseException("when: \"test\" is required", locator, null);
+        }
+    }
+
+    public JXTExpression getTest() {
+        return test;
+    }
+
+    public void setNextChoice(When nextChoice) {
+        this.nextChoice = nextChoice;
+    }
+
+    public When getNextChoice() {
+        return nextChoice;
+    }
+}

Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/When.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/When.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/Invoker.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/Invoker.java?rev=169630&r1=169629&r2=169630&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/Invoker.java
(original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/Invoker.java
Wed May 11 04:51:20 2005
@@ -20,8 +20,8 @@
 import org.apache.cocoon.template.jxtg.environment.ExecutionContext;
 import org.apache.cocoon.template.jxtg.environment.LocatorFacade;
 import org.apache.cocoon.template.jxtg.instruction.MacroContext;
-import org.apache.cocoon.template.jxtg.instruction.StartCall;
-import org.apache.cocoon.template.jxtg.instruction.StartDefine;
+import org.apache.cocoon.template.jxtg.instruction.Call;
+import org.apache.cocoon.template.jxtg.instruction.Define;
 import org.apache.cocoon.template.jxtg.instruction.Instruction;
 import org.apache.cocoon.template.jxtg.script.event.Event;
 import org.apache.cocoon.template.jxtg.script.event.StartElement;
@@ -57,7 +57,7 @@
             // ContentHandler methods
             if (ev instanceof StartElement) {
                 StartElement startElement = (StartElement) ev;
-                StartDefine def = (StartDefine) executionContext
+                Define def = (Define) executionContext
                         .getDefinitions().get(startElement.getQname());
                 if (def == null) {
                     ev = ev.execute(consumer, expressionContext,
@@ -65,7 +65,7 @@
                     continue;
                 }
 
-                StartCall call = new StartCall( def, startElement );
+                Call call = new Call( def, startElement );
                 ev = call.execute(consumer, expressionContext,
                         executionContext, macroContext, startEvent, endEvent);
             } else

Modified: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.xtest
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.xtest?rev=169630&r1=169629&r2=169630&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.xtest
(original)
+++ cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.xtest
Wed May 11 04:51:20 2005
@@ -35,25 +35,25 @@
         <component role="org.apache.cocoon.template.jxtg.script.ScriptManager" class="org.apache.cocoon.template.jxtg.script.DefaultScriptManager"/>
         <component role="org.apache.cocoon.template.jxtg.script.InstructionFactory" class="org.apache.cocoon.template.jxtg.script.DefaultInstructionFactory">
             <instructions targetNamespace="http://apache.org/cocoon/templates/jx/1.0">
-                <instruction name="template" class="org.apache.cocoon.template.jxtg.instruction.StartTemplate"/>
-                <instruction name="forEach" class="org.apache.cocoon.template.jxtg.instruction.StartForEach"/>
-                <instruction name="if" class="org.apache.cocoon.template.jxtg.instruction.StartIf"/>
-                <instruction name="choose" class="org.apache.cocoon.template.jxtg.instruction.StartChoose"/>
-                <instruction name="when" class="org.apache.cocoon.template.jxtg.instruction.StartWhen"/>
-                <instruction name="otherwise" class="org.apache.cocoon.template.jxtg.instruction.StartOtherwise"/>
-                <instruction name="out" class="org.apache.cocoon.template.jxtg.instruction.StartOut"/>
-                <instruction name="import" class="org.apache.cocoon.template.jxtg.instruction.StartImport"/>
-                <instruction name="set" class="org.apache.cocoon.template.jxtg.instruction.StartSet"/>
-                <instruction name="macro" class="org.apache.cocoon.template.jxtg.instruction.StartDefine"/>
-                <instruction name="evalBody" class="org.apache.cocoon.template.jxtg.instruction.StartEvalBody"/>
-                <instruction name="eval" class="org.apache.cocoon.template.jxtg.instruction.StartEval"/>
-                <instruction name="parameter" class="org.apache.cocoon.template.jxtg.instruction.StartParameter"/>
-                <instruction name="formatNumber" class="org.apache.cocoon.template.jxtg.instruction.StartFormatNumber"/>
-                <instruction name="formatDate" class="org.apache.cocoon.template.jxtg.instruction.StartFormatDate"/>
-                <instruction name="comment" class="org.apache.cocoon.template.jxtg.instruction.StartComment"/>
-                <instruction name="call" class="org.apache.cocoon.template.jxtg.instruction.StartCall"/>
-                <instruction name="withParam" class="org.apache.cocoon.template.jxtg.instruction.StartParameterInstance"/>
-                <instruction name="attribute" class="org.apache.cocoon.template.jxtg.instruction.StartAttribute"/>
+                <instruction name="template" class="org.apache.cocoon.template.jxtg.instruction.Template"/>
+                <instruction name="forEach" class="org.apache.cocoon.template.jxtg.instruction.ForEach"/>
+                <instruction name="if" class="org.apache.cocoon.template.jxtg.instruction.If"/>
+                <instruction name="choose" class="org.apache.cocoon.template.jxtg.instruction.Choose"/>
+                <instruction name="when" class="org.apache.cocoon.template.jxtg.instruction.When"/>
+                <instruction name="otherwise" class="org.apache.cocoon.template.jxtg.instruction.Otherwise"/>
+                <instruction name="out" class="org.apache.cocoon.template.jxtg.instruction.Out"/>
+                <instruction name="import" class="org.apache.cocoon.template.jxtg.instruction.Import"/>
+                <instruction name="set" class="org.apache.cocoon.template.jxtg.instruction.Set"/>
+                <instruction name="macro" class="org.apache.cocoon.template.jxtg.instruction.Define"/>
+                <instruction name="evalBody" class="org.apache.cocoon.template.jxtg.instruction.EvalBody"/>
+                <instruction name="eval" class="org.apache.cocoon.template.jxtg.instruction.Eval"/>
+                <instruction name="parameter" class="org.apache.cocoon.template.jxtg.instruction.Parameter"/>
+                <instruction name="formatNumber" class="org.apache.cocoon.template.jxtg.instruction.FormatNumber"/>
+                <instruction name="formatDate" class="org.apache.cocoon.template.jxtg.instruction.FormatDate"/>
+                <instruction name="comment" class="org.apache.cocoon.template.jxtg.instruction.Comment"/>
+                <instruction name="call" class="org.apache.cocoon.template.jxtg.instruction.Call"/>
+                <instruction name="withParam" class="org.apache.cocoon.template.jxtg.instruction.ParameterInstance"/>
+                <instruction name="attribute" class="org.apache.cocoon.template.jxtg.instruction.Attribute"/>
             </instructions>
         </component>
     </components>



Mime
View raw message