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/23 22:44:14 UTC
svn commit: r164419 [2/3] - in /cocoon/blocks/unsupported/template/trunk:
conf/ java/org/apache/cocoon/components/accessor/
java/org/apache/cocoon/components/expression/
java/org/apache/cocoon/components/expression/jexl/
java/org/apache/cocoon/components/expression/jxpath/
java/org/apache/cocoon/environment/ java/org/apache/cocoon/generation/
java/org/apache/cocoon/template/jxtg/
java/org/apache/cocoon/template/jxtg/environment/
java/org/apache/cocoon/template/jxtg/expression/
java/org/apache/cocoon/template/jxtg/instruction/
java/org/apache/cocoon/template/jxtg/script/
java/org/apache/cocoon/template/jxtg/script/event/
java/org/apache/cocoon/transformation/ java/org/apache/cocoon/xml/
test/org/apache/cocoon/components/accessor/
test/org/apache/cocoon/components/expression/
test/org/apache/cocoon/components/expression/jexl/
test/org/apache/cocoon/components/expression/jxpath/
test/org/apache/cocoon/environment/ test/org/apache/cocoon/template/jxtg/
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Substitutions.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Substitutions.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Substitutions.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Substitutions.java Sat Apr 23 13:44:12 2005
@@ -1,161 +1,164 @@
-/*
- * 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.template.jxtg.expression;
-
-import java.io.CharArrayReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.cocoon.components.expression.ExpressionContext;
-import org.apache.cocoon.template.jxtg.environment.ErrorHolder;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-public class Substitutions {
-
- final private List substitutions;
- final private boolean hasSubstitutions;
-
- public Substitutions(Locator location, String stringTemplate) throws SAXException {
- this(location, new StringReader(stringTemplate));
- }
-
- public Substitutions(Locator location, char[] chars, int start, int length)
- throws SAXException {
- this(location, new CharArrayReader(chars, start, length));
- }
-
- private Substitutions(Locator location, Reader in) throws SAXException {
- LinkedList substitutions = new LinkedList();
- StringBuffer buf = new StringBuffer();
- buf.setLength(0);
- int ch;
- boolean inExpr = false;
- boolean xpath = false;
- try {
- top:
- while ((ch = in.read()) != -1) {
- // column++;
- char c = (char) ch;
- processChar:
- while (true) {
- if (inExpr) {
- if (c == '\\') {
- ch = in.read();
- buf.append(ch == -1 ? '\\' : (char) ch);
- } else if (c == '}') {
- String str = buf.toString();
- JXTExpression compiledExpression;
- try {
- compiledExpression = JXTExpression.compile(str, xpath);
- } catch (Exception exc) {
- throw new SAXParseException(exc.getMessage(),
- location, exc);
- } catch (Error err) {
- throw new SAXParseException(err.getMessage(),
- location,
- new ErrorHolder(err));
- }
- substitutions.add(compiledExpression);
- buf.setLength(0);
- inExpr = false;
- } else {
- buf.append(c);
- }
- } else if (c == '$' || c == '#') {
- ch = in.read();
- if (ch == '{') {
- xpath = c == '#';
- inExpr = true;
- if (buf.length() > 0) {
- substitutions.add(new Literal(buf.toString()));
- buf.setLength(0);
- }
- continue top;
- }
- buf.append(c);
- if (ch != -1) {
- c = (char) ch;
- continue processChar;
- }
- } else {
- buf.append(c);
- }
- break;
- }
- }
- } catch (IOException ignored) {
- // won't happen
- ignored.printStackTrace();
- }
- if (inExpr) {
- // unclosed #{} or ${}
- String msg = "Unterminated " + (xpath ? "#" : "$") + "{";
- throw new SAXParseException(msg, location, null);
- }
- substitutions.add(new Literal(buf.toString()));
-
- this.substitutions = substitutions;
- this.hasSubstitutions = !substitutions.isEmpty();
- }
-
- public boolean hasSubstitutions() {
- return this.hasSubstitutions;
- }
-
- public Iterator iterator() {
- return this.substitutions.iterator();
- }
-
- public int size() {
- return this.substitutions.size();
- }
-
- public Object get(int pos) {
- return this.substitutions.get(pos);
- }
-
- public String toString(Locator location, ExpressionContext expressionContext)
- throws SAXException {
- StringBuffer buf = new StringBuffer();
- Iterator iterSubst = iterator();
- while (iterSubst.hasNext()) {
- Subst subst = (Subst) iterSubst.next();
- if (subst instanceof Literal) {
- Literal lit = (Literal) subst;
- buf.append(lit.getValue());
- } else if (subst instanceof JXTExpression) {
- JXTExpression expr = (JXTExpression) subst;
- Object val;
- try {
- val = expr.getValue(expressionContext);
- } catch (Exception e) {
- throw new SAXParseException(e.getMessage(), location, e);
- } catch (Error err) {
- throw new SAXParseException(err.getMessage(), location,
- new ErrorHolder(err));
- }
- buf.append(val != null ? val.toString() : "");
- }
- }
- return buf.toString();
- }
-}
+/*
+ * 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.template.jxtg.expression;
+
+import java.io.CharArrayReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.cocoon.components.expression.ExpressionContext;
+import org.apache.cocoon.template.jxtg.environment.ErrorHolder;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+/**
+ * @version SVN $Id$
+ */
+public class Substitutions {
+
+ final private List substitutions;
+ final private boolean hasSubstitutions;
+
+ public Substitutions(Locator location, String stringTemplate) throws SAXException {
+ this(location, new StringReader(stringTemplate));
+ }
+
+ public Substitutions(Locator location, char[] chars, int start, int length)
+ throws SAXException {
+ this(location, new CharArrayReader(chars, start, length));
+ }
+
+ private Substitutions(Locator location, Reader in) throws SAXException {
+ LinkedList substitutions = new LinkedList();
+ StringBuffer buf = new StringBuffer();
+ buf.setLength(0);
+ int ch;
+ boolean inExpr = false;
+ boolean xpath = false;
+ try {
+ top:
+ while ((ch = in.read()) != -1) {
+ // column++;
+ char c = (char) ch;
+ processChar:
+ while (true) {
+ if (inExpr) {
+ if (c == '\\') {
+ ch = in.read();
+ buf.append(ch == -1 ? '\\' : (char) ch);
+ } else if (c == '}') {
+ String str = buf.toString();
+ JXTExpression compiledExpression;
+ try {
+ compiledExpression = JXTExpression.compile(str, xpath);
+ } catch (Exception exc) {
+ throw new SAXParseException(exc.getMessage(),
+ location, exc);
+ } catch (Error err) {
+ throw new SAXParseException(err.getMessage(),
+ location,
+ new ErrorHolder(err));
+ }
+ substitutions.add(compiledExpression);
+ buf.setLength(0);
+ inExpr = false;
+ } else {
+ buf.append(c);
+ }
+ } else if (c == '$' || c == '#') {
+ ch = in.read();
+ if (ch == '{') {
+ xpath = c == '#';
+ inExpr = true;
+ if (buf.length() > 0) {
+ substitutions.add(new Literal(buf.toString()));
+ buf.setLength(0);
+ }
+ continue top;
+ }
+ buf.append(c);
+ if (ch != -1) {
+ c = (char) ch;
+ continue processChar;
+ }
+ } else {
+ buf.append(c);
+ }
+ break;
+ }
+ }
+ } catch (IOException ignored) {
+ // won't happen
+ ignored.printStackTrace();
+ }
+ if (inExpr) {
+ // unclosed #{} or ${}
+ String msg = "Unterminated " + (xpath ? "#" : "$") + "{";
+ throw new SAXParseException(msg, location, null);
+ }
+ substitutions.add(new Literal(buf.toString()));
+
+ this.substitutions = substitutions;
+ this.hasSubstitutions = !substitutions.isEmpty();
+ }
+
+ public boolean hasSubstitutions() {
+ return this.hasSubstitutions;
+ }
+
+ public Iterator iterator() {
+ return this.substitutions.iterator();
+ }
+
+ public int size() {
+ return this.substitutions.size();
+ }
+
+ public Object get(int pos) {
+ return this.substitutions.get(pos);
+ }
+
+ public String toString(Locator location, ExpressionContext expressionContext)
+ throws SAXException {
+ StringBuffer buf = new StringBuffer();
+ Iterator iterSubst = iterator();
+ while (iterSubst.hasNext()) {
+ Subst subst = (Subst) iterSubst.next();
+ if (subst instanceof Literal) {
+ Literal lit = (Literal) subst;
+ buf.append(lit.getValue());
+ } else if (subst instanceof JXTExpression) {
+ JXTExpression expr = (JXTExpression) subst;
+ Object val;
+ try {
+ val = expr.getValue(expressionContext);
+ } catch (Exception e) {
+ throw new SAXParseException(e.getMessage(), location, e);
+ } catch (Error err) {
+ throw new SAXParseException(err.getMessage(), location,
+ new ErrorHolder(err));
+ }
+ buf.append(val != null ? val.toString() : "");
+ }
+ }
+ return buf.toString();
+ }
+}
Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Substitutions.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Substitutions.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/LoopTagStatus.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/LoopTagStatus.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/LoopTagStatus.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/LoopTagStatus.java Sat Apr 23 13:44:12 2005
@@ -15,7 +15,9 @@
*/
package org.apache.cocoon.template.jxtg.instruction;
-
+/**
+ * @version SVN $Id$
+ */
public class LoopTagStatus {
private Object current;
private int index;
@@ -25,51 +27,67 @@
private int begin;
private int end;
private int step;
+
public void setBegin(int begin) {
this.begin = begin;
}
+
public int getBegin() {
return begin;
}
+
public void setEnd(int end) {
this.end = end;
}
+
public int getEnd() {
return end;
}
+
public void setStep(int step) {
this.step = step;
}
+
public int getStep() {
return step;
}
+
public void setFirst(boolean first) {
this.first = first;
}
+
public boolean isFirst() {
return first;
}
+
public void setIndex(int index) {
this.index = index;
}
+
public int getIndex() {
return index;
}
+
public void setCount(int count) {
this.count = count;
}
+
public int getCount() {
return count;
}
+
public void setCurrent(Object current) {
this.current = current;
}
+
public Object getCurrent() {
return current;
}
+
public void setLast(boolean last) {
this.last = last;
}
+
public boolean isLast() {
return last;
}
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/MacroContext.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/MacroContext.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/MacroContext.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/MacroContext.java Sat Apr 23 13:44:12 2005
@@ -17,6 +17,9 @@
import org.apache.cocoon.template.jxtg.script.event.Event;
+/**
+ * @version SVN $Id$
+ */
public class MacroContext {
private final String macroQName;
private final Event bodyStart;
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartAttribute.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartAttribute.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartAttribute.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartAttribute.java Sat Apr 23 13:44:12 2005
@@ -18,6 +18,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class StartAttribute extends StartInstruction {
private JXTExpression name;
private JXTExpression value;
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartCall.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartCall.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartCall.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartCall.java Sat Apr 23 13:44:12 2005
@@ -39,6 +39,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class StartCall extends StartInstruction {
private Object macro;
private JXTExpression targetNamespace;
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartChoose.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartChoose.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartChoose.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartChoose.java Sat Apr 23 13:44:12 2005
@@ -28,6 +28,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class StartChoose extends StartInstruction {
private StartWhen firstChoice;
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartComment.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartComment.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartComment.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartComment.java Sat Apr 23 13:44:12 2005
@@ -33,6 +33,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class StartComment extends StartInstruction {
public StartComment(StartElement raw, Attributes attrs, Stack stack) {
// <jx:comment>This will be parsed</jx:comment>
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartDefine.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartDefine.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartDefine.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartDefine.java Sat Apr 23 13:44:12 2005
@@ -33,6 +33,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class StartDefine extends StartInstruction {
private final String name;
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartEval.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartEval.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartEval.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartEval.java Sat Apr 23 13:44:12 2005
@@ -30,6 +30,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class StartEval extends StartInstruction {
private final JXTExpression value;
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartEvalBody.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartEvalBody.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartEvalBody.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartEvalBody.java Sat Apr 23 13:44:12 2005
@@ -29,6 +29,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class StartEvalBody extends StartInstruction {
public StartEvalBody(StartElement raw, Attributes attrs, Stack stack) {
super(raw);
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartForEach.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartForEach.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartForEach.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartForEach.java Sat Apr 23 13:44:12 2005
@@ -32,6 +32,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class StartForEach extends StartInstruction {
private final JXTExpression items;
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartFormatDate.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartFormatDate.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartFormatDate.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartFormatDate.java Sat Apr 23 13:44:12 2005
@@ -35,8 +35,10 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class StartFormatDate extends StartInstruction {
-
private static final String DATE = "date";
private static final String TIME = "time";
private static final String DATETIME = "both";
@@ -52,7 +54,6 @@
public StartFormatDate(StartElement raw, Attributes attrs, Stack stack)
throws SAXException{
-
super(raw);
Locator locator = getLocation();
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartFormatNumber.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartFormatNumber.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartFormatNumber.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartFormatNumber.java Sat Apr 23 13:44:12 2005
@@ -37,6 +37,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class StartFormatNumber extends StartInstruction {
private JXTExpression value;
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartIf.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartIf.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartIf.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartIf.java Sat Apr 23 13:44:12 2005
@@ -30,6 +30,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class StartIf extends StartInstruction {
private final JXTExpression test;
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartImport.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartImport.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartImport.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartImport.java Sat Apr 23 13:44:12 2005
@@ -40,6 +40,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class StartImport extends StartInstruction {
private final AttributeEvent uri;
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartOtherwise.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartOtherwise.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartOtherwise.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartOtherwise.java Sat Apr 23 13:44:12 2005
@@ -23,6 +23,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class StartOtherwise extends StartInstruction {
public StartOtherwise(StartElement raw, Attributes attrs, Stack stack)
throws SAXException {
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartOut.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartOut.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartOut.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartOut.java Sat Apr 23 13:44:12 2005
@@ -30,6 +30,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class StartOut extends StartInstruction {
private final JXTExpression compiledExpression;
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartParameter.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartParameter.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartParameter.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartParameter.java Sat Apr 23 13:44:12 2005
@@ -24,6 +24,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class StartParameter extends StartInstruction {
final String name;
final String optional;
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartParameterInstance.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartParameterInstance.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartParameterInstance.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartParameterInstance.java Sat Apr 23 13:44:12 2005
@@ -30,6 +30,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class StartParameterInstance extends StartInstruction {
final String name;
private final Object value;
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartSet.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartSet.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartSet.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartSet.java Sat Apr 23 13:44:12 2005
@@ -32,6 +32,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class StartSet extends StartInstruction {
private final JXTExpression var;
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartTemplate.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartTemplate.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartTemplate.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartTemplate.java Sat Apr 23 13:44:12 2005
@@ -26,6 +26,9 @@
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
+/**
+ * @version SVN $Id$
+ */
public class StartTemplate extends StartInstruction {
public StartTemplate(StartElement raw, Attributes attrs, Stack stack) {
super(raw);
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartWhen.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartWhen.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartWhen.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartWhen.java Sat Apr 23 13:44:12 2005
@@ -25,6 +25,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class StartWhen extends StartInstruction {
private final JXTExpression test;
private StartWhen nextChoice;
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=164419&r1=164418&r2=164419&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 Sat Apr 23 13:44:12 2005
@@ -37,6 +37,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
+/**
+ * @version SVN $Id$
+ */
public class Invoker {
private static final Attributes EMPTY_ATTRS = new AttributesImpl();
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/Parser.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/Parser.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/Parser.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/Parser.java Sat Apr 23 13:44:12 2005
@@ -34,6 +34,9 @@
import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.helpers.LocatorImpl;
+/**
+ * @version SVN $Id$
+ */
public class Parser implements ContentHandler, LexicalHandler {
StartDocument startEvent;
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/ScriptManager.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/ScriptManager.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/ScriptManager.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/ScriptManager.java Sat Apr 23 13:44:12 2005
@@ -29,6 +29,9 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class ScriptManager {
private ServiceManager serviceManager;
private final Map cache = new HashMap();
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/AttributeEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/AttributeEvent.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/AttributeEvent.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/AttributeEvent.java Sat Apr 23 13:44:12 2005
@@ -15,6 +15,9 @@
*/
package org.apache.cocoon.template.jxtg.script.event;
+/**
+ * @version SVN $Id$
+ */
public abstract class AttributeEvent {
public AttributeEvent(String namespaceURI, String localName, String raw,
String type) {
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/Characters.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/Characters.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/Characters.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/Characters.java Sat Apr 23 13:44:12 2005
@@ -30,6 +30,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class Characters extends TextEvent {
public Characters(Locator location, char[] chars, int start, int length)
throws SAXException {
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/CopyAttribute.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/CopyAttribute.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/CopyAttribute.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/CopyAttribute.java Sat Apr 23 13:44:12 2005
@@ -15,6 +15,9 @@
*/
package org.apache.cocoon.template.jxtg.script.event;
+/**
+ * @version SVN $Id$
+ */
public class CopyAttribute extends AttributeEvent {
public CopyAttribute(String namespaceURI, String localName, String raw,
String type, String value) {
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndCDATA.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndCDATA.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndCDATA.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndCDATA.java Sat Apr 23 13:44:12 2005
@@ -22,6 +22,9 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+/**
+ * @version SVN $Id$
+ */
public class EndCDATA extends Event {
public EndCDATA(Locator location) {
super(location);
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndDTD.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndDTD.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndDTD.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndDTD.java Sat Apr 23 13:44:12 2005
@@ -22,6 +22,9 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+/**
+ * @version SVN $Id$
+ */
public class EndDTD extends Event {
public EndDTD(Locator location) {
super(location);
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndDocument.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndDocument.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndDocument.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndDocument.java Sat Apr 23 13:44:12 2005
@@ -22,6 +22,9 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+/**
+ * @version SVN $Id$
+ */
public class EndDocument extends Event {
public EndDocument(Locator location) {
super(location);
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndElement.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndElement.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndElement.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndElement.java Sat Apr 23 13:44:12 2005
@@ -22,6 +22,9 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+/**
+ * @version SVN $Id$
+ */
public class EndElement extends Event {
public EndElement(Locator location, StartElement startElement) {
super(location);
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndEntity.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndEntity.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndEntity.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndEntity.java Sat Apr 23 13:44:12 2005
@@ -22,6 +22,9 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+/**
+ * @version SVN $Id$
+ */
public class EndEntity extends Event {
public EndEntity(Locator location, String name) {
super(location);
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndInstruction.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndInstruction.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndInstruction.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndInstruction.java Sat Apr 23 13:44:12 2005
@@ -17,6 +17,9 @@
import org.xml.sax.Locator;
+/**
+ * @version SVN $Id$
+ */
public class EndInstruction extends Event {
public EndInstruction(Locator locator, StartInstruction startInstruction) {
super(locator);
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndPrefixMapping.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndPrefixMapping.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndPrefixMapping.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndPrefixMapping.java Sat Apr 23 13:44:12 2005
@@ -22,6 +22,9 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+/**
+ * @version SVN $Id$
+ */
public class EndPrefixMapping extends Event {
public EndPrefixMapping(Locator location, String prefix) {
super(location);
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/Event.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/Event.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/Event.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/Event.java Sat Apr 23 13:44:12 2005
@@ -23,6 +23,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.LocatorImpl;
+/**
+ * @version SVN $Id$
+ */
public class Event {
protected final Locator location;
protected Event next; // in document order
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/IgnorableWhitespace.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/IgnorableWhitespace.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/IgnorableWhitespace.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/IgnorableWhitespace.java Sat Apr 23 13:44:12 2005
@@ -22,6 +22,9 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+/**
+ * @version SVN $Id$
+ */
public class IgnorableWhitespace extends TextEvent {
public IgnorableWhitespace(Locator location, char[] chars, int start,
int length) throws SAXException {
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/ProcessingInstruction.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/ProcessingInstruction.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/ProcessingInstruction.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/ProcessingInstruction.java Sat Apr 23 13:44:12 2005
@@ -22,6 +22,9 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+/**
+ * @version SVN $Id$
+ */
public class ProcessingInstruction extends Event {
public ProcessingInstruction(Locator location, String target, String data) {
super(location);
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/SkippedEntity.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/SkippedEntity.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/SkippedEntity.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/SkippedEntity.java Sat Apr 23 13:44:12 2005
@@ -22,6 +22,9 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+/**
+ * @version SVN $Id$
+ */
public class SkippedEntity extends Event {
public SkippedEntity(Locator location, String name) {
super(location);
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartCDATA.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartCDATA.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartCDATA.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartCDATA.java Sat Apr 23 13:44:12 2005
@@ -22,6 +22,9 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+/**
+ * @version SVN $Id$
+ */
public class StartCDATA extends Event {
public StartCDATA(Locator location) {
super(location);
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartDTD.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartDTD.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartDTD.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartDTD.java Sat Apr 23 13:44:12 2005
@@ -22,6 +22,9 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+/**
+ * @version SVN $Id$
+ */
public class StartDTD extends Event {
public StartDTD(Locator location, String name, String publicId,
String systemId) {
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartDocument.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartDocument.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartDocument.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartDocument.java Sat Apr 23 13:44:12 2005
@@ -26,6 +26,9 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+/**
+ * @version SVN $Id$
+ */
public class StartDocument extends Event {
public StartDocument(Locator location) {
super(location);
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartElement.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartElement.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartElement.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartElement.java Sat Apr 23 13:44:12 2005
@@ -29,6 +29,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
+/**
+ * @version SVN $Id$
+ */
public class StartElement extends Event {
public StartElement(Locator location, String namespaceURI,
String localName, String raw, Attributes attrs) throws SAXException {
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartEntity.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartEntity.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartEntity.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartEntity.java Sat Apr 23 13:44:12 2005
@@ -22,6 +22,9 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+/**
+ * @version SVN $Id$
+ */
public class StartEntity extends Event {
public StartEntity(Locator location, String name) {
super(location);
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.java Sat Apr 23 13:44:12 2005
@@ -18,6 +18,9 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+/**
+ * @version SVN $Id$
+ */
public abstract class StartInstruction extends Event {
public StartInstruction(Locator locator) {
super(locator);
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartPrefixMapping.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartPrefixMapping.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartPrefixMapping.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartPrefixMapping.java Sat Apr 23 13:44:12 2005
@@ -22,6 +22,9 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+/**
+ * @version SVN $Id$
+ */
public class StartPrefixMapping extends Event {
public StartPrefixMapping(Locator location, String prefix, String uri) {
super(location);
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/SubstituteAttribute.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/SubstituteAttribute.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/SubstituteAttribute.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/SubstituteAttribute.java Sat Apr 23 13:44:12 2005
@@ -17,6 +17,9 @@
import org.apache.cocoon.template.jxtg.expression.Substitutions;
+/**
+ * @version SVN $Id$
+ */
public class SubstituteAttribute extends AttributeEvent {
public SubstituteAttribute(String namespaceURI, String localName,
String raw, String type, Substitutions substs) {
Modified: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/TextEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/TextEvent.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/TextEvent.java (original)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/TextEvent.java Sat Apr 23 13:44:12 2005
@@ -28,6 +28,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class TextEvent extends Event {
public TextEvent(Locator location, char[] chars, int start, int length)
throws SAXException {
Added: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/transformation/JXTemplateTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/transformation/JXTemplateTransformer.java?rev=164419&view=auto
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/transformation/JXTemplateTransformer.java (added)
+++ cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/transformation/JXTemplateTransformer.java Sat Apr 23 13:44:12 2005
@@ -0,0 +1,25 @@
+/*
+ * 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.transformation;
+
+/**
+ * @deprecated
+ * @version SVN $Id$
+ */
+public class JXTemplateTransformer extends
+ org.apache.cocoon.template.jxtg.JXTemplateTransformer {
+
+}
Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/transformation/JXTemplateTransformer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/transformation/JXTemplateTransformer.java
------------------------------------------------------------------------------
svn:keywords = Id
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?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- 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 Sat Apr 23 13:44:12 2005
@@ -17,6 +17,9 @@
import org.xml.sax.SAXException;
+/**
+ * @version SVN $Id$
+ */
public interface AttributeAwareXMLConsumer extends XMLConsumer {
public void attribute(String uri, String localName, String qName,
String type, String value) throws SAXException;
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?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- 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 Sat Apr 23 13:44:12 2005
@@ -26,6 +26,9 @@
import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.AttributesImpl;
+/**
+ * @version SVN $Id$
+ */
public class AttributeAwareXMLConsumerImpl implements AttributeAwareXMLConsumer {
private StartElement currentElement;
private List saxbits;
@@ -66,7 +69,8 @@
public void startElement(String namespaceURI, String localName,
String qName, Attributes attrs) throws SAXException {
playCache();
- this.currentElement = new StartElement(namespaceURI, localName, qName, attrs);
+ this.currentElement = new StartElement(namespaceURI, localName, qName,
+ attrs);
}
public void endElement(String namespaceURI, String localName, String qName)
@@ -77,6 +81,7 @@
public void characters(char[] ch, int start, int length)
throws SAXException {
+ // TODO: should we allow to emit characters before adding an attribute?
if (this.currentElement != null)
this.saxbits.add(new Characters(ch, start, length));
else
@@ -144,8 +149,20 @@
if (this.currentElement == null)
throw new SAXParseException("attribute event not allowed here",
this.locator);
- else
+ else {
this.currentElement.attribute(uri, localName, qName, type, value);
+ // if between currentElement and jx:attribute only whitespace
+ // was recorded - skip it
+ boolean whitespaceOnly = true;
+ Iterator it = this.saxbits.iterator();
+ while (it.hasNext()) {
+ SaxBit saxBit = (SaxBit) it.next();
+ if (!(saxBit instanceof IgnorableWhitespace))
+ whitespaceOnly = false;
+ }
+ if (whitespaceOnly)
+ this.saxbits.clear();
+ }
}
interface SaxBit {
Modified: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/accessor/AccessorTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/accessor/AccessorTestCase.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/accessor/AccessorTestCase.java (original)
+++ cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/accessor/AccessorTestCase.java Sat Apr 23 13:44:12 2005
@@ -1,84 +1,84 @@
-/*
- * 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.components.accessor;
-
-import java.util.Map;
-
-import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceSelector;
-import org.apache.cocoon.SitemapComponentTestCase;
-import org.apache.cocoon.components.accessor.Accessor;
-import org.apache.cocoon.environment.Context;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
-
-public class AccessorTestCase extends SitemapComponentTestCase {
- private Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_WARN);
-
- protected Logger getLogger() {
- return this.logger;
- }
-
- public void testRequestAccessor() throws ServiceException {
- ServiceSelector accessorSelector =
- (ServiceSelector)this.lookup(Accessor.ROLE + "Selector");
- Accessor accessor = (Accessor)accessorSelector.select("request");
- Request request = (Request)accessor.getObject();
- assertEquals("HTTP/1.1", request.getProtocol());
- accessorSelector.release(accessor);
- this.release(accessorSelector);
- }
-
- public void testSessionAccessor() throws ServiceException {
- // Create a session
- getRequest().getSession();
- ServiceSelector accessorSelector =
- (ServiceSelector)this.lookup(Accessor.ROLE + "Selector");
- Accessor accessor = (Accessor)accessorSelector.select("session");
- Session session = (Session)accessor.getObject();
- assertEquals("MockSession", session.getId());
- accessorSelector.release(accessor);
- this.release(accessorSelector);
- }
-
- public void testContextAccessor() throws ServiceException {
- getContext().setAttribute("foo", "bar");
- ServiceSelector accessorSelector =
- (ServiceSelector)this.lookup(Accessor.ROLE + "Selector");
- Accessor accessor = (Accessor)accessorSelector.select("context");
- Context context = (Context)accessor.getObject();
- assertEquals("bar", context.getAttribute("foo"));
- accessorSelector.release(accessor);
- this.release(accessorSelector);
- }
-
- public void testMapAccessor() throws ServiceException {
- // Create a session
- getRequest().getSession();
- getContext().setAttribute("foo", "bar");
- ServiceSelector accessorSelector =
- (ServiceSelector)this.lookup(Accessor.ROLE + "Selector");
- Accessor accessor = (Accessor)accessorSelector.select("cocoon");
- Map map = (Map)accessor.getObject();
- assertEquals("HTTP/1.1", ((Request)map.get("request")).getProtocol());
- assertEquals("MockSession", ((Session)map.get("session")).getId());
- assertEquals("bar", ((Context)map.get("context")).getAttribute("foo"));
- accessorSelector.release(accessor);
- this.release(accessorSelector);
- }
-}
+/*
+ * 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.components.accessor;
+
+import java.util.Map;
+
+import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceSelector;
+import org.apache.cocoon.SitemapComponentTestCase;
+import org.apache.cocoon.components.accessor.Accessor;
+import org.apache.cocoon.environment.Context;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Session;
+
+public class AccessorTestCase extends SitemapComponentTestCase {
+ private Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_WARN);
+
+ protected Logger getLogger() {
+ return this.logger;
+ }
+
+ public void testRequestAccessor() throws ServiceException {
+ ServiceSelector accessorSelector =
+ (ServiceSelector)this.lookup(Accessor.ROLE + "Selector");
+ Accessor accessor = (Accessor)accessorSelector.select("request");
+ Request request = (Request)accessor.getObject();
+ assertEquals("HTTP/1.1", request.getProtocol());
+ accessorSelector.release(accessor);
+ this.release(accessorSelector);
+ }
+
+ public void testSessionAccessor() throws ServiceException {
+ // Create a session
+ getRequest().getSession();
+ ServiceSelector accessorSelector =
+ (ServiceSelector)this.lookup(Accessor.ROLE + "Selector");
+ Accessor accessor = (Accessor)accessorSelector.select("session");
+ Session session = (Session)accessor.getObject();
+ assertEquals("MockSession", session.getId());
+ accessorSelector.release(accessor);
+ this.release(accessorSelector);
+ }
+
+ public void testContextAccessor() throws ServiceException {
+ getContext().setAttribute("foo", "bar");
+ ServiceSelector accessorSelector =
+ (ServiceSelector)this.lookup(Accessor.ROLE + "Selector");
+ Accessor accessor = (Accessor)accessorSelector.select("context");
+ Context context = (Context)accessor.getObject();
+ assertEquals("bar", context.getAttribute("foo"));
+ accessorSelector.release(accessor);
+ this.release(accessorSelector);
+ }
+
+ public void testMapAccessor() throws ServiceException {
+ // Create a session
+ getRequest().getSession();
+ getContext().setAttribute("foo", "bar");
+ ServiceSelector accessorSelector =
+ (ServiceSelector)this.lookup(Accessor.ROLE + "Selector");
+ Accessor accessor = (Accessor)accessorSelector.select("cocoon");
+ Map map = (Map)accessor.getObject();
+ assertEquals("HTTP/1.1", ((Request)map.get("request")).getProtocol());
+ assertEquals("MockSession", ((Session)map.get("session")).getId());
+ assertEquals("bar", ((Context)map.get("context")).getAttribute("foo"));
+ accessorSelector.release(accessor);
+ this.release(accessorSelector);
+ }
+}
Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/accessor/AccessorTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/accessor/AccessorTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/accessor/AccessorTestCase.xtest
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/accessor/AccessorTestCase.xtest?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/accessor/AccessorTestCase.xtest (original)
+++ cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/accessor/AccessorTestCase.xtest Sat Apr 23 13:44:12 2005
@@ -1,42 +1,42 @@
-<?xml version="1.0"?>
-<!--
- 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.
--->
-
-<testcase>
- <roles>
- <role name="org.apache.cocoon.components.accessor.AccessorSelector"
- shorthand="accessors"
- default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
- </roles>
-
- <components>
- <accessors>
- <component-instance class="org.apache.cocoon.components.accessor.RequestAccessor" name="request"/>
- <component-instance class="org.apache.cocoon.components.accessor.SessionAccessor" name="session"/>
- <component-instance class="org.apache.cocoon.components.accessor.ContextAccessor" name="context"/>
- <component-instance class="org.apache.cocoon.components.accessor.ContinuationAccessor" name="continuation"/>
- <component-instance class="org.apache.cocoon.components.accessor.FlowAttributeAccessor" name="flow-attribute"/>
- <component-instance class="org.apache.cocoon.components.accessor.MapAccessor" name="cocoon">
- <element accessor="request"/>
- <element accessor="session"/>
- <element accessor="context"/>
- <element accessor="continuation"/>
- <element name="flowcontext" accessor="flow-attribute"/>
- </component-instance>
- </accessors>
- </components>
-
-</testcase>
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+
+<testcase>
+ <roles>
+ <role name="org.apache.cocoon.components.accessor.AccessorSelector"
+ shorthand="accessors"
+ default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
+ </roles>
+
+ <components>
+ <accessors>
+ <component-instance class="org.apache.cocoon.components.accessor.RequestAccessor" name="request"/>
+ <component-instance class="org.apache.cocoon.components.accessor.SessionAccessor" name="session"/>
+ <component-instance class="org.apache.cocoon.components.accessor.ContextAccessor" name="context"/>
+ <component-instance class="org.apache.cocoon.components.accessor.ContinuationAccessor" name="continuation"/>
+ <component-instance class="org.apache.cocoon.components.accessor.FlowAttributeAccessor" name="flow-attribute"/>
+ <component-instance class="org.apache.cocoon.components.accessor.MapAccessor" name="cocoon">
+ <element accessor="request"/>
+ <element accessor="session"/>
+ <element accessor="context"/>
+ <element accessor="continuation"/>
+ <element name="flowcontext" accessor="flow-attribute"/>
+ </component-instance>
+ </accessors>
+ </components>
+
+</testcase>
Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/accessor/AccessorTestCase.xtest
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/accessor/AccessorTestCase.xtest
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/expression/ExpressionTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/expression/ExpressionTestCase.xtest
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/expression/ExpressionTestCase.xtest?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/expression/ExpressionTestCase.xtest (original)
+++ cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/expression/ExpressionTestCase.xtest Sat Apr 23 13:44:12 2005
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
-<!--
- 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.
--->
-
-<testcase>
- <roles>
- <role name="org.apache.cocoon.components.expression.ExpressionCompilerSelector"
- shorthand="expression-compilers"
- default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
- <role name="org.apache.cocoon.components.expression.ExpressionFactory"
- shorthand="expression-factory"
- default-class="org.apache.cocoon.components.expression.ExpressionFactory"/>
- </roles>
-
- <components>
- <expression-compilers>
- <component-instance class="org.apache.cocoon.components.expression.jxpath.JXPathCompiler" name="default"/>
- <component-instance class="org.apache.cocoon.components.expression.jexl.JexlCompiler" name="jexl"/>
- <component-instance class="org.apache.cocoon.components.expression.jxpath.JXPathCompiler" name="jxpath"/>
- </expression-compilers>
- </components>
-
-</testcase>
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+
+<testcase>
+ <roles>
+ <role name="org.apache.cocoon.components.expression.ExpressionCompilerSelector"
+ shorthand="expression-compilers"
+ default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
+ <role name="org.apache.cocoon.components.expression.ExpressionFactory"
+ shorthand="expression-factory"
+ default-class="org.apache.cocoon.components.expression.ExpressionFactory"/>
+ </roles>
+
+ <components>
+ <expression-compilers>
+ <component-instance class="org.apache.cocoon.components.expression.jxpath.JXPathCompiler" name="default"/>
+ <component-instance class="org.apache.cocoon.components.expression.jexl.JexlCompiler" name="jexl"/>
+ <component-instance class="org.apache.cocoon.components.expression.jxpath.JXPathCompiler" name="jxpath"/>
+ </expression-compilers>
+ </components>
+
+</testcase>
Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/expression/ExpressionTestCase.xtest
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/expression/ExpressionTestCase.xtest
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/expression/jexl/JexlTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/expression/jxpath/JXPathTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/environment/FOMTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/environment/FOMTestCase.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/environment/FOMTestCase.java (original)
+++ cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/environment/FOMTestCase.java Sat Apr 23 13:44:12 2005
@@ -1,65 +1,65 @@
-/*
- * 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.environment;
-
-import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.cocoon.SitemapComponentTestCase;
-import org.apache.cocoon.components.expression.Expression;
-import org.apache.cocoon.components.expression.ExpressionContext;
-import org.apache.cocoon.components.expression.ExpressionException;
-import org.apache.cocoon.components.expression.ExpressionFactory;
-
-public class FOMTestCase extends SitemapComponentTestCase {
- private Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_WARN);
-
- protected Logger getLogger() {
- return this.logger;
- }
-
- public void testFOMJexl() throws ExpressionException, ServiceException {
- ExpressionFactory factory = (ExpressionFactory)this.lookup(ExpressionFactory.ROLE);
- Parameters parameters = new Parameters();
- parameters.setParameter("test", "foo");
- ExpressionContext fomContext =
- FlowObjectModelHelper.getFOMExpressionContext(getObjectModel(), parameters);
-
- Expression expression = factory.getExpression("jexl", "cocoon.parameters.test");
- assertEquals("foo", expression.evaluate(fomContext));
-
- expression = factory.getExpression("jexl", "cocoon.request.protocol");
- assertEquals("HTTP/1.1", expression.evaluate(fomContext));
- this.release(factory);
- }
-
- public void testFOMJXPath() throws ExpressionException, ServiceException {
- ExpressionFactory factory = (ExpressionFactory)this.lookup(ExpressionFactory.ROLE);
- Parameters parameters = new Parameters();
- parameters.setParameter("test", "foo");
- ExpressionContext fomContext =
- FlowObjectModelHelper.getFOMExpressionContext(getObjectModel(), parameters);
-
- Expression expression = factory.getExpression("jxpath", "$cocoon/parameters/test");
- assertEquals("foo", expression.evaluate(fomContext));
-
- expression = factory.getExpression("jxpath", "$cocoon/request/protocol");
- assertEquals("HTTP/1.1", expression.evaluate(fomContext));
- this.release(factory);
- }
-}
-
+/*
+ * 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.environment;
+
+import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.cocoon.SitemapComponentTestCase;
+import org.apache.cocoon.components.expression.Expression;
+import org.apache.cocoon.components.expression.ExpressionContext;
+import org.apache.cocoon.components.expression.ExpressionException;
+import org.apache.cocoon.components.expression.ExpressionFactory;
+
+public class FOMTestCase extends SitemapComponentTestCase {
+ private Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_WARN);
+
+ protected Logger getLogger() {
+ return this.logger;
+ }
+
+ public void testFOMJexl() throws ExpressionException, ServiceException {
+ ExpressionFactory factory = (ExpressionFactory)this.lookup(ExpressionFactory.ROLE);
+ Parameters parameters = new Parameters();
+ parameters.setParameter("test", "foo");
+ ExpressionContext fomContext =
+ FlowObjectModelHelper.getFOMExpressionContext(getObjectModel(), parameters);
+
+ Expression expression = factory.getExpression("jexl", "cocoon.parameters.test");
+ assertEquals("foo", expression.evaluate(fomContext));
+
+ expression = factory.getExpression("jexl", "cocoon.request.protocol");
+ assertEquals("HTTP/1.1", expression.evaluate(fomContext));
+ this.release(factory);
+ }
+
+ public void testFOMJXPath() throws ExpressionException, ServiceException {
+ ExpressionFactory factory = (ExpressionFactory)this.lookup(ExpressionFactory.ROLE);
+ Parameters parameters = new Parameters();
+ parameters.setParameter("test", "foo");
+ ExpressionContext fomContext =
+ FlowObjectModelHelper.getFOMExpressionContext(getObjectModel(), parameters);
+
+ Expression expression = factory.getExpression("jxpath", "$cocoon/parameters/test");
+ assertEquals("foo", expression.evaluate(fomContext));
+
+ expression = factory.getExpression("jxpath", "$cocoon/request/protocol");
+ assertEquals("HTTP/1.1", expression.evaluate(fomContext));
+ this.release(factory);
+ }
+}
+
Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/environment/FOMTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/environment/FOMTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id