Author: danielf Date: Wed Jan 19 15:55:55 2005 New Revision: 125685 URL: http://svn.apache.org/viewcvs?view=rev&rev=125685 Log: Moved instructions to own directory. Added: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/LoopTagStatus.java - copied, changed from r125675, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/LoopTagStatus.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartChoose.java - copied, changed from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartChoose.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartComment.java - copied, changed from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartComment.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartDefine.java - copied, changed from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDefine.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartEval.java - copied, changed from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartEval.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartEvalBody.java - copied, changed from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartEvalBody.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartForEach.java - copied, changed from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartForEach.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartFormatDate.java - copied, changed from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartFormatDate.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartFormatNumber.java - copied, changed from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartFormatNumber.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartIf.java - copied, changed from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartIf.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartImport.java - copied, changed from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartImport.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartOtherwise.java - copied, changed from r125675, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartOtherwise.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartOut.java - copied, changed from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartOut.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartParameter.java - copied, changed from r125675, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartParameter.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartSet.java - copied, changed from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartSet.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartTemplate.java - copied, changed from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartTemplate.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartWhen.java - copied, changed from r125675, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartWhen.java Removed: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/LoopTagStatus.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartChoose.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartComment.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDefine.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartEval.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartEvalBody.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartForEach.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartFormatDate.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartFormatNumber.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartIf.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartImport.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartOtherwise.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartOut.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartParameter.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartSet.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartTemplate.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartWhen.java Modified: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Invoker.java cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java
Copied: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/LoopTagStatus.java (from r125675, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/LoopTagStatus.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/LoopTagStatus.java?view=diff&rev=125685&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/LoopTagStatus.java&r1=125675&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/LoopTagStatus.java&r2=125685 ============================================================================== --- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/LoopTagStatus.java (original) +++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/LoopTagStatus.java Wed Jan 19 15:55:55 2005 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.template.jxtg.script.event; +package org.apache.cocoon.template.jxtg.instructions; public class LoopTagStatus { @@ -73,4 +73,4 @@ public boolean isLast() { return last; } -} \ No newline at end of file +} Copied: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartChoose.java (from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartChoose.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartChoose.java?view=diff&rev=125685&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartChoose.java&r1=125680&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartChoose.java&r2=125685 ============================================================================== --- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartChoose.java (original) +++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartChoose.java Wed Jan 19 15:55:55 2005 @@ -13,13 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.template.jxtg.script.event; +package org.apache.cocoon.template.jxtg.instructions; 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.Invoker; +import org.apache.cocoon.template.jxtg.script.event.Event; +import org.apache.cocoon.template.jxtg.script.event.StartElement; +import org.apache.cocoon.template.jxtg.script.event.StartInstruction; import org.apache.cocoon.xml.XMLConsumer; import org.xml.sax.Attributes; import org.xml.sax.SAXException; Copied: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartComment.java (from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartComment.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartComment.java?view=diff&rev=125685&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartComment.java&r1=125680&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartComment.java&r2=125685 ============================================================================== --- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartComment.java (original) +++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartComment.java Wed Jan 19 15:55:55 2005 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.template.jxtg.script.event; +package org.apache.cocoon.template.jxtg.instructions; import java.util.Properties; import java.util.Stack; @@ -22,6 +22,9 @@ import org.apache.cocoon.components.expression.ExpressionContext; import org.apache.cocoon.template.jxtg.environment.ExecutionContext; 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.template.jxtg.script.event.StartInstruction; import org.apache.cocoon.xml.XMLConsumer; import org.apache.cocoon.xml.XMLUtils; import org.apache.commons.lang.StringUtils; Copied: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartDefine.java (from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDefine.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartDefine.java?view=diff&rev=125685&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDefine.java&r1=125680&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartDefine.java&r2=125685 ============================================================================== --- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDefine.java (original) +++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartDefine.java Wed Jan 19 15:55:55 2005 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.template.jxtg.script.event; +package org.apache.cocoon.template.jxtg.instructions; import java.util.HashMap; import java.util.Map; @@ -21,6 +21,12 @@ import org.apache.cocoon.components.expression.ExpressionContext; import org.apache.cocoon.template.jxtg.environment.ExecutionContext; +import org.apache.cocoon.template.jxtg.script.event.Characters; +import org.apache.cocoon.template.jxtg.script.event.Event; +import org.apache.cocoon.template.jxtg.script.event.IgnorableWhitespace; +import org.apache.cocoon.template.jxtg.script.event.StartElement; +import org.apache.cocoon.template.jxtg.script.event.StartInstruction; +import org.apache.cocoon.template.jxtg.script.event.TextEvent; import org.apache.cocoon.xml.XMLConsumer; import org.apache.commons.lang.StringUtils; import org.xml.sax.Attributes; Copied: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartEval.java (from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartEval.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartEval.java?view=diff&rev=125685&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartEval.java&r1=125680&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartEval.java&r2=125685 ============================================================================== --- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartEval.java (original) +++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartEval.java Wed Jan 19 15:55:55 2005 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.template.jxtg.script.event; +package org.apache.cocoon.template.jxtg.instructions; import java.util.Stack; @@ -22,6 +22,9 @@ 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.template.jxtg.script.event.StartInstruction; import org.apache.cocoon.xml.XMLConsumer; import org.xml.sax.Attributes; import org.xml.sax.SAXException; Copied: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartEvalBody.java (from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartEvalBody.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartEvalBody.java?view=diff&rev=125685&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartEvalBody.java&r1=125680&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartEvalBody.java&r2=125685 ============================================================================== --- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartEvalBody.java (original) +++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartEvalBody.java Wed Jan 19 15:55:55 2005 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.template.jxtg.script.event; +package org.apache.cocoon.template.jxtg.instructions; import java.util.Stack; @@ -21,6 +21,9 @@ import org.apache.cocoon.template.jxtg.environment.ErrorHolder; import org.apache.cocoon.template.jxtg.environment.ExecutionContext; 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.template.jxtg.script.event.StartInstruction; import org.apache.cocoon.xml.XMLConsumer; import org.xml.sax.Attributes; import org.xml.sax.SAXException; Copied: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartForEach.java (from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartForEach.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartForEach.java?view=diff&rev=125685&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartForEach.java&r1=125680&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartForEach.java&r2=125685 ============================================================================== --- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartForEach.java (original) +++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartForEach.java Wed Jan 19 15:55:55 2005 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.template.jxtg.script.event; +package org.apache.cocoon.template.jxtg.instructions; import java.util.Iterator; import java.util.Stack; @@ -23,6 +23,9 @@ 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.template.jxtg.script.event.StartInstruction; import org.apache.cocoon.xml.XMLConsumer; import org.xml.sax.Attributes; import org.xml.sax.Locator; Copied: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartFormatDate.java (from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartFormatDate.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartFormatDate.java?view=diff&rev=125685&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartFormatDate.java&r1=125680&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartFormatDate.java&r2=125685 ============================================================================== --- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartFormatDate.java (original) +++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartFormatDate.java Wed Jan 19 15:55:55 2005 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.template.jxtg.script.event; +package org.apache.cocoon.template.jxtg.instructions; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -26,6 +26,9 @@ import org.apache.cocoon.template.jxtg.environment.ExecutionContext; import org.apache.cocoon.template.jxtg.environment.ValueHelper; import org.apache.cocoon.template.jxtg.expression.JXTExpression; +import org.apache.cocoon.template.jxtg.script.event.Event; +import org.apache.cocoon.template.jxtg.script.event.StartElement; +import org.apache.cocoon.template.jxtg.script.event.StartInstruction; import org.apache.cocoon.xml.XMLConsumer; import org.xml.sax.Attributes; import org.xml.sax.Locator; Copied: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartFormatNumber.java (from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartFormatNumber.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartFormatNumber.java?view=diff&rev=125685&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartFormatNumber.java&r1=125680&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartFormatNumber.java&r2=125685 ============================================================================== --- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartFormatNumber.java (original) +++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartFormatNumber.java Wed Jan 19 15:55:55 2005 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.template.jxtg.script.event; +package org.apache.cocoon.template.jxtg.instructions; import java.lang.reflect.Method; import java.text.DecimalFormat; @@ -27,6 +27,9 @@ import org.apache.cocoon.template.jxtg.environment.ValueHelper; import org.apache.cocoon.template.jxtg.environment.ExecutionContext; import org.apache.cocoon.template.jxtg.expression.JXTExpression; +import org.apache.cocoon.template.jxtg.script.event.Event; +import org.apache.cocoon.template.jxtg.script.event.StartElement; +import org.apache.cocoon.template.jxtg.script.event.StartInstruction; import org.apache.cocoon.xml.XMLConsumer; import org.apache.commons.lang.StringUtils; import org.xml.sax.Attributes; Copied: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartIf.java (from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartIf.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartIf.java?view=diff&rev=125685&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartIf.java&r1=125680&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartIf.java&r2=125685 ============================================================================== --- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartIf.java (original) +++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartIf.java Wed Jan 19 15:55:55 2005 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.template.jxtg.script.event; +package org.apache.cocoon.template.jxtg.instructions; import java.util.Stack; @@ -21,6 +21,9 @@ import org.apache.cocoon.template.jxtg.environment.ErrorHolder; import org.apache.cocoon.template.jxtg.environment.ExecutionContext; import org.apache.cocoon.template.jxtg.expression.JXTExpression; +import org.apache.cocoon.template.jxtg.script.event.Event; +import org.apache.cocoon.template.jxtg.script.event.StartElement; +import org.apache.cocoon.template.jxtg.script.event.StartInstruction; import org.apache.cocoon.xml.XMLConsumer; import org.xml.sax.Attributes; import org.xml.sax.Locator; Copied: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartImport.java (from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartImport.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartImport.java?view=diff&rev=125685&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartImport.java&r1=125680&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartImport.java&r2=125685 ============================================================================== --- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartImport.java (original) +++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartImport.java Wed Jan 19 15:55:55 2005 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.template.jxtg.script.event; +package org.apache.cocoon.template.jxtg.instructions; import java.util.Iterator; import java.util.Stack; @@ -26,6 +26,13 @@ import org.apache.cocoon.template.jxtg.expression.JXTExpression; import org.apache.cocoon.template.jxtg.expression.Literal; import org.apache.cocoon.template.jxtg.expression.Subst; +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.Event; +import org.apache.cocoon.template.jxtg.script.event.StartElement; +import org.apache.cocoon.template.jxtg.script.event.StartDocument; +import org.apache.cocoon.template.jxtg.script.event.StartInstruction; +import org.apache.cocoon.template.jxtg.script.event.SubstituteAttribute; import org.apache.cocoon.template.jxtg.script.Invoker; import org.apache.cocoon.xml.XMLConsumer; import org.xml.sax.Attributes; Copied: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartOtherwise.java (from r125675, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartOtherwise.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartOtherwise.java?view=diff&rev=125685&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartOtherwise.java&r1=125675&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartOtherwise.java&r2=125685 ============================================================================== --- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartOtherwise.java (original) +++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartOtherwise.java Wed Jan 19 15:55:55 2005 @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.template.jxtg.script.event; +package org.apache.cocoon.template.jxtg.instructions; import java.util.Stack; +import org.apache.cocoon.template.jxtg.script.event.StartElement; +import org.apache.cocoon.template.jxtg.script.event.StartInstruction; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; Copied: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartOut.java (from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartOut.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartOut.java?view=diff&rev=125685&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartOut.java&r1=125680&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartOut.java&r2=125685 ============================================================================== --- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartOut.java (original) +++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartOut.java Wed Jan 19 15:55:55 2005 @@ -13,13 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.template.jxtg.script.event; +package org.apache.cocoon.template.jxtg.instructions; 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.event.Event; +import org.apache.cocoon.template.jxtg.script.event.StartElement; +import org.apache.cocoon.template.jxtg.script.event.StartInstruction; import org.apache.cocoon.template.jxtg.script.Invoker; import org.apache.cocoon.xml.IncludeXMLConsumer; import org.apache.cocoon.xml.XMLConsumer; Copied: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartParameter.java (from r125675, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartParameter.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartParameter.java?view=diff&rev=125685&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartParameter.java&r1=125675&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartParameter.java&r2=125685 ============================================================================== --- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartParameter.java (original) +++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartParameter.java Wed Jan 19 15:55:55 2005 @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.template.jxtg.script.event; +package org.apache.cocoon.template.jxtg.instructions; import java.util.Stack; +import org.apache.cocoon.template.jxtg.script.event.StartElement; +import org.apache.cocoon.template.jxtg.script.event.StartInstruction; import org.xml.sax.Attributes; import org.xml.sax.Locator; import org.xml.sax.SAXException; Copied: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartSet.java (from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartSet.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartSet.java?view=diff&rev=125685&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartSet.java&r1=125680&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartSet.java&r2=125685 ============================================================================== --- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartSet.java (original) +++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartSet.java Wed Jan 19 15:55:55 2005 @@ -13,13 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.template.jxtg.script.event; +package org.apache.cocoon.template.jxtg.instructions; 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.event.Event; +import org.apache.cocoon.template.jxtg.script.event.StartElement; +import org.apache.cocoon.template.jxtg.script.event.StartInstruction; import org.apache.cocoon.template.jxtg.script.Invoker; import org.apache.cocoon.xml.XMLConsumer; import org.w3c.dom.Node; Copied: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartTemplate.java (from r125680, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartTemplate.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartTemplate.java?view=diff&rev=125685&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartTemplate.java&r1=125680&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartTemplate.java&r2=125685 ============================================================================== --- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartTemplate.java (original) +++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartTemplate.java Wed Jan 19 15:55:55 2005 @@ -13,12 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.template.jxtg.script.event; +package org.apache.cocoon.template.jxtg.instructions; 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.template.jxtg.script.event.StartInstruction; import org.apache.cocoon.xml.XMLConsumer; import org.xml.sax.Attributes; import org.xml.sax.SAXException; Copied: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartWhen.java (from r125675, cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartWhen.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartWhen.java?view=diff&rev=125685&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartWhen.java&r1=125675&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartWhen.java&r2=125685 ============================================================================== --- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartWhen.java (original) +++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/instructions/StartWhen.java Wed Jan 19 15:55:55 2005 @@ -13,11 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.template.jxtg.script.event; +package org.apache.cocoon.template.jxtg.instructions; import java.util.Stack; import org.apache.cocoon.template.jxtg.expression.JXTExpression; +import org.apache.cocoon.template.jxtg.script.event.StartElement; +import org.apache.cocoon.template.jxtg.script.event.StartInstruction; import org.xml.sax.Attributes; import org.xml.sax.Locator; import org.xml.sax.SAXException; Modified: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Invoker.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Invoker.java?view=diff&rev=125685&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Invoker.java&r1=125684&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Invoker.java&r2=125685 ============================================================================== --- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Invoker.java (original) +++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Invoker.java Wed Jan 19 15:55:55 2005 @@ -27,6 +27,8 @@ import org.apache.cocoon.template.jxtg.expression.JXTExpression; import org.apache.cocoon.template.jxtg.expression.Literal; import org.apache.cocoon.template.jxtg.expression.Subst; +import org.apache.cocoon.template.jxtg.instructions.StartDefine; +import org.apache.cocoon.template.jxtg.instructions.StartParameter; import org.apache.cocoon.template.jxtg.script.event.*; import org.apache.cocoon.xml.IncludeXMLConsumer; import org.apache.cocoon.xml.XMLConsumer; Modified: cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java?view=diff&rev=125685&p1=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java&r1=125684&p2=cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java&r2=125685 ============================================================================== --- cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java (original) +++ cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/Parser.java Wed Jan 19 15:55:55 2005 @@ -19,6 +19,7 @@ import org.apache.cocoon.template.jxtg.JXTemplateGenerator; import org.apache.cocoon.template.jxtg.expression.JXTExpression; +import org.apache.cocoon.template.jxtg.instructions.*; import org.apache.cocoon.template.jxtg.script.event.*; import org.apache.commons.lang.StringUtils; import org.xml.sax.Attributes; Deleted: /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/LoopTagStatus.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/LoopTagStatus.java?view=auto&rev=125684 ============================================================================== Deleted: /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartChoose.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartChoose.java?view=auto&rev=125684 ============================================================================== Deleted: /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartComment.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartComment.java?view=auto&rev=125684 ============================================================================== Deleted: /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDefine.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartDefine.java?view=auto&rev=125684 ============================================================================== Deleted: /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartEval.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartEval.java?view=auto&rev=125684 ============================================================================== Deleted: /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartEvalBody.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartEvalBody.java?view=auto&rev=125684 ============================================================================== Deleted: /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartForEach.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartForEach.java?view=auto&rev=125684 ============================================================================== Deleted: /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartFormatDate.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartFormatDate.java?view=auto&rev=125684 ============================================================================== Deleted: /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartFormatNumber.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartFormatNumber.java?view=auto&rev=125684 ============================================================================== Deleted: /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartIf.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartIf.java?view=auto&rev=125684 ============================================================================== Deleted: /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartImport.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartImport.java?view=auto&rev=125684 ============================================================================== Deleted: /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartOtherwise.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartOtherwise.java?view=auto&rev=125684 ============================================================================== Deleted: /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartOut.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartOut.java?view=auto&rev=125684 ============================================================================== Deleted: /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartParameter.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartParameter.java?view=auto&rev=125684 ============================================================================== Deleted: /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartSet.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartSet.java?view=auto&rev=125684 ============================================================================== Deleted: /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartTemplate.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartTemplate.java?view=auto&rev=125684 ============================================================================== Deleted: /cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartWhen.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/script/event/StartWhen.java?view=auto&rev=125684 ==============================================================================
