[jboss-svn-commits] JBL Code SVN: r26811 - in labs/jbosstm/workspace/adinn/orchestration: bin and 31 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Jun 3 10:44:20 EDT 2009


Author: adinn
Date: 2009-06-03 10:44:19 -0400 (Wed, 03 Jun 2009)
New Revision: 26811

Added:
   labs/jbosstm/workspace/adinn/orchestration/bin/bytemancheck.sh
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/synchronization/
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/test/
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/
Removed:
   labs/jbosstm/workspace/adinn/orchestration/bin/toastcheck.sh
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/jbossts/
Modified:
   labs/jbosstm/workspace/adinn/orchestration/README
   labs/jbosstm/workspace/adinn/orchestration/build.xml
   labs/jbosstm/workspace/adinn/orchestration/dd/META-INF/MANIFEST.MF
   labs/jbosstm/workspace/adinn/orchestration/dd/grammar/cup/ECAGrammar.cup
   labs/jbosstm/workspace/adinn/orchestration/dd/grammar/flex/ECAToken.flex
   labs/jbosstm/workspace/adinn/orchestration/dd/scripts/HeuristicSaveAndRecover.txt
   labs/jbosstm/workspace/adinn/orchestration/dd/scripts/HeuristicSaveAndRecover10.txt
   labs/jbosstm/workspace/adinn/orchestration/dd/scripts/ParticipantCrashAndRecover.txt
   labs/jbosstm/workspace/adinn/orchestration/dd/scripts/ParticipantCrashAndRecover10.txt
   labs/jbosstm/workspace/adinn/orchestration/docs/ProgrammersGuide.odt
   labs/jbosstm/workspace/adinn/orchestration/docs/ProgrammersGuide.pdf
   labs/jbosstm/workspace/adinn/orchestration/ext/third_party_licenses.txt
   labs/jbosstm/workspace/adinn/orchestration/handler.txt
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/Location.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/LocationType.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/Main.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/Script.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/Transformer.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/AccessCheckAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/AccessTriggerAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/ExitCheckAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/ExitTriggerAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/InvokeCheckAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/InvokeTriggerAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/LineCheckAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/LineTriggerAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/OpcodesHelper.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleCheckAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleCheckMethodAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleGeneratorAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleMethodAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleTriggerAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleTriggerMethodAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/SynchronizeCheckAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/SynchronizeTriggerAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/ThrowCheckAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/ThrowTriggerAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/BBlock.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/CFG.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/CodeLocation.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/InstructionSequence.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/Link.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/TriggerDetails.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/TryCatchDetails.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/Action.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/Condition.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/Event.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/Rule.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/RuleElement.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/binding/Binding.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/binding/Bindings.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/compiler/Compiler.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/compiler/StackHeights.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/exception/CompileException.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/exception/EarlyReturnException.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/exception/ExecuteException.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/exception/ParseException.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/exception/ThrowException.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/exception/TypeException.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ArithmeticExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ArrayExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/BinaryOperExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/BitExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/BooleanExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/BooleanLiteral.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ComparisonExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ConditionalEvalExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/DollarExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/Expression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ExpressionHelper.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/FieldExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/LogicalExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/MethodExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/MinusExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/NotExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/NumericLiteral.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/OperExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/PlusExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ReturnExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/StaticExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/StringLiteral.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/StringPlusExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/TernaryOperExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ThrowExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/TwiddleExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/UnaryOperExpression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/Variable.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/grammar/ECAGrammarParser.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/grammar/ECATokenLexer.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/grammar/ParseNode.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/grammar/PrintableSymbol.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/grammar/sym.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/helper/Helper.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/helper/HelperAdapter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/helper/InterpretedHelper.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/type/Type.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/type/TypeGroup.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/type/TypeHelper.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/synchronization/CountDown.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/synchronization/Counter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/synchronization/Rendezvous.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/synchronization/Waiter.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/test/TestScript.java
   labs/jbosstm/workspace/adinn/orchestration/tests/build.xml
   labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/javaops/TestArithmetic.txt
   labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/javaops/TestField.txt
   labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/javaops/TestLogical.txt
   labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/javaops/TestMethod.txt
   labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestCall.txt
   labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestEntry.txt
   labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestExit.txt
   labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestReadWrite.txt
   labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestSynch.txt
   labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestThrow.txt
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/Test.java
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/auxiliary/TestCallThrowSynchAuxiliary.java
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/auxiliary/TestEntryExitAuxiliary.java
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/auxiliary/TestEntryExitAuxiliarySub.java
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/auxiliary/TestFieldMethodAuxiliary.java
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/auxiliary/TestReadWriteAuxiliary.java
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/helpers/Default.java
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/javaops/TestArithmetic.java
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/javaops/TestField.java
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/javaops/TestLogical.java
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/javaops/TestMethod.java
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/location/TestCall.java
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/location/TestEntry.java
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/location/TestExit.java
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/location/TestReadWrite.java
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/location/TestSynch.java
   labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/location/TestThrow.java
Log:
moved everything to package org.jboss.byteman and udpated all documents, scripts and other names to refer Byteman

Modified: labs/jbosstm/workspace/adinn/orchestration/README
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/README	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/README	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,11 +1,11 @@
-Type 'ant jar' to create the orchestration package library. This
+Type 'ant jar' to create the byteman package library. This
 package supports definition of Event Condition Action rules for
 orchestrating test scenarios.
 
 Set up
 ------
 In order to use this library you need to supply JVM with the
-orchestration jar as a java agent. This jar implements
+byteman jar as a java agent. This jar implements
 
   an agent class which monitors bytecode load operations and selects
   classes which match the compiled rule set as candidates for
@@ -19,7 +19,7 @@
 The agent is passed to the JVM using the -javaagent option of the java
 command by setting JAVA_OPTS as follows:
 
-export JAVA_OPTS="-javaagent:${HOME}/jboss/workspace/adinn/orchestration/build/lib/orchestration.jar=script:${HOME}/jboss/workspace/adinn/orchestration/handler.txt -Dorg.jboss.jbossts.orchestration.compileToBytecode -Dorg.jboss.jbossts.orchestration.dump.generated.classes=yes -Dorg.jboss.jbossts.orchestration.dump.generated.classes.directory=$HOME/jboss/workspace/adinn/orchestration/dump"
+export JAVA_OPTS="-javaagent:${HOME}/jboss/workspace/adinn/byteman/build/lib/byteman.jar=script:${HOME}/jboss/workspace/adinn/byteman/handler.txt -Dorg.jboss.byteman.compileToBytecode -Dorg.jboss.byteman.dump.generated.classes=yes -Dorg.jboss.byteman.dump.generated.classes.directory=$HOME/jboss/workspace/adinn/byteman/dump"
 
 The =script:<scriptFile> option to the -javaagent argument tells the
 agent premain to search <scriptFile> for rules. Multiple scripts may
@@ -32,10 +32,10 @@
 directory.
 
 By default the rule engine executes rule bindings, conditions and
-actions by interpreting the rule parse tree. However, TOAST also
+actions by interpreting the rule parse tree. However, byteman also
 supports compiled execution. If system property
 
-  org.jboss.jbossts.orchestration.compileToBytecode
+  org.jboss.byteman.compileToBytecode
 
 is set to a non-null value then the rule engine will compile the rule
 bindings, condition and action into Java bytecode which will be
@@ -47,13 +47,13 @@
 The agent can be configured to dump transformed byte code by setting
 several Java system properties as shown in the example above:
 
-  org.jboss.jbossts.orchestration.dump.generated.classes
+  org.jboss.byteman.dump.generated.classes
 
 this can be set to any value to enable dumping of generated
 code. Files will be written in a directory tree correspnding to the
 package hierarchy for the associated class.
 
-  org.jboss.jbossts.orchestration.dump.generated.classes.directory
+  org.jboss.byteman.dump.generated.classes.directory
 
 this can be set to a directory below which files will be written. if
 unset files are written to the current working directory of the JVM
@@ -62,7 +62,7 @@
 Rule Definition
 ---------------
 
-The orchestration package employs Event Condition Action rules. The
+The byteman package employs Event Condition Action rules. The
 event component is limited to matching an invocation of a specific
 method when execution reaches a particular location in the method
 body. The event automatically binds the arguments of the trigger
@@ -275,7 +275,7 @@
 
 Documentation
 -------------
-For full details of ruel syntaxthe operation of the orchestration
+For full details of ruel syntaxthe operation of the byteman
 package see the manual in the docs directory. See also the dd/scripts
 directory for some example rule scripts used to test JBossTS recovery.
 

Copied: labs/jbosstm/workspace/adinn/orchestration/bin/bytemancheck.sh (from rev 26809, labs/jbosstm/workspace/adinn/orchestration/bin/toastcheck.sh)
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/bin/bytemancheck.sh	                        (rev 0)
+++ labs/jbosstm/workspace/adinn/orchestration/bin/bytemancheck.sh	2009-06-03 14:44:19 UTC (rev 26811)
@@ -0,0 +1,44 @@
+#!/bin/bash
+#
+# shell script which type checks a byteman rule set
+#
+# usage: bytemancheck -cp classpath script1 . . . scriptN
+#
+BASE=${0%*/bin/bytemancheck.sh}
+CP=${BASE}/build/lib/byteman.jar
+CP=${CP}:${BASE}}/ext/asm-all-3.0.jar
+if [ $1 == "-cp" ] ; then
+  CP=${CP}:$2
+  shift
+  shift
+fi
+
+SCRIPT_OPTS=""
+
+if [ $# -eq 0 ] ; then
+   echo "usage: bytemancheck -cp classpath script1 . . . scriptN"
+   exit
+fi
+
+if [ ${1#-*} != ${1} ]; then
+   echo "usage: bytemancheck -cp classpath script1 . . . scriptN"
+   exit
+fi
+error=0
+while [ $# -ne 0 ]
+do
+  if [ ! -f $1 -o ! -r $1 ] ; then
+    echo "$1 is not a readable file";
+    error=1
+  fi
+  FILES="${FILES} $1";
+  shift
+done
+
+if [ $error -ne 0 ] ; then
+  exit
+fi
+
+# allow for extra java opts via setting BYTEMAN_JAVA_OPTS
+
+java ${BYTEMAN_JAVA_OPTS} -classpath ${CP} org.jboss.byteman.test.TestScript $FILES

Deleted: labs/jbosstm/workspace/adinn/orchestration/bin/toastcheck.sh
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/bin/toastcheck.sh	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/bin/toastcheck.sh	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,44 +0,0 @@
-#!/bin/bash
-#
-# shell script which type checks a TOAST rule set
-#
-# usage: toastcheck -cp classpath script1 . . . scriptN
-#
-BASE=${0%*/bin/toastcheck.sh}
-CP=${BASE}/build/lib/orchestration.jar
-CP=${CP}:${BASE}}/ext/asm-all-3.0.jar
-if [ $1 == "-cp" ] ; then
-  CP=${CP}:$2
-  shift
-  shift
-fi
-
-SCRIPT_OPTS=""
-
-if [ $# -eq 0 ] ; then
-   echo "usage: toastcheck -cp classpath script1 . . . scriptN"
-   exit
-fi
-
-if [ ${1#-*} != ${1} ]; then
-   echo "usage: toastcheck -cp classpath script1 . . . scriptN"
-   exit
-fi
-error=0
-while [ $# -ne 0 ]
-do
-  if [ ! -f $1 -o ! -r $1 ] ; then
-    echo "$1 is not a readable file";
-    error=1
-  fi
-  FILES="${FILES} $1";
-  shift
-done
-
-if [ $error -ne 0 ] ; then
-  exit
-fi
-
-# allow for extra java opts via setting TOAST_JAVA_OPTS
-
-java ${TOAST_JAVA_OPTS} -classpath ${CP} org.jboss.jbossts.orchestration.test.TestScript $FILES

Modified: labs/jbosstm/workspace/adinn/orchestration/build.xml
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/build.xml	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/build.xml	2009-06-03 14:44:19 UTC (rev 26811)
@@ -19,7 +19,7 @@
   @author JBoss Inc.
 -->
 
-<project name="orchestration" default="jar" basedir=".">
+<project name="byteman" default="jar" basedir=".">
 
     <!-- the directory in which your installed app server resides -->
     <property environment="env"/>
@@ -117,21 +117,21 @@
                 <fileset dir="${ext.lib.dir}" includes="${ext.javacup.rt.jars}"/>
             </classpath>
 	    <arg value="-package"/>
-	    <arg value="org.jboss.jbossts.orchestration.rule.grammar"/>
+	    <arg value="org.jboss.byteman.rule.grammar"/>
             <arg value="-parser" />
             <arg value="ECAGrammarParser" />
             <arg value="-nonterms"/>
             <arg value="${dd.grammar.dir}/cup/ECAGrammar.cup"/>
         </java>
-	<delete file="${src.dir}/org/jboss/jbossts/orchestration/rule/grammar/ECATokenLexer.java"/>
-	<delete file="${src.dir}/org/jboss/jbossts/orchestration/rule/grammar/ECAGrammarParser.java"/>
-	<delete file="${src.dir}/org/jboss/jbossts/orchestration/rule/grammar/sym.java"/>
+	<delete file="${src.dir}/org/jboss/byteman/rule/grammar/ECATokenLexer.java"/>
+	<delete file="${src.dir}/org/jboss/byteman/rule/grammar/ECAGrammarParser.java"/>
+	<delete file="${src.dir}/org/jboss/byteman/rule/grammar/sym.java"/>
         <move file="${dd.grammar.dir}/flex/ECATokenLexer.java"
-            tofile="${src.dir}/org/jboss/jbossts/orchestration/rule/grammar/ECATokenLexer.java"/>
+            tofile="${src.dir}/org/jboss/byteman/rule/grammar/ECATokenLexer.java"/>
         <move file="ECAGrammarParser.java"
-            tofile="${src.dir}/org/jboss/jbossts/orchestration/rule/grammar/ECAGrammarParser.java"/>
+            tofile="${src.dir}/org/jboss/byteman/rule/grammar/ECAGrammarParser.java"/>
         <move file="sym.java"
-            tofile="${src.dir}/org/jboss/jbossts/orchestration/rule/grammar/sym.java"/>
+            tofile="${src.dir}/org/jboss/byteman/rule/grammar/sym.java"/>
     </target>
 
     <target name="compile" depends="init">
@@ -150,7 +150,7 @@
 	 -->
          <unjar src="${ext.lib.dir}/javacuprt.jar" dest="${build.classes.dir}"/>
          <unjar src="${ext.lib.dir}/asm-all-3.0.jar" dest="${build.classes.dir}"/>
-         <jar jarfile="${build.lib.dir}/orchestration.jar" manifest="${dd.dir}/META-INF/MANIFEST.MF">
+         <jar jarfile="${build.lib.dir}/byteman.jar" manifest="${dd.dir}/META-INF/MANIFEST.MF">
              <fileset dir="${build.classes.dir}" includes="**/*"/>
          </jar>
     </target>
@@ -161,9 +161,9 @@
     </target>
 
     <target name="TestScript" depends="jar">
-        <java classname="org.jboss.jbossts.orchestration.test.TestScript" fork="true">
+        <java classname="org.jboss.byteman.test.TestScript" fork="true">
             <classpath>
-                <fileset dir="${build.lib.dir}" includes="orchestration.jar"/>
+                <fileset dir="${build.lib.dir}" includes="byteman.jar"/>
                 <pathelement location="${asm.home}/${asm.jar}"/>
                 <!-- xts, jta and jboss as jars-->
                 <fileset dir="${xts.lib.dir}" includes="${xts.lib.jars}"/>
@@ -174,16 +174,16 @@
                 <fileset dir="${jboss.server.deploy.dir}" includes="${jboss.server.deploy.jars}"/>
             </classpath>
 	    <!-- uncomment this to see parser debug output
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.rule.debug=foo"/>
+            <jvmarg value="-Dorg.jboss.jbossts.byteman.rule.debug=foo"/>
 	    -->
 	    <arg value="handler.txt"/>
         </java>
     </target>
 
     <target name="TestScriptDebug" depends="jar">
-        <java classname="org.jboss.jbossts.orchestration.test.TestScript" fork="true">
+        <java classname="org.jboss.byteman.test.TestScript" fork="true">
             <classpath>
-                <fileset dir="${build.lib.dir}" includes="orchestration.jar"/>
+                <fileset dir="${build.lib.dir}" includes="byteman.jar"/>
                 <pathelement location="${asm.home}/${asm.jar}"/>
                 <!-- xts, jta and jboss as jars-->
                 <fileset dir="${xts.lib.dir}" includes="${xts.lib.jars}"/>
@@ -196,7 +196,7 @@
             <jvmarg value="-Xdebug"/>
             <jvmarg value="-Xrunjdwp:transport=dt_socket,server=n,address=5005,suspend=y"/>
 	    <!-- uncomment this to see parser debug output
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.rule.debug=foo"/>
+            <jvmarg value="-Dorg.jboss.jbossts.byteman.rule.debug=foo"/>
 	    -->
 	    <arg value="handler.txt"/>
         </java>

Modified: labs/jbosstm/workspace/adinn/orchestration/dd/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/dd/META-INF/MANIFEST.MF	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/dd/META-INF/MANIFEST.MF	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,3 +1,3 @@
-Premain-Class: org.jboss.jbossts.orchestration.agent.Main
+Premain-Class: org.jboss.byteman.agent.Main
 Can-Redefine-Classes: true
 Can-Retransform-Classes: true

Modified: labs/jbosstm/workspace/adinn/orchestration/dd/grammar/cup/ECAGrammar.cup
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/dd/grammar/cup/ECAGrammar.cup	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/dd/grammar/cup/ECAGrammar.cup	2009-06-03 14:44:19 UTC (rev 26811)
@@ -24,9 +24,9 @@
 
 import java_cup.runtime.*;
 
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.grammar.ParseNode;
 // cannot do this!
-// import static org.jboss.jbossts.orchestration.rule.grammar.ParseNode.*;
+// import static org.jboss.byteman.rule.grammar.ParseNode.*;
 
 /* parser methods to make it easier to access the ParseNode package */
 

Modified: labs/jbosstm/workspace/adinn/orchestration/dd/grammar/flex/ECAToken.flex
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/dd/grammar/flex/ECAToken.flex	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/dd/grammar/flex/ECAToken.flex	2009-06-03 14:44:19 UTC (rev 26811)
@@ -22,10 +22,10 @@
 * @authors Andrew Dinn
 */
 
-package org.jboss.jbossts.orchestration.rule.grammar;
+package org.jboss.byteman.rule.grammar;
 
 import java_cup.runtime.*;
-import org.jboss.jbossts.orchestration.rule.grammar.PrintableSymbol;
+import org.jboss.byteman.rule.grammar.PrintableSymbol;
 
 %%
 

Modified: labs/jbosstm/workspace/adinn/orchestration/dd/scripts/HeuristicSaveAndRecover.txt
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/dd/scripts/HeuristicSaveAndRecover.txt	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/dd/scripts/HeuristicSaveAndRecover.txt	2009-06-03 14:44:19 UTC (rev 26811)
@@ -24,7 +24,7 @@
 # Heuristic Recovery After Delayed Commit in Single JVM
 #
 # This script automates testing of a specific recovery scenario for the
-# JBossTS XTS implementation of the WS-AT 1.1 protocol using orchestration
+# JBossTS XTS implementation of the WS-AT 1.1 protocol using byteman
 # rules. The scenario is as follows:
 #
 # AS boots

Modified: labs/jbosstm/workspace/adinn/orchestration/dd/scripts/HeuristicSaveAndRecover10.txt
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/dd/scripts/HeuristicSaveAndRecover10.txt	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/dd/scripts/HeuristicSaveAndRecover10.txt	2009-06-03 14:44:19 UTC (rev 26811)
@@ -24,7 +24,7 @@
 # Heuristic Recovery After Delayed Commit in Single JVM
 #
 # This script automates testing of a specific recovery scenario for the
-# JBossTS XTS implementation of the WS-AT 1.0 protocol using orchestration
+# JBossTS XTS implementation of the WS-AT 1.0 protocol using byteman
 # rules. The scenario is as follows:
 #
 # AS boots

Modified: labs/jbosstm/workspace/adinn/orchestration/dd/scripts/ParticipantCrashAndRecover.txt
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/dd/scripts/ParticipantCrashAndRecover.txt	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/dd/scripts/ParticipantCrashAndRecover.txt	2009-06-03 14:44:19 UTC (rev 26811)
@@ -24,7 +24,7 @@
 # Participant Recovery with Remote Coordinator
 #
 # This script automates testing of a specific recovery scenario for the
-# JBossTS XTS implementation of the WS-AT 1.1 protocol using orchestration
+# JBossTS XTS implementation of the WS-AT 1.1 protocol using byteman
 # rules. The scenario is as follows:
 #
 # AS1 boots

Modified: labs/jbosstm/workspace/adinn/orchestration/dd/scripts/ParticipantCrashAndRecover10.txt
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/dd/scripts/ParticipantCrashAndRecover10.txt	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/dd/scripts/ParticipantCrashAndRecover10.txt	2009-06-03 14:44:19 UTC (rev 26811)
@@ -24,7 +24,7 @@
 # Participant Recovery with Remote Coordinator
 #
 # This script automates testing of a specific recovery scenario for the
-# JBossTS XTS implementation of the WS-AT 1.0 protocol using orchestration
+# JBossTS XTS implementation of the WS-AT 1.0 protocol using byteman
 # rules. The scenario is as follows:
 #
 # AS1 boots

Modified: labs/jbosstm/workspace/adinn/orchestration/docs/ProgrammersGuide.odt
===================================================================
(Binary files differ)

Modified: labs/jbosstm/workspace/adinn/orchestration/docs/ProgrammersGuide.pdf
===================================================================
(Binary files differ)

Modified: labs/jbosstm/workspace/adinn/orchestration/ext/third_party_licenses.txt
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/ext/third_party_licenses.txt	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/ext/third_party_licenses.txt	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,5 +1,5 @@
 TERMS AND CONDITIONS FOR THIRD PARTY PRODUCTS THAT MAY ACCOMPANY
-JBOSS TOAST
+JBOSS BYTEMAN
 
 THE TERMS AND CONDITIONS APPEARING BELOW APPLY ONLY TO THAT PORTION OF
 THE SOFTWARE THAT IS THE PARTICULAR THIRD PARTY PRODUCT AND DO NOT

Modified: labs/jbosstm/workspace/adinn/orchestration/handler.txt
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/handler.txt	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/handler.txt	2009-06-03 14:44:19 UTC (rev 26811)
@@ -3,7 +3,7 @@
 # Heuristic Recovery After Delayed Commit in Single JVM
 #
 # This script automates testing of a specific recovery scenario for the
-# JBossTS XTS implementation of the WS-AT 1.1 protocol using orchestration
+# JBossTS XTS implementation of the WS-AT 1.1 protocol using byteman
 # rules. The scenario is as follows:
 #
 # AS boots

Copied: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent (from rev 26809, labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent)

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/Location.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/Location.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/Location.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,9 +1,9 @@
-package org.jboss.jbossts.orchestration.agent;
+package org.jboss.byteman.agent;
 
 import org.objectweb.asm.ClassVisitor;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.type.TypeHelper;
-import org.jboss.jbossts.orchestration.agent.adapter.*;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.type.TypeHelper;
+import org.jboss.byteman.agent.adapter.*;
 
 /**
  * Specifies a location in a method at which a rule trigger should be inserted

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/LocationType.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/LocationType.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/LocationType.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,4 +1,4 @@
-package org.jboss.jbossts.orchestration.agent;
+package org.jboss.byteman.agent;
 
 /**
  * enum categorizing types of locations at which rule triggers can be inserted

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/Main.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/Main.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/Main.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,7 +21,7 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.agent;
+package org.jboss.byteman.agent;
 
 
 import java.lang.instrument.Instrumentation;
@@ -33,7 +33,7 @@
 import java.io.FileInputStream;
 
 /**
- * agent class supplied at JVM startup to install orchestration package bytecode transformer
+ * agent class supplied at JVM startup to install byteman package bytecode transformer
  */
 public class Main {
     public static void premain(String args, Instrumentation inst)
@@ -49,7 +49,7 @@
                 } else if (arg.startsWith(SCRIPT_PREFIX)) {
                     scriptPaths.add(arg.substring(SCRIPT_PREFIX.length(), arg.length()));
                 } else {
-                    System.err.println("org.jboss.jbossts.orchestration.agent.Main:\n" +
+                    System.err.println("org.jboss.byteman.agent.Main:\n" +
                             "  illegal agent argument : " + arg + "\n" +
                             "  valid arguments are boot:<path-to-jar> or script:<path-to-scriptr>");
                 }
@@ -64,7 +64,7 @@
                 JarFile jarfile = new JarFile(new File(bootJarPath));
                 // inst.appendToBootstrapClassLoaderSearch(jarfile);
             } catch (IOException ioe) {
-                System.err.println("org.jboss.jbossts.orchestration.agent.Main: unable to open boot jar file : " + bootJarPath);
+                System.err.println("org.jboss.byteman.agent.Main: unable to open boot jar file : " + bootJarPath);
                 throw ioe;
             }
         }
@@ -83,7 +83,7 @@
                 String ruleScript = new String(bytes);
                 scripts.add(ruleScript);
             } catch (IOException ioe) {
-                System.err.println("org.jboss.jbossts.orchestration.agent.Main: unable to read rule script file : " + scriptPath);
+                System.err.println("org.jboss.byteman.agent.Main: unable to read rule script file : " + scriptPath);
                 throw ioe;
             }
         }

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/Script.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/Script.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/Script.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,4 +1,4 @@
-package org.jboss.jbossts.orchestration.agent;
+package org.jboss.byteman.agent;
 
 /**
  * information about a single rule derived from a rule script

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/Transformer.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/Transformer.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/Transformer.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,16 +21,15 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.agent;
+package org.jboss.byteman.agent;
 
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.type.TypeHelper;
-import org.jboss.jbossts.orchestration.rule.exception.ParseException;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.agent.adapter.RuleTriggerAdapter;
-import org.jboss.jbossts.orchestration.agent.adapter.RuleCheckAdapter;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.type.TypeHelper;
+import org.jboss.byteman.rule.exception.ParseException;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.agent.adapter.RuleTriggerAdapter;
+import org.jboss.byteman.agent.adapter.RuleCheckAdapter;
 import org.objectweb.asm.*;
-import org.objectweb.asm.commons.EmptyVisitor;
 
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.IllegalClassFormatException;
@@ -45,7 +44,7 @@
 import java.io.File;
 
 /**
- * byte code transformer used to introduce orchestration events into JBoss code
+ * byte code transformer used to introduce byteman events into JBoss code
  */
 public class Transformer implements ClassFileTransformer {
 
@@ -104,7 +103,7 @@
                         name = line.substring(5).trim();
                     } else if (!inRule) {
                         if (!line.trim().equals("")) {
-                            throw new Exception("org.jboss.jbossts.orchestration.agent.Transformer : invalid text outside of RULE/ENDRULE " + "at line " + lineNumber + " in script " + file);
+                            throw new Exception("org.jboss.byteman.agent.Transformer : invalid text outside of RULE/ENDRULE " + "at line " + lineNumber + " in script " + file);
                         }
                     } else if (line.startsWith("CLASS ")) {
                         targetClass = line.substring(6).trim();
@@ -116,15 +115,15 @@
                         String parameters = LocationType.parameterText(line);
                         targetLocation = Location.create(locationType, parameters);
                         if (targetLocation == null) {
-                            throw new Exception("org.jboss.jbossts.orchestration.agent.Transformer : invalid target location at line " + lineNumber + " in script " + scriptPaths.get(scriptIdx));
+                            throw new Exception("org.jboss.byteman.agent.Transformer : invalid target location at line " + lineNumber + " in script " + scriptPaths.get(scriptIdx));
                         }
                     } else if (line.startsWith("ENDRULE")) {
                         if (name == null) {
-                            throw new Exception("org.jboss.jbossts.orchestration.agent.Transformer : no matching RULE for ENDRULE at line " + lineNumber + " in script " + scriptPaths.get(scriptIdx));
+                            throw new Exception("org.jboss.byteman.agent.Transformer : no matching RULE for ENDRULE at line " + lineNumber + " in script " + scriptPaths.get(scriptIdx));
                         } else if (targetClass == null) {
-                            throw new Exception("org.jboss.jbossts.orchestration.agent.Transformer : no CLASS for RULE  " + name + " in script " + scriptPaths.get(scriptIdx));
+                            throw new Exception("org.jboss.byteman.agent.Transformer : no CLASS for RULE  " + name + " in script " + scriptPaths.get(scriptIdx));
                         } else if (targetMethod == null) {
-                            throw new Exception("org.jboss.jbossts.orchestration.agent.Transformer : no METHOD for RULE  " + name + " in script " + scriptPaths.get(scriptIdx));
+                            throw new Exception("org.jboss.byteman.agent.Transformer : no METHOD for RULE  " + name + " in script " + scriptPaths.get(scriptIdx));
                         } else {
                             List<Script> scripts = targetToScriptMap.get(targetClass);
                             if (scripts == null) {
@@ -160,7 +159,7 @@
                         sepr = "";
                         inRule = false;
                     } else if (lineNumber == maxLines && !nextRule.trim().equals("")) {
-                            throw new Exception("org.jboss.jbossts.orchestration.agent.Transformer : no matching ENDRULE for RULE " + name + " in script " + scriptPaths.get(scriptIdx));
+                            throw new Exception("org.jboss.byteman.agent.Transformer : no matching ENDRULE for RULE " + name + " in script " + scriptPaths.get(scriptIdx));
                     } else {
                         if (startNumber < 0) {
                             startNumber = lineNumber;
@@ -238,10 +237,10 @@
     {
         byte[] newBuffer = classfileBuffer;
         // we only transform certain classes -- in  particular, we exclude bootstrap classes whose loader is null
-        // and we exclude orchestration classes
+        // and we exclude byteman classes
         String internalClassName = TypeHelper.internalizeClass(className);
 
-        if (loader == null || isOrchestrationClass(internalClassName) || !isTransformable(internalClassName)) {
+        if (loader == null || isBytemanClass(internalClassName) || !isTransformable(internalClassName)) {
             return null;
         }
 
@@ -338,14 +337,14 @@
     /* switches controlling behaviour of transformer */
 
     /**
-     * prefix for orchestration package
+     * prefix for byteman package
      */
-    private static final String ORCHESTRATION_PACKAGE_PREFIX = "org.jboss.jbossts.orchestration.";
+    private static final String BYTEMAN_PACKAGE_PREFIX = "org.jboss.byteman.";
 
     /**
-     * prefix for orchestration test package
+     * prefix for byteman test package
      */
-    private static final String ORCHESTRATION_TEST_PACKAGE_PREFIX = "org.jboss.jbossts.orchestration.tests.";
+    private static final String BYTEMAN_TEST_PACKAGE_PREFIX = "org.jboss.byteman.tests.";
 
     /**
      * prefix for com.arjuna package
@@ -365,30 +364,30 @@
     /**
      * system property set (to any value) in order to switch on dumping of generated bytecode to .class files
      */
-    public static final String VERBOSE = ORCHESTRATION_PACKAGE_PREFIX + "verbose";
+    public static final String VERBOSE = BYTEMAN_PACKAGE_PREFIX + "verbose";
 
     /**
      * system property set (to any value) in order to switch on debug statements in the default Helper
      */
 
-    public static final String DEBUG = ORCHESTRATION_PACKAGE_PREFIX + "debug";
+    public static final String DEBUG = BYTEMAN_PACKAGE_PREFIX + "debug";
     /**
      * system property set (to any value) in order to switch on compilation of rules and left unset
      * if rules are to be interpreted.
      */
-    public static final String COMPILE_TO_BYTECODE = ORCHESTRATION_PACKAGE_PREFIX + "compileToBytecode";
+    public static final String COMPILE_TO_BYTECODE = BYTEMAN_PACKAGE_PREFIX + "compileToBytecode";
 
     /**
      * system property set (to any value) in order to switch on dumping of generated bytecode to .class files
      */
-    public static final String DUMP_GENERATED_CLASSES = ORCHESTRATION_PACKAGE_PREFIX + "dump.generated.classes";
+    public static final String DUMP_GENERATED_CLASSES = BYTEMAN_PACKAGE_PREFIX + "dump.generated.classes";
 
     /* implementation */
 
     /**
      * system property identifying directory in which to dump generated bytecode .class files
      */
-    public static final String DUMP_GENERATED_CLASSES_DIR = ORCHESTRATION_PACKAGE_PREFIX + "dump.generated.classes.directory";
+    public static final String DUMP_GENERATED_CLASSES_DIR = BYTEMAN_PACKAGE_PREFIX + "dump.generated.classes.directory";
 
     private byte[] transform(Script script, ClassLoader loader, String className, Class classBeingRedefined, byte[] targetClassBytes)
     {
@@ -403,11 +402,11 @@
             try {
                 helperClass = loader.loadClass(helperName);
             } catch (ClassNotFoundException e) {
-                System.out.println("org.jboss.jbossts.orchestration.agent.Transformer : unknown helper class " + helperName + " for rule " + script.getName());
+                System.out.println("org.jboss.byteman.agent.Transformer : unknown helper class " + helperName + " for rule " + script.getName());
             }
         }
         if (isVerbose()) {
-            System.out.println("org.jboss.jbossts.orchestration.agent.Transformer : Inserting trigger event");
+            System.out.println("org.jboss.byteman.agent.Transformer : Inserting trigger event");
             System.out.println("  class " + handlerClass);
             System.out.println("  method " + handlerMethod);
             System.out.println("  " + handlerLocation);
@@ -417,13 +416,13 @@
         try {
             rule = Rule.create(ruleName, handlerClass, handlerMethod, helperClass, handlerLocation, script.getRuleText(), lineNumber, file, loader);
         } catch (ParseException pe) {
-            System.out.println("org.jboss.jbossts.orchestration.agent.Transformer : error parsing rule " + ruleName + " : " + pe);
+            System.out.println("org.jboss.byteman.agent.Transformer : error parsing rule " + ruleName + " : " + pe);
             return targetClassBytes;
         } catch (TypeException te) {
-            System.out.println("org.jboss.jbossts.orchestration.agent.Transformer : error checking rule " + ruleName + " : " + te);
+            System.out.println("org.jboss.byteman.agent.Transformer : error checking rule " + ruleName + " : " + te);
             return targetClassBytes;
         } catch (Throwable th) {
-            System.out.println("org.jboss.jbossts.orchestration.agent.Transformer : error processing rule " + ruleName + " : " + th);
+            System.out.println("org.jboss.byteman.agent.Transformer : error processing rule " + ruleName + " : " + th);
             return targetClassBytes;
         }
         if (isVerbose()) {
@@ -444,7 +443,7 @@
         try {
             cr.accept(checkAdapter, 0);
         } catch (Throwable th) {
-            System.out.println("org.jboss.jbossts.orchestration.agent.Transformer : error applying rule " + rule.getName() + " to class " + className + th);
+            System.out.println("org.jboss.byteman.agent.Transformer : error applying rule " + rule.getName() + " to class " + className + th);
             th.printStackTrace(System.out);
             return targetClassBytes;
         }
@@ -459,7 +458,7 @@
             try {
                 cr.accept(adapter, 0);
             } catch (Throwable th) {
-                System.out.println("org.jboss.jbossts.orchestration.agent.Transformer : error compiling rule " + rule.getName() + " for class " + className + th);
+                System.out.println("org.jboss.byteman.agent.Transformer : error compiling rule " + rule.getName() + " for class " + className + th);
                 th.printStackTrace(System.out);
                 return targetClassBytes;
             }
@@ -471,13 +470,13 @@
     }
 
     /**
-     * test whether a class with a given name is located in the orchestration package
+     * test whether a class with a given name is located in the byteman package
      * @param className
-     * @return true if a class is located in the orchestration package otherwise return false
+     * @return true if a class is located in the byteman package otherwise return false
      */
-    private boolean isOrchestrationClass(String className)
+    private boolean isBytemanClass(String className)
     {
-        return className.startsWith(ORCHESTRATION_PACKAGE_PREFIX) && !className.startsWith(ORCHESTRATION_TEST_PACKAGE_PREFIX);
+        return className.startsWith(BYTEMAN_PACKAGE_PREFIX) && !className.startsWith(BYTEMAN_TEST_PACKAGE_PREFIX);
     }
 
     /**
@@ -590,11 +589,11 @@
         String prefix = (dotIdx > 0 ? fullName.substring(0, dotIdx) : "");
         String dir = dumpGeneratedClassesDir + File.separator + prefix.replaceAll("\\.", File.separator);
         if (!ensureDumpDirectory(dir)) {
-            System.out.println("org.jboss.jbossts.orchestration.agent.Transformer : Cannot dump transformed bytes to directory " + dir + File.separator + prefix);
+            System.out.println("org.jboss.byteman.agent.Transformer : Cannot dump transformed bytes to directory " + dir + File.separator + prefix);
             return;
         }
         name = dir + File.separator + name + ".class";
-        System.out.println("org.jboss.jbossts.orchestration.agent.Transformer : Saving transformed bytes to " + name);
+        System.out.println("org.jboss.byteman.agent.Transformer : Saving transformed bytes to " + name);
         try {
             FileOutputStream fio = new FileOutputStream(name);
             fio.write(bytes);

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/AccessCheckAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/AccessCheckAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/AccessCheckAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,15 +21,12 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
 import org.objectweb.asm.*;
-import org.jboss.jbossts.orchestration.agent.Location;
-import org.jboss.jbossts.orchestration.rule.Rule;
+import org.jboss.byteman.agent.Location;
+import org.jboss.byteman.rule.Rule;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * asm Adapter class used to check that the target method for a rule exists in a class
  */

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/AccessTriggerAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/AccessTriggerAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/AccessTriggerAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,12 +21,12 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.type.TypeHelper;
-import org.jboss.jbossts.orchestration.agent.Location;
-import org.jboss.jbossts.orchestration.agent.Transformer;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.type.TypeHelper;
+import org.jboss.byteman.agent.Location;
+import org.jboss.byteman.agent.Transformer;
 import org.objectweb.asm.*;
 import org.objectweb.asm.commons.Method;
 
@@ -113,7 +113,7 @@
                 if (!latched && visitedCount == count) {
                     rule.setTypeInfo(targetClass, access, name, descriptor, exceptions);
                     String key = rule.getKey();
-                    Type ruleType = Type.getType(TypeHelper.externalizeType("org.jboss.jbossts.orchestration.rule.Rule"));
+                    Type ruleType = Type.getType(TypeHelper.externalizeType("org.jboss.byteman.rule.Rule"));
                     Method method = Method.getMethod("void execute(String, Object, Object[])");
                     // we are at the relevant line in the method -- so add a trigger call here
                     if (Transformer.isVerbose()) {

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/ExitCheckAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/ExitCheckAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/ExitCheckAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,10 +1,7 @@
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
 import org.objectweb.asm.*;
-import org.objectweb.asm.commons.Method;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.type.TypeHelper;
-import org.jboss.jbossts.orchestration.agent.Transformer;
+import org.jboss.byteman.rule.Rule;
 
 import java.util.Vector;
 
@@ -84,7 +81,7 @@
             // check whether type is one of ours and if so add the labels to the
             // return table
 
-            if (type.equals("org/jboss/jbossts/orchestration/rule/exception/EarlyReturnException")) {
+            if (type.equals("org/jboss/byteman/rule/exception/EarlyReturnException")) {
                 earlyReturnHandlers.add(handler);
             }
             super.visitTryCatchBlock(start, end, handler, type);

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/ExitTriggerAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/ExitTriggerAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/ExitTriggerAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,11 +1,10 @@
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
 import org.objectweb.asm.*;
 import org.objectweb.asm.commons.Method;
-import org.objectweb.asm.commons.GeneratorAdapter;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.type.TypeHelper;
-import org.jboss.jbossts.orchestration.agent.Transformer;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.type.TypeHelper;
+import org.jboss.byteman.agent.Transformer;
 
 import java.util.Vector;
 
@@ -86,7 +85,7 @@
             // check whether type is one of ours and if so add the labels to the
             // return table
 
-            if (type.equals("org/jboss/jbossts/orchestration/rule/exception/EarlyReturnException")) {
+            if (type.equals("org/jboss/byteman/rule/exception/EarlyReturnException")) {
                 earlyReturnHandlers.add(handler);
             }
             super.visitTryCatchBlock(start, end, handler, type);
@@ -128,7 +127,7 @@
                         // ok to insert a rule trigger as this is not one of our inserted return instructions
                         rule.setTypeInfo(targetClass, access, name, descriptor, exceptions);
                         String key = rule.getKey();
-                        Type ruleType = Type.getType(TypeHelper.externalizeType("org.jboss.jbossts.orchestration.rule.Rule"));
+                        Type ruleType = Type.getType(TypeHelper.externalizeType("org.jboss.byteman.rule.Rule"));
                         Method method = Method.getMethod("void execute(String, Object, Object[])");
                         // we are at the relevant line in the method -- so add a trigger call here
                         if (Transformer.isVerbose()) {

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/InvokeCheckAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/InvokeCheckAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/InvokeCheckAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,15 +21,12 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
 import org.objectweb.asm.*;
-import org.jboss.jbossts.orchestration.rule.type.TypeHelper;
-import org.jboss.jbossts.orchestration.rule.Rule;
+import org.jboss.byteman.rule.type.TypeHelper;
+import org.jboss.byteman.rule.Rule;
 
-import java.util.List;
-import java.util.ArrayList;
-
 /**
  * asm Adapter class used to check that the target method for a rule exists in a class
  */

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/InvokeTriggerAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/InvokeTriggerAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/InvokeTriggerAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,13 +21,12 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.type.TypeHelper;
-import org.jboss.jbossts.orchestration.agent.Transformer;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.type.TypeHelper;
+import org.jboss.byteman.agent.Transformer;
 import org.objectweb.asm.*;
-import org.objectweb.asm.commons.GeneratorAdapter;
 import org.objectweb.asm.commons.Method;
 
 /**
@@ -98,7 +97,7 @@
         }
 
         // somewhere we need to add a catch exception block
-        // super.catchException(startLabel, endLabel, new Type("org.jboss.jbossts.orchestration.rule.exception.ExecuteException")));
+        // super.catchException(startLabel, endLabel, new Type("org.jboss.byteman.rule.exception.ExecuteException")));
 
         public void visitMethodInsn(
             final int opcode,
@@ -116,7 +115,7 @@
                 if (!latched && visitedCount == count) {
                     rule.setTypeInfo(targetClass, access, name, descriptor, exceptions);
                     String key = rule.getKey();
-                    Type ruleType = Type.getType(TypeHelper.externalizeType("org.jboss.jbossts.orchestration.rule.Rule"));
+                    Type ruleType = Type.getType(TypeHelper.externalizeType("org.jboss.byteman.rule.Rule"));
                     Method method = Method.getMethod("void execute(String, Object, Object[])");
                     // we are at the relevant line in the method -- so add a trigger call here
                     if (Transformer.isVerbose()) {

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/LineCheckAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/LineCheckAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/LineCheckAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,10 +21,10 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
 import org.objectweb.asm.*;
-import org.jboss.jbossts.orchestration.rule.Rule;
+import org.jboss.byteman.rule.Rule;
 
 /**
  * asm Adapter class used to check that the target method for a rule exists in a class

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/LineTriggerAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/LineTriggerAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/LineTriggerAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,13 +21,12 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.type.TypeHelper;
-import org.jboss.jbossts.orchestration.agent.Transformer;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.type.TypeHelper;
+import org.jboss.byteman.agent.Transformer;
 import org.objectweb.asm.*;
-import org.objectweb.asm.commons.GeneratorAdapter;
 import org.objectweb.asm.commons.Method;
 
 /**
@@ -89,13 +88,13 @@
         }
 
         // somewhere we need to add a catch exception block
-        // super.catchException(startLabel, endLabel, new Type("org.jboss.jbossts.orchestration.rule.exception.ExecuteException")));
+        // super.catchException(startLabel, endLabel, new Type("org.jboss.byteman.rule.exception.ExecuteException")));
 
         public void visitLineNumber(final int line, final Label start) {
             if (unlatched && !visitedLine && (targetLine <= line)) {
                 rule.setTypeInfo(targetClass, access, name, descriptor, exceptions);
                 String key = rule.getKey();
-                Type ruleType = Type.getType(TypeHelper.externalizeType("org.jboss.jbossts.orchestration.rule.Rule"));
+                Type ruleType = Type.getType(TypeHelper.externalizeType("org.jboss.byteman.rule.Rule"));
                 Method method = Method.getMethod("void execute(String, Object, Object[])");
                 // we are at the relevant line in the method -- so add a trigger call here
                 if (Transformer.isVerbose()) {

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/OpcodesHelper.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/OpcodesHelper.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/OpcodesHelper.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,4 +1,4 @@
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
 import org.objectweb.asm.Opcodes;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/RuleAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,10 +21,10 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
-import org.jboss.jbossts.orchestration.rule.type.TypeHelper;
-import org.jboss.jbossts.orchestration.rule.Rule;
+import org.jboss.byteman.rule.type.TypeHelper;
+import org.jboss.byteman.rule.Rule;
 import org.objectweb.asm.*;
 
 /**

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleCheckAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/RuleCheckAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleCheckAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,10 +21,10 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
 import org.objectweb.asm.*;
-import org.jboss.jbossts.orchestration.rule.Rule;
+import org.jboss.byteman.rule.Rule;
 
 /**
  * asm Adapter class used to check that the target method for a rule exists in a class

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleCheckMethodAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/RuleCheckMethodAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleCheckMethodAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,13 +1,13 @@
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Opcodes;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.binding.Bindings;
-import org.jboss.jbossts.orchestration.rule.binding.Binding;
-import org.jboss.jbossts.orchestration.agent.Transformer;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.binding.Bindings;
+import org.jboss.byteman.rule.binding.Binding;
+import org.jboss.byteman.agent.Transformer;
 
 import java.util.*;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleGeneratorAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/RuleGeneratorAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleGeneratorAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -27,7 +27,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
 import java.util.ArrayList;
 import java.util.Arrays;

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleMethodAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/RuleMethodAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleMethodAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,10 +1,8 @@
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
-import org.objectweb.asm.commons.GeneratorAdapter;
-import org.objectweb.asm.commons.LocalVariablesSorter;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Label;
-import org.jboss.jbossts.orchestration.rule.Rule;
+import org.jboss.byteman.rule.Rule;
 
 import java.util.LinkedList;
 import java.util.HashMap;

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleTriggerAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/RuleTriggerAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleTriggerAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,9 +21,9 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
-import org.jboss.jbossts.orchestration.rule.Rule;
+import org.jboss.byteman.rule.Rule;
 import org.objectweb.asm.*;
 
 /**

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleTriggerMethodAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/RuleTriggerMethodAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/RuleTriggerMethodAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,16 +1,16 @@
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.commons.Method;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.type.TypeHelper;
-import org.jboss.jbossts.orchestration.rule.binding.Bindings;
-import org.jboss.jbossts.orchestration.rule.binding.Binding;
-import org.jboss.jbossts.orchestration.agent.adapter.cfg.*;
-import org.jboss.jbossts.orchestration.agent.Transformer;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.type.TypeHelper;
+import org.jboss.byteman.rule.binding.Bindings;
+import org.jboss.byteman.rule.binding.Binding;
+import org.jboss.byteman.agent.adapter.cfg.*;
+import org.jboss.byteman.agent.Transformer;
 
 import java.util.*;
 import java.io.PrintStream;
@@ -142,9 +142,9 @@
 
     private CFG cfg;
 
-    private final static Type EXECUTE_EXCEPTION_TYPE = Type.getType(TypeHelper.externalizeType("org.jboss.jbossts.orchestration.rule.exception.ExecuteException"));
-    private final static Type EARLY_RETURN_EXCEPTION_TYPE = Type.getType(TypeHelper.externalizeType("org.jboss.jbossts.orchestration.rule.exception.EarlyReturnException"));
-    private final static Type THROW_EXCEPTION_TYPE = Type.getType(TypeHelper.externalizeType("org.jboss.jbossts.orchestration.rule.exception.ThrowException"));
+    private final static Type EXECUTE_EXCEPTION_TYPE = Type.getType(TypeHelper.externalizeType("org.jboss.byteman.rule.exception.ExecuteException"));
+    private final static Type EARLY_RETURN_EXCEPTION_TYPE = Type.getType(TypeHelper.externalizeType("org.jboss.byteman.rule.exception.EarlyReturnException"));
+    private final static Type THROW_EXCEPTION_TYPE = Type.getType(TypeHelper.externalizeType("org.jboss.byteman.rule.exception.ThrowException"));
     private final static String EXECUTE_EXCEPTION_TYPE_NAME = EXECUTE_EXCEPTION_TYPE.getInternalName();
     private final static String EARLY_RETURN_EXCEPTION_TYPE_NAME = EARLY_RETURN_EXCEPTION_TYPE.getInternalName();
     private final static String THROW_EXCEPTION_TYPE_NAME = THROW_EXCEPTION_TYPE.getInternalName();

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/SynchronizeCheckAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/SynchronizeCheckAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/SynchronizeCheckAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,15 +21,11 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
 import org.objectweb.asm.*;
-import org.jboss.jbossts.orchestration.rule.type.TypeHelper;
-import org.jboss.jbossts.orchestration.rule.Rule;
+import org.jboss.byteman.rule.Rule;
 
-import java.util.List;
-import java.util.ArrayList;
-
 /**
  * asm Adapter class used to check that the target method for a rule exists in a class
  */

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/SynchronizeTriggerAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/SynchronizeTriggerAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/SynchronizeTriggerAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,13 +21,12 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.type.TypeHelper;
-import org.jboss.jbossts.orchestration.agent.Transformer;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.type.TypeHelper;
+import org.jboss.byteman.agent.Transformer;
 import org.objectweb.asm.*;
-import org.objectweb.asm.commons.GeneratorAdapter;
 import org.objectweb.asm.commons.Method;
 
 /**
@@ -89,7 +88,7 @@
         }
 
         // somewhere we need to add a catch exception block
-        // super.catchException(startLabel, endLabel, new Type("org.jboss.jbossts.orchestration.rule.exception.ExecuteException")));
+        // super.catchException(startLabel, endLabel, new Type("org.jboss.byteman.rule.exception.ExecuteException")));
 
         @Override
         public void visitInsn(int opcode) {
@@ -102,7 +101,7 @@
                 if (visitedCount == count) {
                     rule.setTypeInfo(targetClass, access, name, descriptor, exceptions);
                     String key = rule.getKey();
-                    Type ruleType = Type.getType(TypeHelper.externalizeType("org.jboss.jbossts.orchestration.rule.Rule"));
+                    Type ruleType = Type.getType(TypeHelper.externalizeType("org.jboss.byteman.rule.Rule"));
                     Method method = Method.getMethod("void execute(String, Object, Object[])");
                     // we are at the relevant line in the method -- so add a trigger call here
                     if (Transformer.isVerbose()) {

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/ThrowCheckAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/ThrowCheckAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/ThrowCheckAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,15 +21,11 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
 import org.objectweb.asm.*;
-import org.jboss.jbossts.orchestration.rule.type.TypeHelper;
-import org.jboss.jbossts.orchestration.rule.Rule;
+import org.jboss.byteman.rule.Rule;
 
-import java.util.List;
-import java.util.ArrayList;
-
 /**
  * asm Adapter class used to check that the target method for a rule exists in a class
  */

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/ThrowTriggerAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/ThrowTriggerAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/ThrowTriggerAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,20 +21,14 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.agent.adapter;
+package org.jboss.byteman.agent.adapter;
 
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.type.TypeHelper;
-import org.jboss.jbossts.orchestration.agent.Transformer;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.type.TypeHelper;
+import org.jboss.byteman.agent.Transformer;
 import org.objectweb.asm.*;
-import org.objectweb.asm.commons.GeneratorAdapter;
 import org.objectweb.asm.commons.Method;
-import com.sun.org.apache.bcel.internal.generic.MONITOREXIT;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.LinkedList;
-
 /**
  * asm Adapter class used to add a rule event trigger call to a method of some given class
  */
@@ -110,7 +104,7 @@
                         if (!latched && visitedCount == count) {
                             rule.setTypeInfo(targetClass, access, name, descriptor, exceptions);
                             String key = rule.getKey();
-                            Type ruleType = Type.getType(TypeHelper.externalizeType("org.jboss.jbossts.orchestration.rule.Rule"));
+                            Type ruleType = Type.getType(TypeHelper.externalizeType("org.jboss.byteman.rule.Rule"));
                             Method method = Method.getMethod("void execute(String, Object, Object[])");
                             // we are at the relevant line in the method -- so add a trigger call here
                             if (Transformer.isVerbose()) {

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/BBlock.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/cfg/BBlock.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/BBlock.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,8 +1,8 @@
-package org.jboss.jbossts.orchestration.agent.adapter.cfg;
+package org.jboss.byteman.agent.adapter.cfg;
 
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Opcodes;
-import org.jboss.jbossts.orchestration.agent.adapter.OpcodesHelper;
+import org.jboss.byteman.agent.adapter.OpcodesHelper;
 
 import java.util.List;
 import java.util.LinkedList;

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/CFG.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/cfg/CFG.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/CFG.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,8 +1,8 @@
-package org.jboss.jbossts.orchestration.agent.adapter.cfg;
+package org.jboss.byteman.agent.adapter.cfg;
 
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Opcodes;
-import org.jboss.jbossts.orchestration.agent.Transformer;
+import org.jboss.byteman.agent.Transformer;
 
 import java.util.*;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/CodeLocation.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/cfg/CodeLocation.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/CodeLocation.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,4 +1,4 @@
-package org.jboss.jbossts.orchestration.agent.adapter.cfg;
+package org.jboss.byteman.agent.adapter.cfg;
 
 /**
  * a reference to a specific instruction location in a given BBlock

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/InstructionSequence.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/cfg/InstructionSequence.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/InstructionSequence.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,6 +1,6 @@
-package org.jboss.jbossts.orchestration.agent.adapter.cfg;
+package org.jboss.byteman.agent.adapter.cfg;
 
-import org.jboss.jbossts.orchestration.agent.adapter.OpcodesHelper;
+import org.jboss.byteman.agent.adapter.OpcodesHelper;
 
 /**
  * Class used to hold a sequence of instructions within a basic block

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/Link.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/cfg/Link.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/Link.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,4 +1,4 @@
-package org.jboss.jbossts.orchestration.agent.adapter.cfg;
+package org.jboss.byteman.agent.adapter.cfg;
 
 import org.objectweb.asm.Label;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/TriggerDetails.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/cfg/TriggerDetails.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/TriggerDetails.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,9 +1,7 @@
-package org.jboss.jbossts.orchestration.agent.adapter.cfg;
+package org.jboss.byteman.agent.adapter.cfg;
 
 import org.objectweb.asm.Label;
 
-import java.util.LinkedList;
-
 /**
  * auxiliary used by CFG to store details of a specific trigger insertion point
  */

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/TryCatchDetails.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/agent/adapter/cfg/TryCatchDetails.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/agent/adapter/cfg/TryCatchDetails.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,4 +1,4 @@
-package org.jboss.jbossts.orchestration.agent.adapter.cfg;
+package org.jboss.byteman.agent.adapter.cfg;
 
 import org.objectweb.asm.Label;
 

Copied: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule (from rev 26809, labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule)

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/Action.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/Action.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/Action.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,24 +21,23 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule;
+package org.jboss.byteman.rule;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.expression.ExpressionHelper;
-import org.jboss.jbossts.orchestration.rule.expression.Expression;
-import org.jboss.jbossts.orchestration.rule.expression.ReturnExpression;
-import org.jboss.jbossts.orchestration.rule.expression.ThrowExpression;
-import org.jboss.jbossts.orchestration.rule.grammar.ECATokenLexer;
-import org.jboss.jbossts.orchestration.rule.grammar.ECAGrammarParser;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
-import static org.jboss.jbossts.orchestration.rule.grammar.ParseNode.*;
-import org.jboss.jbossts.orchestration.rule.exception.ParseException;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.helper.InterpretedHelper;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.expression.ExpressionHelper;
+import org.jboss.byteman.rule.expression.Expression;
+import org.jboss.byteman.rule.expression.ReturnExpression;
+import org.jboss.byteman.rule.expression.ThrowExpression;
+import org.jboss.byteman.rule.grammar.ECATokenLexer;
+import org.jboss.byteman.rule.grammar.ECAGrammarParser;
+import org.jboss.byteman.rule.grammar.ParseNode;
+import static org.jboss.byteman.rule.grammar.ParseNode.*;
+import org.jboss.byteman.rule.exception.ParseException;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.compiler.StackHeights;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 
@@ -77,7 +76,7 @@
             Action action = new Action(rule, actionTree);
             return action;
         } catch (Exception e) {
-            throw new ParseException("org.jboss.jbossts.orchestration.rule.Action : error parsing action\n" + text);
+            throw new ParseException("org.jboss.byteman.rule.Action : error parsing action\n" + text);
         }
     }
     protected Action(Rule rule, ParseNode actionTree) throws TypeException

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/Condition.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/Condition.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/Condition.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,21 +21,20 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule;
+package org.jboss.byteman.rule;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.expression.ExpressionHelper;
-import org.jboss.jbossts.orchestration.rule.expression.Expression;
-import org.jboss.jbossts.orchestration.rule.grammar.ECATokenLexer;
-import org.jboss.jbossts.orchestration.rule.grammar.ECAGrammarParser;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
-import org.jboss.jbossts.orchestration.rule.exception.ParseException;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.helper.InterpretedHelper;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.expression.ExpressionHelper;
+import org.jboss.byteman.rule.expression.Expression;
+import org.jboss.byteman.rule.grammar.ECATokenLexer;
+import org.jboss.byteman.rule.grammar.ECAGrammarParser;
+import org.jboss.byteman.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.exception.ParseException;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.compiler.StackHeights;
 import org.objectweb.asm.MethodVisitor;
 
 import java.io.StringWriter;
@@ -68,7 +67,7 @@
             Condition condition = new Condition(rule, conditionTree);
             return condition;
         } catch (Exception e) {
-            throw new ParseException("org.jboss.jbossts.orchestration.rule.Condition : error parsing condition\n" + text, e);
+            throw new ParseException("org.jboss.byteman.rule.Condition : error parsing condition\n" + text, e);
         }
     }
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/Event.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/Event.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/Event.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,27 +21,24 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule;
+package org.jboss.byteman.rule;
 
-import org.jboss.jbossts.orchestration.rule.binding.Bindings;
-import org.jboss.jbossts.orchestration.rule.binding.Binding;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
-import static org.jboss.jbossts.orchestration.rule.grammar.ParseNode.*;
-import org.jboss.jbossts.orchestration.rule.grammar.ECATokenLexer;
-import org.jboss.jbossts.orchestration.rule.grammar.ECAGrammarParser;
-import org.jboss.jbossts.orchestration.rule.expression.Expression;
-import org.jboss.jbossts.orchestration.rule.expression.ExpressionHelper;
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.ParseException;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.helper.InterpretedHelper;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.agent.adapter.RuleAdapter;
+import org.jboss.byteman.rule.binding.Bindings;
+import org.jboss.byteman.rule.binding.Binding;
+import org.jboss.byteman.rule.grammar.ParseNode;
+import static org.jboss.byteman.rule.grammar.ParseNode.*;
+import org.jboss.byteman.rule.grammar.ECATokenLexer;
+import org.jboss.byteman.rule.grammar.ECAGrammarParser;
+import org.jboss.byteman.rule.expression.Expression;
+import org.jboss.byteman.rule.expression.ExpressionHelper;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.ParseException;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.compiler.StackHeights;
 import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -80,7 +77,7 @@
             Event event = new Event(rule, eventTree);
             return event;
         } catch (Exception e) {
-            throw new ParseException("org.jboss.jbossts.orchestration.rule.Event : error parsing event\n" + text, e);
+            throw new ParseException("org.jboss.byteman.rule.Event : error parsing event\n" + text, e);
         }
     }
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/Rule.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/Rule.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/Rule.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,25 +21,25 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule;
+package org.jboss.byteman.rule;
 
-import org.jboss.jbossts.orchestration.rule.type.TypeGroup;
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.*;
-import org.jboss.jbossts.orchestration.rule.binding.Bindings;
-import org.jboss.jbossts.orchestration.rule.binding.Binding;
-import org.jboss.jbossts.orchestration.rule.grammar.ECATokenLexer;
-import org.jboss.jbossts.orchestration.rule.grammar.ECAGrammarParser;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.helper.Helper;
-import org.jboss.jbossts.orchestration.rule.helper.InterpretedHelper;
-import org.jboss.jbossts.orchestration.agent.Location;
-import org.jboss.jbossts.orchestration.agent.LocationType;
-import org.jboss.jbossts.orchestration.agent.Transformer;
+import org.jboss.byteman.rule.type.TypeGroup;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.*;
+import org.jboss.byteman.rule.binding.Bindings;
+import org.jboss.byteman.rule.binding.Binding;
+import org.jboss.byteman.rule.grammar.ECATokenLexer;
+import org.jboss.byteman.rule.grammar.ECAGrammarParser;
+import org.jboss.byteman.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.helper.Helper;
+import org.jboss.byteman.rule.helper.InterpretedHelper;
+import org.jboss.byteman.agent.Location;
+import org.jboss.byteman.agent.LocationType;
+import org.jboss.byteman.agent.Transformer;
 import org.objectweb.asm.Opcodes;
 
-import org.jboss.jbossts.orchestration.rule.compiler.Compiler;
+import org.jboss.byteman.rule.compiler.Compiler;
 
 import java.io.*;
 import java.util.*;
@@ -173,7 +173,7 @@
                 Symbol parse = (debugParse ? parser.debug_parse() : parser.parse());
                 ruleTree = (ParseNode) parse.value;
             } catch (Exception e) {
-                throw new ParseException("org.jboss.jbossts.orchestration.rule.Rule : error parsing rule\n" + ruleSpec, e);
+                throw new ParseException("org.jboss.byteman.rule.Rule : error parsing rule\n" + ruleSpec, e);
             }
             ParseNode eventTree = (ParseNode)ruleTree.getChild(0);
             ParseNode conditionTree = (ParseNode)ruleTree.getChild(1);
@@ -601,5 +601,5 @@
         return helperClass;
     }
     
-    private static boolean debugParse = (System.getProperty("org.jboss.jbossts.orchestration.rule.debug") != null ? true : false);
+    private static boolean debugParse = (System.getProperty("org.jboss.byteman.rule.debug") != null ? true : false);
 }

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/RuleElement.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/RuleElement.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/RuleElement.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,16 +21,16 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule;
+package org.jboss.byteman.rule;
 
-import org.jboss.jbossts.orchestration.rule.binding.Bindings;
-import org.jboss.jbossts.orchestration.rule.type.TypeGroup;
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.binding.Bindings;
+import org.jboss.byteman.rule.type.TypeGroup;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/binding/Binding.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/binding/Binding.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/binding/Binding.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,17 +21,17 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.binding;
+package org.jboss.byteman.rule.binding;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.expression.Expression;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.RuleElement;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.expression.Expression;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.RuleElement;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/binding/Bindings.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/binding/Bindings.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/binding/Bindings.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,7 +21,7 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.binding;
+package org.jboss.byteman.rule.binding;
 
 import java.util.Iterator;
 import java.util.ArrayList;

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/compiler/Compiler.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/compiler/Compiler.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/compiler/Compiler.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -22,12 +22,11 @@
  * @authors Andrew Dinn
  */
 
-package org.jboss.jbossts.orchestration.rule.compiler;
+package org.jboss.byteman.rule.compiler;
 
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.helper.InterpretedHelper;
-import org.jboss.jbossts.orchestration.agent.Transformer;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.agent.Transformer;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.*;
 
@@ -119,7 +118,7 @@
         //
         // public class foo.bar.Compiled_<helper>_<NNN> extends foo.bar.<helper> implements HelperAdapter
 
-        cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, compiledHelperName, null, helperName, new String[] { "org/jboss/jbossts/orchestration/rule/helper/HelperAdapter" });
+        cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, compiledHelperName, null, helperName, new String[] { "org/jboss/byteman/rule/helper/HelperAdapter" });
         {
         // we need a Hashmap field to hold the bindings
         //
@@ -133,7 +132,7 @@
         //
         // private HashMap<String, Type> bindingTypeMap;
 
-        fv = cw.visitField(ACC_PRIVATE, "bindingTypeMap", "Ljava/util/HashMap;", "Ljava/util/HashMap<Ljava/lang/String;Lorg/jboss/jbossts/orchestration/rule/type/Type;>;", null);
+        fv = cw.visitField(ACC_PRIVATE, "bindingTypeMap", "Ljava/util/HashMap;", "Ljava/util/HashMap<Ljava/lang/String;Lorg/jboss/byteman/rule/type/Type;>;", null);
         fv.visitEnd();
         }
         {
@@ -141,7 +140,7 @@
         //
         // private Rule rule;
 
-        fv = cw.visitField(ACC_PRIVATE, "rule", "Lorg/jboss/jbossts/orchestration/rule/Rule;", "Lorg/jboss/jbossts/orchestration/rule/Rule;", null);
+        fv = cw.visitField(ACC_PRIVATE, "rule", "Lorg/jboss/byteman/rule/Rule;", "Lorg/jboss/byteman/rule/Rule;", null);
         fv.visitEnd();
         }
         {
@@ -169,7 +168,7 @@
         }
         //
         //  public Compiled<helper>_<NNN>()Rule rule)
-        mv = cw.visitMethod(ACC_PUBLIC, "<init>", "(Lorg/jboss/jbossts/orchestration/rule/Rule;)V", null, null);
+        mv = cw.visitMethod(ACC_PUBLIC, "<init>", "(Lorg/jboss/byteman/rule/Rule;)V", null, null);
         mv.visitCode();
         // super();
         //
@@ -179,7 +178,7 @@
         if (superWantsRule) {
             mv.visitVarInsn(ALOAD, 0);
             mv.visitVarInsn(ALOAD, 1);
-            mv.visitMethodInsn(INVOKESPECIAL, helperName, "<init>", "(Lorg/jboss/jbossts/orchestration/rule/Rule;)V");
+            mv.visitMethodInsn(INVOKESPECIAL, helperName, "<init>", "(Lorg/jboss/byteman/rule/Rule;)V");
         } else {
             mv.visitVarInsn(ALOAD, 0);
             mv.visitMethodInsn(INVOKESPECIAL, helperName, "<init>", "()V");
@@ -199,7 +198,7 @@
         // this.rule = rule
         mv.visitVarInsn(ALOAD, 0);
         mv.visitVarInsn(ALOAD, 1);
-        mv.visitFieldInsn(PUTFIELD, compiledHelperName, "rule", "Lorg/jboss/jbossts/orchestration/rule/Rule;");
+        mv.visitFieldInsn(PUTFIELD, compiledHelperName, "rule", "Lorg/jboss/byteman/rule/Rule;");
         // return;
         mv.visitInsn(RETURN);
         mv.visitMaxs(3, 2);
@@ -209,10 +208,10 @@
         // create the execute method
         //
         // public void execute(Bindings bindings, Object recipient, Object[] args) throws ExecuteException
-        mv = cw.visitMethod(ACC_PUBLIC, "execute", "(Lorg/jboss/jbossts/orchestration/rule/binding/Bindings;Ljava/lang/Object;[Ljava/lang/Object;)V", null, new String[] { "org/jboss/jbossts/orchestration/rule/exception/ExecuteException" });
+        mv = cw.visitMethod(ACC_PUBLIC, "execute", "(Lorg/jboss/byteman/rule/binding/Bindings;Ljava/lang/Object;[Ljava/lang/Object;)V", null, new String[] { "org/jboss/byteman/rule/exception/ExecuteException" });
         mv.visitCode();
         // if (Transformer.isVerbose())
-        mv.visitMethodInsn(INVOKESTATIC, "org/jboss/jbossts/orchestration/agent/Transformer", "isVerbose", "()Z");
+        mv.visitMethodInsn(INVOKESTATIC, "org/jboss/byteman/agent/Transformer", "isVerbose", "()Z");
         Label l0 = new Label();
         mv.visitJumpInsn(IFEQ, l0);
         // then
@@ -222,8 +221,8 @@
         mv.visitInsn(DUP);
         mv.visitMethodInsn(INVOKESPECIAL, "java/lang/StringBuilder", "<init>", "()V");
         mv.visitVarInsn(ALOAD, 0);
-        mv.visitFieldInsn(GETFIELD, compiledHelperName, "rule", "Lorg/jboss/jbossts/orchestration/rule/Rule;");
-        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/jbossts/orchestration/rule/Rule", "getName", "()Ljava/lang/String;");
+        mv.visitFieldInsn(GETFIELD, compiledHelperName, "rule", "Lorg/jboss/byteman/rule/Rule;");
+        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/byteman/rule/Rule", "getName", "()Ljava/lang/String;");
         mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/StringBuilder", "append", "(Ljava/lang/String;)Ljava/lang/StringBuilder;");
         mv.visitLdcInsn(" execute()");
         mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/StringBuilder", "append", "(Ljava/lang/String;)Ljava/lang/StringBuilder;");
@@ -233,7 +232,7 @@
         mv.visitLabel(l0);
         // Iterator<Binding> iterator = bindings.iterator();
         mv.visitVarInsn(ALOAD, 1);
-        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/jbossts/orchestration/rule/binding/Bindings", "iterator", "()Ljava/util/Iterator;");
+        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/byteman/rule/binding/Bindings", "iterator", "()Ljava/util/Iterator;");
         mv.visitVarInsn(ASTORE, 4);
         // while 
         Label l1 = new Label();
@@ -247,19 +246,19 @@
         // binding = (Binding)iterator.next();
         mv.visitVarInsn(ALOAD, 4);
         mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Iterator", "next", "()Ljava/lang/Object;");
-        mv.visitTypeInsn(CHECKCAST, "org/jboss/jbossts/orchestration/rule/binding/Binding");
+        mv.visitTypeInsn(CHECKCAST, "org/jboss/byteman/rule/binding/Binding");
         mv.visitVarInsn(ASTORE, 5);
         // String name = binding.getName();
         mv.visitVarInsn(ALOAD, 5);
-        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/jbossts/orchestration/rule/binding/Binding", "getName", "()Ljava/lang/String;");
+        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/byteman/rule/binding/Binding", "getName", "()Ljava/lang/String;");
         mv.visitVarInsn(ASTORE, 6);
         // Type type = binding.getType();
         mv.visitVarInsn(ALOAD, 5);
-        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/jbossts/orchestration/rule/binding/Binding", "getType", "()Lorg/jboss/jbossts/orchestration/rule/type/Type;");
+        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/byteman/rule/binding/Binding", "getType", "()Lorg/jboss/byteman/rule/type/Type;");
         mv.visitVarInsn(ASTORE, 7);
         // if (binding.isHelper())
         mv.visitVarInsn(ALOAD, 5);
-        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/jbossts/orchestration/rule/binding/Binding", "isHelper", "()Z");
+        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/byteman/rule/binding/Binding", "isHelper", "()Z");
         Label l3 = new Label();
         mv.visitJumpInsn(IFEQ, l3);
         // then
@@ -282,7 +281,7 @@
         // else if (binding.isRecipient())
         mv.visitLabel(l3);
         mv.visitVarInsn(ALOAD, 5);
-        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/jbossts/orchestration/rule/binding/Binding", "isRecipient", "()Z");
+        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/byteman/rule/binding/Binding", "isRecipient", "()Z");
         Label l5 = new Label();
         mv.visitJumpInsn(IFEQ, l5);
         // then
@@ -305,10 +304,10 @@
         mv.visitLabel(l5);
         Label l6 = new Label();
         mv.visitVarInsn(ALOAD, 5);
-        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/jbossts/orchestration/rule/binding/Binding", "isParam", "()Z");
+        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/byteman/rule/binding/Binding", "isParam", "()Z");
         mv.visitJumpInsn(IFNE, l6); // skip to then if true or drop throuogh to || branch if false
         mv.visitVarInsn(ALOAD, 5);
-        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/jbossts/orchestration/rule/binding/Binding", "isLocalVar", "()Z");
+        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/byteman/rule/binding/Binding", "isLocalVar", "()Z");
         mv.visitJumpInsn(IFEQ, l4); // bypass this branch
         mv.visitLabel(l6);
         // then
@@ -318,7 +317,7 @@
         mv.visitVarInsn(ALOAD, 6);
         mv.visitVarInsn(ALOAD, 3);
         mv.visitVarInsn(ALOAD, 5);
-        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/jbossts/orchestration/rule/binding/Binding", "getObjectArrayIndex", "()I");
+        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/byteman/rule/binding/Binding", "getObjectArrayIndex", "()I");
         mv.visitInsn(AALOAD);
         mv.visitMethodInsn(INVOKEVIRTUAL, "java/util/HashMap", "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
         mv.visitInsn(POP);
@@ -384,8 +383,8 @@
         mv.visitCode();
         // {TOS} <== rule.getName()
         mv.visitVarInsn(ALOAD, 0);
-        mv.visitFieldInsn(GETFIELD, compiledHelperName, "rule", "Lorg/jboss/jbossts/orchestration/rule/Rule;");
-        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/jbossts/orchestration/rule/Rule", "getName", "()Ljava/lang/String;");
+        mv.visitFieldInsn(GETFIELD, compiledHelperName, "rule", "Lorg/jboss/byteman/rule/Rule;");
+        mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/byteman/rule/Rule", "getName", "()Ljava/lang/String;");
         // return {TOS}
         mv.visitInsn(ARETURN);
         mv.visitMaxs(1, 1);
@@ -402,7 +401,7 @@
             // create the execute0() method
             //
             // private void execute0()
-            mv = cw.visitMethod(ACC_PRIVATE, "execute0", "()V", null, new String[] { "org/jboss/jbossts/orchestration/rule/exception/ExecuteException" });
+            mv = cw.visitMethod(ACC_PRIVATE, "execute0", "()V", null, new String[] { "org/jboss/byteman/rule/exception/ExecuteException" });
             mv.visitCode();
             maxStackHeights.addLocalCount(3); // for this and 2 object args
             // bind();
@@ -431,7 +430,7 @@
             // create the execute0() method
             //
             // private void execute0()
-            mv = cw.visitMethod(ACC_PRIVATE, "execute0", "()V", null, new String[] { "org/jboss/jbossts/orchestration/rule/exception/ExecuteException" });
+            mv = cw.visitMethod(ACC_PRIVATE, "execute0", "()V", null, new String[] { "org/jboss/byteman/rule/exception/ExecuteException" });
             mv.visitCode();
             // bind();
             mv.visitVarInsn(ALOAD, 0);
@@ -456,14 +455,14 @@
             // create the bind method
             //
             // private void bind()
-            mv = cw.visitMethod(ACC_PRIVATE, "bind", "()V", null, new String[] { "org/jboss/jbossts/orchestration/rule/exception/ExecuteException" });
+            mv = cw.visitMethod(ACC_PRIVATE, "bind", "()V", null, new String[] { "org/jboss/byteman/rule/exception/ExecuteException" });
             mv.visitCode();
             // rule.getEvent().interpret(this);
             mv.visitVarInsn(ALOAD, 0);
-            mv.visitFieldInsn(GETFIELD, compiledHelperName, "rule", "Lorg/jboss/jbossts/orchestration/rule/Rule;");
-            mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/jbossts/orchestration/rule/Rule", "getEvent", "()Lorg/jboss/jbossts/orchestration/rule/Event;");
+            mv.visitFieldInsn(GETFIELD, compiledHelperName, "rule", "Lorg/jboss/byteman/rule/Rule;");
+            mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/byteman/rule/Rule", "getEvent", "()Lorg/jboss/byteman/rule/Event;");
             mv.visitVarInsn(ALOAD, 0);
-            mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/jbossts/orchestration/rule/Event", "interpret", "(Lorg/jboss/jbossts/orchestration/rule/helper/HelperAdapter;)Ljava/lang/Object;");
+            mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/byteman/rule/Event", "interpret", "(Lorg/jboss/byteman/rule/helper/HelperAdapter;)Ljava/lang/Object;");
             mv.visitInsn(RETURN);
             mv.visitMaxs(2, 1);
             mv.visitEnd();
@@ -472,14 +471,14 @@
             // create the test method
             //
             // private boolean test()
-            mv = cw.visitMethod(ACC_PRIVATE, "test", "()Z", null, new String[] { "org/jboss/jbossts/orchestration/rule/exception/ExecuteException" });
+            mv = cw.visitMethod(ACC_PRIVATE, "test", "()Z", null, new String[] { "org/jboss/byteman/rule/exception/ExecuteException" });
             mv.visitCode();
             // {TOS} <== rule.getCondition().interpret(this);
             mv.visitVarInsn(ALOAD, 0);
-            mv.visitFieldInsn(GETFIELD, compiledHelperName, "rule", "Lorg/jboss/jbossts/orchestration/rule/Rule;");
-            mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/jbossts/orchestration/rule/Rule", "getCondition", "()Lorg/jboss/jbossts/orchestration/rule/Condition;");
+            mv.visitFieldInsn(GETFIELD, compiledHelperName, "rule", "Lorg/jboss/byteman/rule/Rule;");
+            mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/byteman/rule/Rule", "getCondition", "()Lorg/jboss/byteman/rule/Condition;");
             mv.visitVarInsn(ALOAD, 0);
-            mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/jbossts/orchestration/rule/Condition", "interpret", "(Lorg/jboss/jbossts/orchestration/rule/helper/HelperAdapter;)Ljava/lang/Object;");
+            mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/byteman/rule/Condition", "interpret", "(Lorg/jboss/byteman/rule/helper/HelperAdapter;)Ljava/lang/Object;");
             mv.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/Boolean");
             // unbox the returned Boolean
             mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Boolean", "booleanValue", "()Z");
@@ -492,14 +491,14 @@
             // create the fire method
             //
             // private void fire()
-            mv = cw.visitMethod(ACC_PRIVATE, "fire", "()V", null, new String[] { "org/jboss/jbossts/orchestration/rule/exception/ExecuteException" });
+            mv = cw.visitMethod(ACC_PRIVATE, "fire", "()V", null, new String[] { "org/jboss/byteman/rule/exception/ExecuteException" });
             mv.visitCode();
             // rule.getAction().interpret(this);
             mv.visitVarInsn(ALOAD, 0);
-            mv.visitFieldInsn(GETFIELD, compiledHelperName, "rule", "Lorg/jboss/jbossts/orchestration/rule/Rule;");
-            mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/jbossts/orchestration/rule/Rule", "getAction", "()Lorg/jboss/jbossts/orchestration/rule/Action;");
+            mv.visitFieldInsn(GETFIELD, compiledHelperName, "rule", "Lorg/jboss/byteman/rule/Rule;");
+            mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/byteman/rule/Rule", "getAction", "()Lorg/jboss/byteman/rule/Action;");
             mv.visitVarInsn(ALOAD, 0);
-            mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/jbossts/orchestration/rule/Action", "interpret", "(Lorg/jboss/jbossts/orchestration/rule/helper/HelperAdapter;)Ljava/lang/Object;");
+            mv.visitMethodInsn(INVOKEVIRTUAL, "org/jboss/byteman/rule/Action", "interpret", "(Lorg/jboss/byteman/rule/helper/HelperAdapter;)Ljava/lang/Object;");
             // return
             mv.visitInsn(RETURN);
             mv.visitMaxs(2, 1);

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/compiler/StackHeights.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/compiler/StackHeights.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/compiler/StackHeights.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -20,9 +20,9 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  *
  * @authors Andrew Dinn
- */package org.jboss.jbossts.orchestration.rule.compiler;
+ */package org.jboss.byteman.rule.compiler;
 
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
+import org.jboss.byteman.rule.exception.CompileException;
 
 /**
  * container to track either the current or the maximum local variable count and stack height

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/exception/CompileException.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/exception/CompileException.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/exception/CompileException.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,7 +21,7 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.exception;
+package org.jboss.byteman.rule.exception;
 
 /**
  * used to notify an exception during rule compilation

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/exception/EarlyReturnException.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/exception/EarlyReturnException.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/exception/EarlyReturnException.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,7 +21,7 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.exception;
+package org.jboss.byteman.rule.exception;
 
 /**
  * Specialization of ExecuteException which is used to cause a trigger method to return

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/exception/ExecuteException.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/exception/ExecuteException.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/exception/ExecuteException.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,7 +21,7 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.exception;
+package org.jboss.byteman.rule.exception;
 
 /**
  * exception class thrown during rule execution. n.b. this extends RuntimeException to avoid

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/exception/ParseException.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/exception/ParseException.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/exception/ParseException.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,7 +21,7 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.exception;
+package org.jboss.byteman.rule.exception;
 
 /**
  * used to notify an exception during rule parsing

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/exception/ThrowException.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/exception/ThrowException.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/exception/ThrowException.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,7 +21,7 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.exception;
+package org.jboss.byteman.rule.exception;
 
 /**
  * Created by IntelliJ IDEA.

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/exception/TypeException.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/exception/TypeException.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/exception/TypeException.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,7 +21,7 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.exception;
+package org.jboss.byteman.rule.exception;
 
 /**
  * used to notify an exception during rule type checking

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ArithmeticExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/ArithmeticExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ArithmeticExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,16 +21,16 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ArrayExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/ArrayExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ArrayExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,16 +21,16 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/BinaryOperExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/BinaryOperExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/BinaryOperExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,11 +21,11 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.grammar.ParseNode;
 
 /**
  * binary operators includes arithmetic and comparison operators

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/BitExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/BitExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/BitExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,16 +21,16 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/BooleanExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/BooleanExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/BooleanExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,11 +21,11 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.grammar.ParseNode;
 
 /**
  * A binary arithmetic operator expression

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/BooleanLiteral.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/BooleanLiteral.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/BooleanLiteral.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,23 +21,20 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
 
 import java.io.StringWriter;
 
-import com.sun.org.apache.bcel.internal.generic.BIPUSH;
-
 /**
  * A binary logical operator expression
  */

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ComparisonExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/ComparisonExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ComparisonExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,20 +21,19 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Label;
-import com.sun.org.apache.bcel.internal.generic.INVOKEINTERFACE;
 
 /**
  * A binary comparison operator expression

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ConditionalEvalExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/ConditionalEvalExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ConditionalEvalExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,16 +21,16 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Opcodes;

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/DollarExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/DollarExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/DollarExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,18 +21,18 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.binding.Binding;
-import org.jboss.jbossts.orchestration.rule.binding.Bindings;
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.binding.Binding;
+import org.jboss.byteman.rule.binding.Bindings;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/Expression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/Expression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/Expression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,19 +21,15 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.RuleElement;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
+import org.jboss.byteman.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.RuleElement;
+import org.jboss.byteman.rule.helper.HelperAdapter;
 
 import java.io.StringWriter;
 
@@ -102,7 +98,7 @@
      * recipient if the trigger method is not static (name "0") and the trigger method arguments
      * (names "1", ...)
      * @return  the result of evaluation as an Object
-     * @throws org.jboss.jbossts.orchestration.rule.exception.ExecuteException
+     * @throws org.jboss.byteman.rule.exception.ExecuteException
      */
     public abstract Object interpret(HelperAdapter helper) throws ExecuteException;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ExpressionHelper.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/ExpressionHelper.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ExpressionHelper.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,14 +21,14 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.binding.Bindings;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
-import static org.jboss.jbossts.orchestration.rule.grammar.ParseNode.*;
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.Rule;
+import org.jboss.byteman.rule.binding.Bindings;
+import org.jboss.byteman.rule.grammar.ParseNode;
+import static org.jboss.byteman.rule.grammar.ParseNode.*;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.Rule;
 
 import java.util.List;
 import java.util.ArrayList;

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/FieldExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/FieldExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/FieldExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,18 +21,18 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.binding.Binding;
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.type.TypeGroup;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.binding.Binding;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.type.TypeGroup;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/LogicalExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/LogicalExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/LogicalExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,16 +21,16 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Opcodes;

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/MethodExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/MethodExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/MethodExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,18 +21,18 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.type.TypeGroup;
-import org.jboss.jbossts.orchestration.rule.binding.Binding;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.type.TypeGroup;
+import org.jboss.byteman.rule.binding.Binding;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/MinusExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/MinusExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/MinusExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,16 +21,16 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/NotExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/NotExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/NotExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,16 +21,16 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/NumericLiteral.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/NumericLiteral.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/NumericLiteral.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,16 +21,16 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/OperExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/OperExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/OperExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,11 +21,11 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.grammar.ParseNode;
 
 import java.io.StringWriter;
 
@@ -158,26 +158,26 @@
     /* parser operands are not allocated rationally so we convert using this table */
 
     final private static int[] parserOperands = {
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.NOT,
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.TWIDDLE,
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.OR,
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.AND,
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.EQ,
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.NE,
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.GT,
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.LT,
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.GE,
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.LE,
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.BOR,
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.BAND,
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.BXOR,
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.UMINUS,
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.MUL,
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.DIV,
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.PLUS,
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.MINUS,
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.MOD,
-            org.jboss.jbossts.orchestration.rule.grammar.ParseNode.TERNOP
+            org.jboss.byteman.rule.grammar.ParseNode.NOT,
+            org.jboss.byteman.rule.grammar.ParseNode.TWIDDLE,
+            org.jboss.byteman.rule.grammar.ParseNode.OR,
+            org.jboss.byteman.rule.grammar.ParseNode.AND,
+            org.jboss.byteman.rule.grammar.ParseNode.EQ,
+            org.jboss.byteman.rule.grammar.ParseNode.NE,
+            org.jboss.byteman.rule.grammar.ParseNode.GT,
+            org.jboss.byteman.rule.grammar.ParseNode.LT,
+            org.jboss.byteman.rule.grammar.ParseNode.GE,
+            org.jboss.byteman.rule.grammar.ParseNode.LE,
+            org.jboss.byteman.rule.grammar.ParseNode.BOR,
+            org.jboss.byteman.rule.grammar.ParseNode.BAND,
+            org.jboss.byteman.rule.grammar.ParseNode.BXOR,
+            org.jboss.byteman.rule.grammar.ParseNode.UMINUS,
+            org.jboss.byteman.rule.grammar.ParseNode.MUL,
+            org.jboss.byteman.rule.grammar.ParseNode.DIV,
+            org.jboss.byteman.rule.grammar.ParseNode.PLUS,
+            org.jboss.byteman.rule.grammar.ParseNode.MINUS,
+            org.jboss.byteman.rule.grammar.ParseNode.MOD,
+            org.jboss.byteman.rule.grammar.ParseNode.TERNOP
     };
 
     final private static String[] operandNames = {

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/PlusExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/PlusExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/PlusExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,16 +21,16 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ReturnExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/ReturnExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ReturnExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,19 +21,17 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.binding.Binding;
-import org.jboss.jbossts.orchestration.rule.binding.Bindings;
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.EarlyReturnException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.EarlyReturnException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 
@@ -82,7 +80,7 @@
      * @param expected  the type expected for the expression in the contxt in which it occurs. this
      *                  may be void but shoudl not be undefined at the point where type checking is performed.
      * @return
-     * @throws org.jboss.jbossts.orchestration.rule.exception.TypeException
+     * @throws org.jboss.byteman.rule.exception.TypeException
      *
      */
     public Type typeCheck(Type expected) throws TypeException {
@@ -108,7 +106,7 @@
      *               recipient if the trigger method is not static (name "0") and the trigger method arguments
      *               (names "1", ...)
      * @return the result of evaluation as an Object
-     * @throws org.jboss.jbossts.orchestration.rule.exception.ExecuteException
+     * @throws org.jboss.byteman.rule.exception.ExecuteException
      *
      */
     public Object interpret(HelperAdapter helper) throws ExecuteException

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/StaticExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/StaticExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/StaticExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,17 +21,17 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.type.TypeGroup;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.type.TypeGroup;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/StringLiteral.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/StringLiteral.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/StringLiteral.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,18 +21,17 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
 
 import java.io.StringWriter;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/StringPlusExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/StringPlusExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/StringPlusExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,16 +21,16 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/TernaryOperExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/TernaryOperExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/TernaryOperExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,11 +21,11 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.grammar.ParseNode;
 
 /**
  * ternary operators includes conditional evaluation operator 'cond ? if_expr : else_expr'

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ThrowExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/ThrowExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/ThrowExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,18 +21,18 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.type.TypeGroup;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.ThrowException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.type.TypeGroup;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.ThrowException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 
@@ -91,7 +91,7 @@
      * @param expected  the type expected for the expression in the contxt in which it occurs. this
      *                  may be void but shoudl not be undefined at the point where type checking is performed.
      * @return
-     * @throws org.jboss.jbossts.orchestration.rule.exception.TypeException
+     * @throws org.jboss.byteman.rule.exception.TypeException
      *
      */
     public Type typeCheck(Type expected) throws TypeException {
@@ -230,7 +230,7 @@
      *               recipient if the trigger method is not static (name "0") and the trigger method arguments
      *               (names "1", ...)
      * @return the result of evaluation as an Object
-     * @throws org.jboss.jbossts.orchestration.rule.exception.ExecuteException
+     * @throws org.jboss.byteman.rule.exception.ExecuteException
      *
      */
     public Object interpret(HelperAdapter helper) throws ExecuteException {

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/TwiddleExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/TwiddleExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/TwiddleExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,19 +21,18 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
-import com.sun.org.apache.bcel.internal.generic.IXOR;
 
 /**
  */

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/UnaryOperExpression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/UnaryOperExpression.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/UnaryOperExpression.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,11 +21,11 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.grammar.ParseNode;
 
 /**
  * unary operators includes boolean NOT and arithmetic TWIDDLE

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/Variable.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/Variable.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/expression/Variable.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,17 +21,17 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.expression;
+package org.jboss.byteman.rule.expression;
 
-import org.jboss.jbossts.orchestration.rule.binding.Binding;
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.compiler.StackHeights;
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.binding.Binding;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.compiler.StackHeights;
+import org.jboss.byteman.rule.helper.HelperAdapter;
+import org.jboss.byteman.rule.grammar.ParseNode;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/grammar/ECAGrammarParser.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/grammar/ECAGrammarParser.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/grammar/ECAGrammarParser.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,16 +1,16 @@
 
 //----------------------------------------------------
 // The following code was generated by CUP v0.10k
-// Fri Apr 24 10:31:04 BST 2009
+// Wed Jun 03 15:01:19 BST 2009
 //----------------------------------------------------
 
-package org.jboss.jbossts.orchestration.rule.grammar;
+package org.jboss.byteman.rule.grammar;
 
 import java_cup.runtime.*;
-import org.jboss.jbossts.orchestration.rule.grammar.ParseNode;
+import org.jboss.byteman.rule.grammar.ParseNode;
 
 /** CUP v0.10k generated parser.
-  * @version Fri Apr 24 10:31:04 BST 2009
+  * @version Wed Jun 03 15:01:19 BST 2009
   */
 public class ECAGrammarParser extends java_cup.runtime.lr_parser {
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/grammar/ECATokenLexer.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/grammar/ECATokenLexer.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/grammar/ECATokenLexer.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.2 on 24/04/09 10:31 */
+/* The following code was generated by JFlex 1.4.2 on 03/06/09 15:01 */
 
 /*
 * JBoss, Home of Professional Open Source
@@ -24,16 +24,16 @@
 * @authors Andrew Dinn
 */
 
-package org.jboss.jbossts.orchestration.rule.grammar;
+package org.jboss.byteman.rule.grammar;
 
 import java_cup.runtime.*;
-import org.jboss.jbossts.orchestration.rule.grammar.PrintableSymbol;
+import org.jboss.byteman.rule.grammar.PrintableSymbol;
 
 
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.2
- * on 24/04/09 10:31 from the specification file
+ * on 03/06/09 15:01 from the specification file
  * <tt>dd/grammar/flex/ECAToken.flex</tt>
  */
 public class ECATokenLexer implements java_cup.runtime.Scanner {

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/grammar/ParseNode.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/grammar/ParseNode.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/grammar/ParseNode.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,4 +1,4 @@
-package org.jboss.jbossts.orchestration.rule.grammar;
+package org.jboss.byteman.rule.grammar;
 
 /**
  * Class used by the JavaCUP parser to construct a parse tree.

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/grammar/PrintableSymbol.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/grammar/PrintableSymbol.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/grammar/PrintableSymbol.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,4 +1,4 @@
-package org.jboss.jbossts.orchestration.rule.grammar;
+package org.jboss.byteman.rule.grammar;
 
 import java_cup.runtime.Symbol;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/grammar/sym.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/grammar/sym.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/grammar/sym.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,10 +1,10 @@
 
 //----------------------------------------------------
 // The following code was generated by CUP v0.10k
-// Fri Apr 24 10:31:04 BST 2009
+// Wed Jun 03 15:01:19 BST 2009
 //----------------------------------------------------
 
-package org.jboss.jbossts.orchestration.rule.grammar;
+package org.jboss.byteman.rule.grammar;
 
 /** CUP generated class containing symbol constants. */
 public class sym {

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/helper/Helper.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/helper/Helper.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/helper/Helper.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,15 +21,15 @@
  *
  * @authors Andrew Dinn
  */
-package org.jboss.jbossts.orchestration.rule.helper;
+package org.jboss.byteman.rule.helper;
 
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.synchronization.CountDown;
-import org.jboss.jbossts.orchestration.synchronization.Counter;
-import org.jboss.jbossts.orchestration.synchronization.Waiter;
-import org.jboss.jbossts.orchestration.synchronization.Rendezvous;
-import org.jboss.jbossts.orchestration.agent.Transformer;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.synchronization.CountDown;
+import org.jboss.byteman.synchronization.Counter;
+import org.jboss.byteman.synchronization.Waiter;
+import org.jboss.byteman.synchronization.Rendezvous;
+import org.jboss.byteman.agent.Transformer;
 
 import java.io.*;
 import java.util.HashMap;

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/helper/HelperAdapter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/helper/HelperAdapter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/helper/HelperAdapter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,11 +21,10 @@
  *
  * @authors Andrew Dinn
  */
-package org.jboss.jbossts.orchestration.rule.helper;
+package org.jboss.byteman.rule.helper;
 
-import org.jboss.jbossts.orchestration.rule.binding.Bindings;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.Rule;
+import org.jboss.byteman.rule.binding.Bindings;
+import org.jboss.byteman.rule.exception.ExecuteException;
 
 /**
  * This interface defines the methods which need to be added to a helper class in order for it

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/helper/InterpretedHelper.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/helper/InterpretedHelper.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/helper/InterpretedHelper.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,14 +21,14 @@
  *
  * @authors Andrew Dinn
  */
-package org.jboss.jbossts.orchestration.rule.helper;
+package org.jboss.byteman.rule.helper;
 
-import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-import org.jboss.jbossts.orchestration.rule.binding.Bindings;
-import org.jboss.jbossts.orchestration.rule.binding.Binding;
-import org.jboss.jbossts.orchestration.agent.Transformer;
+import org.jboss.byteman.rule.type.Type;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.binding.Bindings;
+import org.jboss.byteman.rule.binding.Binding;
+import org.jboss.byteman.agent.Transformer;
 
 import java.util.HashMap;
 import java.util.Iterator;

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/type/Type.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/type/Type.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/type/Type.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,10 +21,9 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.type;
+package org.jboss.byteman.rule.type;
 
-import org.jboss.jbossts.orchestration.rule.helper.HelperAdapter;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.TypeException;
 
 import java.util.HashMap;
 import java.util.List;

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/type/TypeGroup.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/type/TypeGroup.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/type/TypeGroup.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,7 +21,7 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.type;
+package org.jboss.byteman.rule.type;
 
 import java.util.HashMap;
 import java.util.List;

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/type/TypeHelper.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/type/TypeHelper.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/rule/type/TypeHelper.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,7 +21,7 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.rule.type;
+package org.jboss.byteman.rule.type;
 
 /**
  * Helpoer class providing static methods for manipulating type and class names,

Copied: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/synchronization (from rev 26809, labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/synchronization)

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/synchronization/CountDown.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/synchronization/CountDown.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/synchronization/CountDown.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,7 +21,7 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.synchronization;
+package org.jboss.byteman.synchronization;
 
 /**
  * class provided to support rule builtins getCounter, decrementCounter and addCounter

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/synchronization/Counter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/synchronization/Counter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/synchronization/Counter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,4 +1,4 @@
-package org.jboss.jbossts.orchestration.synchronization;
+package org.jboss.byteman.synchronization;
 
 /**
  * class used to associate a counter value with a given object

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/synchronization/Rendezvous.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/synchronization/Rendezvous.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/synchronization/Rendezvous.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,10 +21,8 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.synchronization;
+package org.jboss.byteman.synchronization;
 
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
-
 /**
  * class used to manage rule rendezvous operations
  */

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/synchronization/Waiter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/synchronization/Waiter.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/synchronization/Waiter.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,9 +21,9 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.synchronization;
+package org.jboss.byteman.synchronization;
 
-import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
+import org.jboss.byteman.rule.exception.ExecuteException;
 
 /**
  * class used to manage rule wait operations

Copied: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/test (from rev 26809, labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/test)

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/test/TestScript.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/test/TestScript.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/byteman/test/TestScript.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -21,15 +21,15 @@
 *
 * @authors Andrew Dinn
 */
-package org.jboss.jbossts.orchestration.test;
+package org.jboss.byteman.test;
 
-import org.jboss.jbossts.orchestration.rule.type.TypeHelper;
-import org.jboss.jbossts.orchestration.rule.Rule;
-import org.jboss.jbossts.orchestration.rule.exception.ParseException;
-import org.jboss.jbossts.orchestration.rule.exception.TypeException;
-import org.jboss.jbossts.orchestration.rule.exception.CompileException;
-import org.jboss.jbossts.orchestration.agent.LocationType;
-import org.jboss.jbossts.orchestration.agent.Location;
+import org.jboss.byteman.rule.type.TypeHelper;
+import org.jboss.byteman.rule.Rule;
+import org.jboss.byteman.rule.exception.ParseException;
+import org.jboss.byteman.rule.exception.TypeException;
+import org.jboss.byteman.rule.exception.CompileException;
+import org.jboss.byteman.agent.LocationType;
+import org.jboss.byteman.agent.Location;
 import org.objectweb.asm.Opcodes;
 
 import java.util.List;
@@ -44,17 +44,17 @@
 /**
  * utility which parses and typechecks all rules in a rule script.
  *
- * usage : java org.jboss.jbossts.orchestration.TestScript [scriptfile]
+ * usage : java org.jboss.byteman.TestScript [scriptfile]
  *
- * n.b. the orchestration jar and any classes mentioned in the script rules need to be in the classpath
+ * n.b. the byteman jar and any classes mentioned in the script rules need to be in the classpath
  */
 public class TestScript
 {
     public static void main(String[] args)
     {
         if (args.length == 0 || args[0].equals("-h")) {
-            System.out.println("usage : java org.jboss.jbossts.orchestration.TestScript [scriptfile1 ...]");
-            System.out.println("        n.b. place the orchestration jar and classes mentioned in the ");
+            System.out.println("usage : java org.jboss.byteman.TestScript [scriptfile1 ...]");
+            System.out.println("        n.b. place the byteman jar and classes mentioned in the ");
             System.out.println("        scripts in the classpath");
             return;
         }
@@ -208,7 +208,7 @@
                     try {
                         targetHelperClass = loader.loadClass(targetHelperName);
                     } catch (ClassNotFoundException e) {
-                        System.out.println("org.jboss.jbossts.orchestration.agent.Transformer : unknown helper class " + targetHelperName + " for rule " + ruleName);
+                        System.out.println("org.jboss.byteman.agent.Transformer : unknown helper class " + targetHelperName + " for rule " + ruleName);
                     }
                 }
                 Rule rule = Rule.create(ruleName, targetClassName, targetMethodName, targetHelperClass, targetLocation, text, lineNumber, file, loader);

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/build.xml
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/build.xml	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/build.xml	2009-06-03 14:44:19 UTC (rev 26811)
@@ -19,14 +19,14 @@
   @author JBoss Inc.
 -->
 
-<project name="orchestration-tests" default="tests" basedir=".">
+<project name="byteman-tests" default="tests" basedir=".">
 
     <!-- the directory in which your installed app server resides -->
     <property environment="env"/>
 
-    <!-- pick up the toast library -->
-    <property name="toast.home" value="../build/lib"/>
-    <property name="toast.jar" value="orchestration.jar"/>
+    <!-- pick up the byteman library -->
+    <property name="byteman.home" value="../build/lib"/>
+    <property name="byteman.jar" value="byteman.jar"/>
 
     <!-- pick up the junit library -->
     <property name="junit.home" value="../ext"/>
@@ -62,7 +62,7 @@
     </target>
 
      <target name="jar" depends="compile">
-         <jar jarfile="${build.lib.dir}/orchestration-tests.jar">
+         <jar jarfile="${build.lib.dir}/byteman-tests.jar">
              <fileset dir="${build.classes.dir}" includes="**/*"/>
          </jar>
     </target>
@@ -79,44 +79,44 @@
     <target name="tests.location">
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/location/TestEntry.txt"/>
-            <!-- uncomment for verbose toast output
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.verbose"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/location/TestEntry.txt"/>
+            <!-- uncomment for verbose byteman output
+            <jvmarg value="-Dorg.jboss.byteman.verbose"/>
             -->
             <!-- uncomment to dump generated code
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.dump.generated.classes"/>
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.dump.generated.classes.directory=dump"/>
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes"/>
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes.directory=dump"/>
             -->
             <!-- uncomment to enable debug
             <jvmarg value="-Xdebug"/>
             <jvmarg  value="-Xnoagent"/>
             <jvmarg  value="-Djava.compiler=NONE"/>
             <jvmarg  value="-Xrunjdwp:transport=dt_socket,server=n,suspend=y,address=5005"/>
-            <test name="org.jboss.jbossts.orchestration.tests.location.TestEntry"/>
             -->
+            <test name="org.jboss.byteman.tests.location.TestEntry"/>
         </junit>
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/location/TestExit.txt"/>
-            <test name="org.jboss.jbossts.orchestration.tests.location.TestExit"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/location/TestExit.txt"/>
+            <test name="org.jboss.byteman.tests.location.TestExit"/>
         </junit>
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <!-- uncomment for verbose toast output
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.verbose"/>
+            <!-- uncomment for verbose byteman output
+            <jvmarg value="-Dorg.jboss.byteman.verbose"/>
             -->
             <!-- uncomment to dump generated code
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.dump.generated.classes"/>
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.dump.generated.classes.directory=dump"/>
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes"/>
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes.directory=dump"/>
             -->
             <!-- uncomment to enable debug
             <jvmarg value="-Xdebug"/>
@@ -124,49 +124,48 @@
             <jvmarg  value="-Djava.compiler=NONE"/>
             <jvmarg  value="-Xrunjdwp:transport=dt_socket,server=n,suspend=y,address=5005"/>
             -->
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/location/TestCall.txt"/>
-            <test name="org.jboss.jbossts.orchestration.tests.location.TestCall"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/location/TestCall.txt"/>
+            <test name="org.jboss.byteman.tests.location.TestCall"/>
         </junit>
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/location/TestSynch.txt"/>
-            <test name="org.jboss.jbossts.orchestration.tests.location.TestSynch"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/location/TestSynch.txt"/>
+            <test name="org.jboss.byteman.tests.location.TestSynch"/>
         </junit>
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/location/TestThrow.txt"/>
-            <test name="org.jboss.jbossts.orchestration.tests.location.TestThrow"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/location/TestThrow.txt"/>
+            <test name="org.jboss.byteman.tests.location.TestThrow"/>
         </junit>
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/location/TestReadWrite.txt"/>
-            <test name="org.jboss.jbossts.orchestration.tests.location.TestReadWrite"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/location/TestReadWrite.txt"/>
+            <test name="org.jboss.byteman.tests.location.TestReadWrite"/>
         </junit>
     </target>
 
     <target name="tests.location.compiled">
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/location/TestEntry.txt"/>
-            <jvmarg value="-Drg.jboss.jbossts.orchestration.compileToBytecode"/>
-            <!-- uncomment for verbose toast output
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.verbose"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/location/TestEntry.txt"/>
+            <!-- uncomment for verbose byteman output
+            <jvmarg value="-Dorg.jboss.byteman.verbose"/>
             -->
             <!-- uncomment to dump generated code
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.dump.generated.classes"/>
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.dump.generated.classes.directory=dump"/>
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes"/>
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes.directory=dump"/>
             -->
             <!-- uncomment to enable debug
             <jvmarg value="-Xdebug"/>
@@ -174,28 +173,29 @@
             <jvmarg  value="-Djava.compiler=NONE"/>
             <jvmarg  value="-Xrunjdwp:transport=dt_socket,server=n,suspend=y,address=5005"/>
             -->
-            <test name="org.jboss.jbossts.orchestration.tests.location.TestEntry"/>
+            <jvmarg value="-Dorg.jboss.byteman.compileToBytecode"/>
+            <test name="org.jboss.byteman.tests.location.TestEntry"/>
         </junit>
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/location/TestExit.txt"/>
-            <jvmarg value="-Drg.jboss.jbossts.orchestration.compileToBytecode"/>
-            <test name="org.jboss.jbossts.orchestration.tests.location.TestExit"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/location/TestExit.txt"/>
+            <jvmarg value="-Dorg.jboss.byteman.compileToBytecode"/>
+            <test name="org.jboss.byteman.tests.location.TestExit"/>
         </junit>
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <!-- uncomment for verbose toast output
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.verbose"/>
+            <!-- uncomment for verbose byteman output
+            <jvmarg value="-Dorg.jboss.byteman.verbose"/>
             -->
             <!-- uncomment to dump generated code
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.dump.generated.classes"/>
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.dump.generated.classes.directory=dump"/>
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes"/>
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes.directory=dump"/>
             -->
             <!-- uncomment to enable debug
             <jvmarg value="-Xdebug"/>
@@ -203,82 +203,82 @@
             <jvmarg  value="-Djava.compiler=NONE"/>
             <jvmarg  value="-Xrunjdwp:transport=dt_socket,server=n,suspend=y,address=5005"/>
             -->
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/location/TestCall.txt"/>
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.compileToBytecode"/>
-            <test name="org.jboss.jbossts.orchestration.tests.location.TestCall"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/location/TestCall.txt"/>
+            <jvmarg value="-Dorg.jboss.byteman.compileToBytecode"/>
+            <test name="org.jboss.byteman.tests.location.TestCall"/>
         </junit>
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/location/TestSynch.txt"/>
-            <jvmarg value="-Drg.jboss.jbossts.orchestration.compileToBytecode"/>
-            <test name="org.jboss.jbossts.orchestration.tests.location.TestSynch"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/location/TestSynch.txt"/>
+            <jvmarg value="-Dorg.jboss.byteman.compileToBytecode"/>
+            <test name="org.jboss.byteman.tests.location.TestSynch"/>
         </junit>
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/location/TestThrow.txt"/>
-            <jvmarg value="-Drg.jboss.jbossts.orchestration.compileToBytecode"/>
-            <test name="org.jboss.jbossts.orchestration.tests.location.TestThrow"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/location/TestThrow.txt"/>
+            <jvmarg value="-Dorg.jboss.byteman.compileToBytecode"/>
+            <test name="org.jboss.byteman.tests.location.TestThrow"/>
         </junit>
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/location/TestReadWrite.txt"/>
-            <jvmarg value="-Drg.jboss.jbossts.orchestration.compileToBytecode"/>
-            <test name="org.jboss.jbossts.orchestration.tests.location.TestReadWrite"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/location/TestReadWrite.txt"/>
+            <jvmarg value="-Dorg.jboss.byteman.compileToBytecode"/>
+            <test name="org.jboss.byteman.tests.location.TestReadWrite"/>
         </junit>
     </target>
 
     <target name="tests.javaops">
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/javaops/TestArithmetic.txt"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/javaops/TestArithmetic.txt"/>
             <!--
             <jvmarg value="-Xdebug"/>
             <jvmarg  value="-Xnoagent"/>
             <jvmarg  value="-Djava.compiler=NONE"/>
             <jvmarg  value="-Xrunjdwp:transport=dt_socket,server=n,suspend=y,address=5005"/>
             -->
-            <test name="org.jboss.jbossts.orchestration.tests.javaops.TestArithmetic"/>
+            <test name="org.jboss.byteman.tests.javaops.TestArithmetic"/>
         </junit>
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/javaops/TestLogical.txt"/>
-            <test name="org.jboss.jbossts.orchestration.tests.javaops.TestLogical"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/javaops/TestLogical.txt"/>
+            <test name="org.jboss.byteman.tests.javaops.TestLogical"/>
         </junit>
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/javaops/TestField.txt"/>
-            <test name="org.jboss.jbossts.orchestration.tests.javaops.TestField"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/javaops/TestField.txt"/>
+            <test name="org.jboss.byteman.tests.javaops.TestField"/>
         </junit>
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/javaops/TestMethod.txt"/>
-            <!-- uncomment for verbose toast output
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.verbose"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/javaops/TestMethod.txt"/>
+            <!-- uncomment for verbose byteman output
+            <jvmarg value="-Dorg.jboss.byteman.verbose"/>
             -->
             <!-- uncomment to dump generated code
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.dump.generated.classes"/>
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.dump.generated.classes.directory=dump"/>
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes"/>
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes.directory=dump"/>
             -->
             <!-- uncomment to enable debug
             <jvmarg value="-Xdebug"/>
@@ -287,33 +287,33 @@
             <jvmarg  value="-Xrunjdwp:transport=dt_socket,server=n,suspend=y,address=5005"/>
             -->
             <!--  set this to debug the rule parser
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.rule.debug"/>
-            <test name="org.jboss.jbossts.orchestration.tests.javaops.TestMethod"/>
+            <jvmarg value="-Dorg.jboss.byteman.rule.debug"/>
             -->
+            <test name="org.jboss.byteman.tests.javaops.TestMethod"/>
         </junit>
     </target>
 
     <target name="tests.javaops.compiled">
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/javaops/TestArithmetic.txt"/>
-            <test name="org.jboss.jbossts.orchestration.tests.javaops.TestArithmetic"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/javaops/TestArithmetic.txt"/>
+            <test name="org.jboss.byteman.tests.javaops.TestArithmetic"/>
         </junit>
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/javaops/TestLogical.txt"/>
-            <!-- uncomment for verbose toast output
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.verbose"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/javaops/TestLogical.txt"/>
+            <!-- uncomment for verbose byteman output
+            <jvmarg value="-Dorg.jboss.byteman.verbose"/>
             -->
             <!-- uncomment to dump generated code
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.dump.generated.classes"/>
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.dump.generated.classes.directory=dump"/>
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes"/>
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes.directory=dump"/>
             -->
             <!-- uncomment to enable debug
             <jvmarg value="-Xdebug"/>
@@ -322,21 +322,21 @@
             <jvmarg  value="-Xrunjdwp:transport=dt_socket,server=n,suspend=y,address=5005"/>
             -->
             <!--  set this to debug the rule parser
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.rule.debug"/>
+            <jvmarg value="-Dorg.jboss.byteman.rule.debug"/>
             -->
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.compileToBytecode"/>
-            <test name="org.jboss.jbossts.orchestration.tests.javaops.TestLogical"/>
+            <jvmarg value="-Dorg.jboss.byteman.compileToBytecode"/>
+            <test name="org.jboss.byteman.tests.javaops.TestLogical"/>
         </junit>
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/javaops/TestField.txt"/>
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.compileToBytecode"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/javaops/TestField.txt"/>
+            <jvmarg value="-Dorg.jboss.byteman.compileToBytecode"/>
             <!-- uncomment to dump generated code
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.dump.generated.classes"/>
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.dump.generated.classes.directory=dump"/>
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes"/>
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes.directory=dump"/>
             -->
             <!-- uncomment to enable debug
             <jvmarg value="-Xdebug"/>
@@ -344,18 +344,18 @@
             <jvmarg  value="-Djava.compiler=NONE"/>
             <jvmarg  value="-Xrunjdwp:transport=dt_socket,server=n,suspend=y,address=5005"/>
             -->
-            <test name="org.jboss.jbossts.orchestration.tests.javaops.TestField"/>
+            <test name="org.jboss.byteman.tests.javaops.TestField"/>
         </junit>
         <junit fork="true" showoutput="true">
             <classpath>
-                <pathelement location="${build.lib.dir}/orchestration-tests.jar"/>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
                 <pathelement location="${junit.home}/${junit.jar}"/>
             </classpath>
-            <jvmarg value="-javaagent:${toast.home}/${toast.jar}=script:${scripts.dir}/javaops/TestMethod.txt"/>
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.compileToBytecode"/>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/javaops/TestMethod.txt"/>
+            <jvmarg value="-Dorg.jboss.byteman.compileToBytecode"/>
             <!-- uncomment to dump generated code
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.dump.generated.classes"/>
-            <jvmarg value="-Dorg.jboss.jbossts.orchestration.dump.generated.classes.directory=dump"/>
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes"/>
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes.directory=dump"/>
             -->
             <!-- uncomment to enable debug
             <jvmarg value="-Xdebug"/>
@@ -363,7 +363,7 @@
             <jvmarg  value="-Djava.compiler=NONE"/>
             <jvmarg  value="-Xrunjdwp:transport=dt_socket,server=n,suspend=y,address=5005"/>
             -->
-            <test name="org.jboss.jbossts.orchestration.tests.javaops.TestMethod"/>
+            <test name="org.jboss.byteman.tests.javaops.TestMethod"/>
         </junit>
     </target>
 

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/javaops/TestArithmetic.txt
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/javaops/TestArithmetic.txt	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/javaops/TestArithmetic.txt	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,7 +1,7 @@
 RULE test arithmetic plus
 CLASS TestArithmetic
 METHOD triggerMethod1(int,char,short,byte)
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AFTER CALL log
 BIND test : Test = $0,
      i : int = $1,
@@ -23,7 +23,7 @@
 RULE test arithmetic minus
 CLASS TestArithmetic
 METHOD triggerMethod2(int,char,short,byte)
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AFTER CALL log
 BIND test : Test = $0,
      i : int = $1,
@@ -45,7 +45,7 @@
 RULE test arithmetic mod, times and div
 CLASS TestArithmetic
 METHOD triggerMethod3(int,char,short,byte)
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AFTER CALL log
 BIND test : Test = $0,
      i : int = $1,
@@ -67,7 +67,7 @@
 RULE test arithmetic mod, times and div again
 CLASS TestArithmetic
 METHOD triggerMethod4(int,char,short,byte)
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AFTER CALL log
 BIND test : Test = $0,
      i : int = $1,

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/javaops/TestField.txt
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/javaops/TestField.txt	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/javaops/TestField.txt	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,7 +1,7 @@
 RULE test field 1
 CLASS TestField
 METHOD triggerMethod1(TestFieldMethodAuxiliary)
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AFTER CALL log
 BIND test : Test = $0,
      arg : TestFieldMethodAuxiliary = $1
@@ -15,7 +15,7 @@
 RULE test field 2
 CLASS TestField
 METHOD triggerMethod1(TestFieldMethodAuxiliary)
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AFTER CALL log
 BIND test : Test = $0,
      arg : TestFieldMethodAuxiliary = $1
@@ -29,7 +29,7 @@
 RULE test field 3
 CLASS TestField
 METHOD triggerMethod2(TestFieldMethodAuxiliary)
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AFTER CALL log
 BIND test : Test = $0,
      arg : TestFieldMethodAuxiliary = $1
@@ -43,7 +43,7 @@
 RULE test field 4
 CLASS TestField
 METHOD triggerMethod2(TestFieldMethodAuxiliary)
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AFTER CALL log
 BIND test : Test = $0,
      arg : TestFieldMethodAuxiliary = $1

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/javaops/TestLogical.txt
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/javaops/TestLogical.txt	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/javaops/TestLogical.txt	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,7 +1,7 @@
 RULE test logical 1
 CLASS TestLogical
 METHOD triggerMethod1(boolean)
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AFTER CALL log
 BIND test : Test = $0,
      arg : boolean = $1
@@ -15,7 +15,7 @@
 RULE test logical 2
 CLASS TestLogical
 METHOD triggerMethod1(boolean)
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AFTER CALL log
 BIND test : Test = $0,
      arg : boolean = $1
@@ -29,7 +29,7 @@
 RULE test logical 3
 CLASS TestLogical
 METHOD triggerMethod2(boolean)
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AFTER CALL log
 BIND test : Test = $0,
      arg : boolean = $1
@@ -43,7 +43,7 @@
 RULE test logical 4
 CLASS TestLogical
 METHOD triggerMethod2(boolean)
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AFTER CALL log
 BIND test : Test = $0,
      arg : boolean = $1

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/javaops/TestMethod.txt
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/javaops/TestMethod.txt	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/javaops/TestMethod.txt	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,7 +1,7 @@
 RULE test method 1
 CLASS TestMethod
 METHOD triggerMethod1(TestFieldMethodAuxiliary)
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AFTER CALL log
 BIND test : Test = $0,
      arg : TestFieldMethodAuxiliary = $1
@@ -15,7 +15,7 @@
 RULE test method 2
 CLASS TestMethod
 METHOD triggerMethod1(TestFieldMethodAuxiliary)
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AFTER CALL log
 BIND test : Test = $0,
      arg : TestFieldMethodAuxiliary = $1
@@ -29,28 +29,28 @@
 RULE test method 3
 CLASS TestMethod
 METHOD triggerMethod2(TestFieldMethodAuxiliary)
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AFTER CALL log
 BIND test : Test = $0,
      arg : TestFieldMethodAuxiliary = $1
 IF arg.value == 4
 DO test.log("triggerMethod2 : arg == " + $1),
-   test.log("triggerMethod2 : org.jboss.jbossts.orchestration.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary().left.value == " + org.jboss.jbossts.orchestration.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary().left.value),
+   test.log("triggerMethod2 : org.jboss.byteman.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary().left.value == " + org.jboss.byteman.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary().left.value),
    test.log("triggerMethod2 : TestFieldMethodAuxiliary.getTheAuxiliary().left.getRight().right == " + (TestFieldMethodAuxiliary.getTheAuxiliary().left.getRight()).right),
-   return org.jboss.jbossts.orchestration.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary().getLeft().right
+   return org.jboss.byteman.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary().getLeft().right
 ENDRULE
 
 RULE test method 4
 CLASS TestMethod
 METHOD triggerMethod2(TestFieldMethodAuxiliary)
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AFTER CALL log
 BIND test : Test = $0,
      arg : TestFieldMethodAuxiliary = $1
 IF arg.value != 4
 DO test.log("triggerMethod2 : arg == " + $1),
    test.log("triggerMethod2 : TestFieldMethodAuxiliary.getTheAuxiliary().getValue() == " + TestFieldMethodAuxiliary.getTheAuxiliary().getValue()),
-   test.log("triggerMethod2 : org.jboss.jbossts.orchestration.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary().right.right.getRight().right.getValue() == " + org.jboss.jbossts.orchestration.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary().right.right.getRight().right.getValue()),
+   test.log("triggerMethod2 : org.jboss.byteman.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary().right.right.getRight().right.getValue() == " + org.jboss.byteman.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary().right.right.getRight().right.getValue()),
    return arg.getLeft()
 ENDRULE
 

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestCall.txt
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestCall.txt	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestCall.txt	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,7 +1,7 @@
 RULE test call getCounter trigger
 CLASS TestCallThrowSynchAuxiliary
 METHOD testMethod()
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AT CALL getCounter
 BIND test : Test = $0.getTest()
 IF TRUE
@@ -11,7 +11,7 @@
 RULE test call getCounter trigger 2
 CLASS TestCallThrowSynchAuxiliary
 METHOD testMethod()
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AT CALL getCounter 2
 BIND test : Test = $0.getTest()
 IF TRUE
@@ -21,7 +21,7 @@
 RULE test call getCounter trigger 3
 CLASS TestCallThrowSynchAuxiliary
 METHOD testMethod()
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AT CALL getCounter 3
 BIND test : Test = $0.getTest()
 IF TRUE
@@ -31,7 +31,7 @@
 RULE test call setCounter trigger
 CLASS TestCallThrowSynchAuxiliary
 METHOD testMethod()
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AT CALL setCounter
 BIND test : Test = $0.getTest()
 IF TRUE
@@ -41,7 +41,7 @@
 RULE test call setCounter trigger 2
 CLASS TestCallThrowSynchAuxiliary
 METHOD testMethod()
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AT CALL setCounter 2
 BIND test : Test = $0.getTest()
 IF TRUE
@@ -51,7 +51,7 @@
 RULE test call setCounter trigger 3
 CLASS TestCallThrowSynchAuxiliary
 METHOD testMethod()
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AT CALL setCounter 3
 BIND test : Test = $0.getTest()
 IF TRUE

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestEntry.txt
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestEntry.txt	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestEntry.txt	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,7 +1,7 @@
 RULE test entry trigger for constructor
 CLASS TestEntryExitAuxiliarySub
 METHOD <init>(Test)
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AT ENTRY
 BIND test : Test = $1
 IF TRUE
@@ -11,7 +11,7 @@
 RULE test entry trigger for subclass method
 CLASS TestEntryExitAuxiliarySub
 METHOD testMethod()
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AT ENTRY
 BIND test : Test = $0.getTest()
 IF TRUE
@@ -21,7 +21,7 @@
 RULE test entry trigger for superclass method
 CLASS TestEntryExitAuxiliary
 METHOD testMethod()
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AT ENTRY
 BIND test : Test = $0.getTest()
 IF TRUE

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestExit.txt
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestExit.txt	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestExit.txt	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,7 +1,7 @@
 RULE test exit trigger for constructor
 CLASS TestEntryExitAuxiliarySub
 METHOD <init>(Test)
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AT EXIT
 BIND test : Test = $1
 IF TRUE
@@ -11,7 +11,7 @@
 RULE test exit trigger for subclass method
 CLASS TestEntryExitAuxiliarySub
 METHOD testMethod()
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AT EXIT
 BIND test : Test = $0.getTest()
 IF TRUE
@@ -21,7 +21,7 @@
 RULE test exit trigger for superclass method
 CLASS TestEntryExitAuxiliary
 METHOD testMethod()
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AT EXIT
 BIND test : Test = $0.getTest()
 IF TRUE

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestReadWrite.txt
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestReadWrite.txt	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestReadWrite.txt	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,7 +1,7 @@
 RULE test at read trigger
 CLASS TestReadWriteAuxiliary
 METHOD testMethod()
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AT READ counter
 BIND test : Test = $0.getTest()
 IF TRUE
@@ -11,7 +11,7 @@
 RULE test after read trigger 2
 CLASS TestReadWriteAuxiliary
 METHOD testMethod()
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AFTER READ counter 2
 BIND test : Test = $0.getTest()
 IF TRUE
@@ -21,7 +21,7 @@
 RULE test at write trigger
 CLASS TestReadWriteAuxiliary
 METHOD testMethod()
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AT WRITE counter
 BIND test : Test = $0.getTest()
 IF TRUE
@@ -31,7 +31,7 @@
 RULE test after write trigger 2
 CLASS TestReadWriteAuxiliary
 METHOD testMethod()
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AFTER WRITE counter 2
 BIND test : Test = $0.getTest()
 IF TRUE

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestSynch.txt
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestSynch.txt	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestSynch.txt	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,7 +1,7 @@
 RULE test getSynchronize trigger
 CLASS TestCallThrowSynchAuxiliary
 METHOD testMethod()
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AT SYNCHRONIZE
 BIND test : Test = $0.getTest()
 IF TRUE
@@ -11,7 +11,7 @@
 RULE test getSynchronize trigger 2
 CLASS TestCallThrowSynchAuxiliary
 METHOD testMethod()
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AT SYNCHRONIZE 2
 BIND test : Test = $0.getTest()
 IF TRUE

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestThrow.txt
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestThrow.txt	2009-06-03 13:40:24 UTC (rev 26810)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/dd/scripts/location/TestThrow.txt	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,7 +1,7 @@
 #RULE test throw trigger
 #CLASS TestCallThrowSynchAuxiliary
 #METHOD testMethod()
-#HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+#HELPER org.jboss.byteman.tests.helpers.Default
 #AT THROW
 #BIND test : Test = $0.getTest()
 #IF TRUE
@@ -11,7 +11,7 @@
 RULE test throw trigger 2
 CLASS TestCallThrowSynchAuxiliary
 METHOD testMethod()
-HELPER org.jboss.jbossts.orchestration.tests.helpers.Default
+HELPER org.jboss.byteman.tests.helpers.Default
 AT THROW 2
 BIND test : Test = $0.getTest()
 IF TRUE

Copied: labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests (from rev 26809, labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/jbossts/orchestration/tests)

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/Test.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/jbossts/orchestration/tests/Test.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/Test.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,4 +1,4 @@
-package org.jboss.jbossts.orchestration.tests;
+package org.jboss.byteman.tests;
 
 import junit.framework.TestCase;
 

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/auxiliary/TestCallThrowSynchAuxiliary.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/jbossts/orchestration/tests/auxiliary/TestCallThrowSynchAuxiliary.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/auxiliary/TestCallThrowSynchAuxiliary.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,6 +1,6 @@
-package org.jboss.jbossts.orchestration.tests.auxiliary;
+package org.jboss.byteman.tests.auxiliary;
 
-import org.jboss.jbossts.orchestration.tests.Test;
+import org.jboss.byteman.tests.Test;
 
 /**
  * Auxiliary class used by call, throw and synchronization location test classes

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/auxiliary/TestEntryExitAuxiliary.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/jbossts/orchestration/tests/auxiliary/TestEntryExitAuxiliary.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/auxiliary/TestEntryExitAuxiliary.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,6 +1,6 @@
-package org.jboss.jbossts.orchestration.tests.auxiliary;
+package org.jboss.byteman.tests.auxiliary;
 
-import org.jboss.jbossts.orchestration.tests.Test;
+import org.jboss.byteman.tests.Test;
 
 /**
  * Auxiliary class used by entry and exit location test classes

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/auxiliary/TestEntryExitAuxiliarySub.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/jbossts/orchestration/tests/auxiliary/TestEntryExitAuxiliarySub.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/auxiliary/TestEntryExitAuxiliarySub.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,6 +1,6 @@
-package org.jboss.jbossts.orchestration.tests.auxiliary;
+package org.jboss.byteman.tests.auxiliary;
 
-import org.jboss.jbossts.orchestration.tests.Test;
+import org.jboss.byteman.tests.Test;
 
 /**
  * Auxiliary subclass used by entry and exit location test classes

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/auxiliary/TestFieldMethodAuxiliary.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/jbossts/orchestration/tests/auxiliary/TestFieldMethodAuxiliary.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/auxiliary/TestFieldMethodAuxiliary.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,4 +1,4 @@
-package org.jboss.jbossts.orchestration.tests.auxiliary;
+package org.jboss.byteman.tests.auxiliary;
 
 /**
  * Auxiliary class used to implement TestField test class

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/auxiliary/TestReadWriteAuxiliary.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/jbossts/orchestration/tests/auxiliary/TestReadWriteAuxiliary.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/auxiliary/TestReadWriteAuxiliary.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,6 +1,6 @@
-package org.jboss.jbossts.orchestration.tests.auxiliary;
+package org.jboss.byteman.tests.auxiliary;
 
-import org.jboss.jbossts.orchestration.tests.Test;
+import org.jboss.byteman.tests.Test;
 
 /**
  * Auxiliary subclass used by read and write location test classes

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/helpers/Default.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/jbossts/orchestration/tests/helpers/Default.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/helpers/Default.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,9 +1,9 @@
-package org.jboss.jbossts.orchestration.tests.helpers;
+package org.jboss.byteman.tests.helpers;
 
-import org.jboss.jbossts.orchestration.tests.Test;
+import org.jboss.byteman.tests.Test;
 
 /**
- * default helper used in TOAST unit tests providing simple logging capability
+ * default helper used in byteman unit tests providing simple logging capability
  */
 public class Default
 {

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/javaops/TestArithmetic.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/jbossts/orchestration/tests/javaops/TestArithmetic.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/javaops/TestArithmetic.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,6 +1,6 @@
-package org.jboss.jbossts.orchestration.tests.javaops;
+package org.jboss.byteman.tests.javaops;
 
-import org.jboss.jbossts.orchestration.tests.Test;
+import org.jboss.byteman.tests.Test;
 
 /**
  * Test to ensure arithmetic operations compute as expected

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/javaops/TestField.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/jbossts/orchestration/tests/javaops/TestField.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/javaops/TestField.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,7 +1,7 @@
-package org.jboss.jbossts.orchestration.tests.javaops;
+package org.jboss.byteman.tests.javaops;
 
-import org.jboss.jbossts.orchestration.tests.Test;
-import org.jboss.jbossts.orchestration.tests.auxiliary.TestFieldMethodAuxiliary;
+import org.jboss.byteman.tests.Test;
+import org.jboss.byteman.tests.auxiliary.TestFieldMethodAuxiliary;
 
 /**
  * Test to ensure static and instance field accesses work as expected

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/javaops/TestLogical.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/jbossts/orchestration/tests/javaops/TestLogical.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/javaops/TestLogical.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,6 +1,6 @@
-package org.jboss.jbossts.orchestration.tests.javaops;
+package org.jboss.byteman.tests.javaops;
 
-import org.jboss.jbossts.orchestration.tests.Test;
+import org.jboss.byteman.tests.Test;
 
 /**
  * Test to ensure logical operations compute as expected

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/javaops/TestMethod.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/jbossts/orchestration/tests/javaops/TestMethod.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/javaops/TestMethod.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,7 +1,7 @@
-package org.jboss.jbossts.orchestration.tests.javaops;
+package org.jboss.byteman.tests.javaops;
 
-import org.jboss.jbossts.orchestration.tests.Test;
-import org.jboss.jbossts.orchestration.tests.auxiliary.TestFieldMethodAuxiliary;
+import org.jboss.byteman.tests.Test;
+import org.jboss.byteman.tests.auxiliary.TestFieldMethodAuxiliary;
 
 /**
  * Test to ensure static and instance field accesses work as expected
@@ -147,9 +147,9 @@
                 logExpected("calling TestMethod.triggerMethod2");
                 logExpected("inside TestMethod.triggerMethod2");
                 logExpected("triggerMethod2 : arg == " + aux[4]);
-                logExpected("triggerMethod2 : org.jboss.jbossts.orchestration.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary().left.value == " + (org.jboss.jbossts.orchestration.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary()).left.value);
+                logExpected("triggerMethod2 : org.jboss.byteman.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary().left.value == " + (org.jboss.byteman.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary()).left.value);
                 logExpected("triggerMethod2 : TestFieldMethodAuxiliary.getTheAuxiliary().left.getRight().right == " + TestFieldMethodAuxiliary.getTheAuxiliary().left.getRight().right);
-                logExpected("called TestMethod.triggerMethod2 : result == " + org.jboss.jbossts.orchestration.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary().getLeft().right);
+                logExpected("called TestMethod.triggerMethod2 : result == " + org.jboss.byteman.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary().getLeft().right);
             }
             break;
             case 4:
@@ -158,7 +158,7 @@
                 logExpected("inside TestMethod.triggerMethod2");
                 logExpected("triggerMethod2 : arg == " + aux[7]);
                 logExpected("triggerMethod2 : TestFieldMethodAuxiliary.getTheAuxiliary().getValue() == " + TestFieldMethodAuxiliary.getTheAuxiliary().getValue());
-                logExpected("triggerMethod2 : org.jboss.jbossts.orchestration.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary().right.right.getRight().right.getValue() == " + org.jboss.jbossts.orchestration.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary().right.right.getRight().right.getValue());
+                logExpected("triggerMethod2 : org.jboss.byteman.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary().right.right.getRight().right.getValue() == " + org.jboss.byteman.tests.auxiliary.TestFieldMethodAuxiliary.getTheAuxiliary().right.right.getRight().right.getValue());
                 logExpected("called TestMethod.triggerMethod2 : result == " + aux[7].getLeft());
             }
             break;

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/location/TestCall.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/jbossts/orchestration/tests/location/TestCall.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/location/TestCall.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,9 +1,7 @@
-package org.jboss.jbossts.orchestration.tests.location;
+package org.jboss.byteman.tests.location;
 
-import org.jboss.jbossts.orchestration.tests.Test;
-import org.jboss.jbossts.orchestration.tests.auxiliary.TestEntryExitAuxiliary;
-import org.jboss.jbossts.orchestration.tests.auxiliary.TestEntryExitAuxiliarySub;
-import org.jboss.jbossts.orchestration.tests.auxiliary.TestCallThrowSynchAuxiliary;
+import org.jboss.byteman.tests.Test;
+import org.jboss.byteman.tests.auxiliary.TestCallThrowSynchAuxiliary;
 
 /**
  * Test to ensure at entry trigger points are correctly identified

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/location/TestEntry.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/jbossts/orchestration/tests/location/TestEntry.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/location/TestEntry.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,8 +1,8 @@
-package org.jboss.jbossts.orchestration.tests.location;
+package org.jboss.byteman.tests.location;
 
-import org.jboss.jbossts.orchestration.tests.Test;
-import org.jboss.jbossts.orchestration.tests.auxiliary.TestEntryExitAuxiliary;
-import org.jboss.jbossts.orchestration.tests.auxiliary.TestEntryExitAuxiliarySub;
+import org.jboss.byteman.tests.Test;
+import org.jboss.byteman.tests.auxiliary.TestEntryExitAuxiliary;
+import org.jboss.byteman.tests.auxiliary.TestEntryExitAuxiliarySub;
 
 /**
  * Test to ensure at entry trigger points are correctly identified

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/location/TestExit.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/jbossts/orchestration/tests/location/TestExit.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/location/TestExit.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,8 +1,8 @@
-package org.jboss.jbossts.orchestration.tests.location;
+package org.jboss.byteman.tests.location;
 
-import org.jboss.jbossts.orchestration.tests.Test;
-import org.jboss.jbossts.orchestration.tests.auxiliary.TestEntryExitAuxiliary;
-import org.jboss.jbossts.orchestration.tests.auxiliary.TestEntryExitAuxiliarySub;
+import org.jboss.byteman.tests.Test;
+import org.jboss.byteman.tests.auxiliary.TestEntryExitAuxiliary;
+import org.jboss.byteman.tests.auxiliary.TestEntryExitAuxiliarySub;
 
 /**
  * Test to ensure at entry trigger points are correctly identified

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/location/TestReadWrite.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/jbossts/orchestration/tests/location/TestReadWrite.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/location/TestReadWrite.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,7 +1,7 @@
-package org.jboss.jbossts.orchestration.tests.location;
+package org.jboss.byteman.tests.location;
 
-import org.jboss.jbossts.orchestration.tests.Test;
-import org.jboss.jbossts.orchestration.tests.auxiliary.TestReadWriteAuxiliary;
+import org.jboss.byteman.tests.Test;
+import org.jboss.byteman.tests.auxiliary.TestReadWriteAuxiliary;
 
 /**
  * Test to ensure at entry trigger points are correctly identified

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/location/TestSynch.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/jbossts/orchestration/tests/location/TestSynch.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/location/TestSynch.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,9 +1,7 @@
-package org.jboss.jbossts.orchestration.tests.location;
+package org.jboss.byteman.tests.location;
 
-import org.jboss.jbossts.orchestration.tests.Test;
-import org.jboss.jbossts.orchestration.tests.auxiliary.TestEntryExitAuxiliary;
-import org.jboss.jbossts.orchestration.tests.auxiliary.TestEntryExitAuxiliarySub;
-import org.jboss.jbossts.orchestration.tests.auxiliary.TestCallThrowSynchAuxiliary;
+import org.jboss.byteman.tests.Test;
+import org.jboss.byteman.tests.auxiliary.TestCallThrowSynchAuxiliary;
 
 /**
  * Test to ensure at entry trigger points are correctly identified

Modified: labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/location/TestThrow.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/jbossts/orchestration/tests/location/TestThrow.java	2009-06-03 10:48:41 UTC (rev 26809)
+++ labs/jbosstm/workspace/adinn/orchestration/tests/src/org/jboss/byteman/tests/location/TestThrow.java	2009-06-03 14:44:19 UTC (rev 26811)
@@ -1,7 +1,7 @@
-package org.jboss.jbossts.orchestration.tests.location;
+package org.jboss.byteman.tests.location;
 
-import org.jboss.jbossts.orchestration.tests.Test;
-import org.jboss.jbossts.orchestration.tests.auxiliary.TestCallThrowSynchAuxiliary;
+import org.jboss.byteman.tests.Test;
+import org.jboss.byteman.tests.auxiliary.TestCallThrowSynchAuxiliary;
 
 /**
  * Test to ensure at entry trigger points are correctly identified




More information about the jboss-svn-commits mailing list