Permalink
Browse files

updating branch 1.2 from latest trunk

  • Loading branch information...
2 parents d6de552 + c03c192 commit 07220a8d4a85472803f42f79fcdbe4a1bc43fcbb @adinn adinn committed Feb 19, 2010
Showing with 2,774 additions and 42,295 deletions.
  1. +30 −332 README
  2. +15 −14 build-release-pkgs.xml
  3. +50 −23 build.xml
  4. +29 −0 dd/grammar/cup/ECAGrammar.cup
  5. +4 −0 dd/grammar/flex/ECAToken.flex
  6. BIN docs/ProgrammersGuide.odt
  7. BIN docs/ProgrammersGuide.pdf
  8. +1 −1 docs/copyright.txt
  9. BIN {trunk → }/ext/jarjar-1.0.jar
  10. +18 −3 ext/third_party_licenses.txt
  11. BIN {trunk → }/images/banner900x120transp.png
  12. BIN images/banner900x60transp.png
  13. BIN images/banner900x60transp.xcf
  14. +24 −0 src/org/jboss/byteman/agent/ScriptRepository.java
  15. +24 −0 src/org/jboss/byteman/agent/TransformContext.java
  16. +24 −0 src/org/jboss/byteman/agent/TransformListener.java
  17. +149 −149 src/org/jboss/byteman/agent/Transformer.java
  18. +118 −3 src/org/jboss/byteman/agent/adapter/RuleTriggerMethodAdapter.java
  19. 0 {trunk → }/src/org/jboss/byteman/agent/check/BytecodeChecker.java
  20. 0 {trunk → }/src/org/jboss/byteman/agent/check/ClassChecker.java
  21. 0 {trunk → }/src/org/jboss/byteman/agent/check/ClassStructureAdapter.java
  22. 0 {trunk → }/src/org/jboss/byteman/agent/check/LoadCache.java
  23. 0 {trunk → }/src/org/jboss/byteman/agent/check/LoadedClassChecker.java
  24. +25 −0 src/org/jboss/byteman/agent/submit/Submit.java
  25. +6 −4 src/org/jboss/byteman/rule/Action.java
  26. +2 −3 src/org/jboss/byteman/rule/Condition.java
  27. +3 −3 src/org/jboss/byteman/rule/Event.java
  28. +1 −1 src/org/jboss/byteman/rule/Rule.java
  29. +5 −3 src/org/jboss/byteman/rule/RuleElement.java
  30. +36 −5 src/org/jboss/byteman/rule/binding/Binding.java
  31. +135 −223 src/org/jboss/byteman/rule/compiler/Compiler.java
  32. +4 −7 src/org/jboss/byteman/rule/expression/ArrayExpression.java
  33. 0 {trunk → }/src/org/jboss/byteman/rule/expression/AssignExpression.java
  34. 0 {trunk → }/src/org/jboss/byteman/rule/expression/AssignableExpression.java
  35. +4 −4 src/org/jboss/byteman/rule/expression/BinaryOperExpression.java
  36. +2 −2 src/org/jboss/byteman/rule/expression/BooleanLiteral.java
  37. +118 −12 src/org/jboss/byteman/rule/expression/DollarExpression.java
  38. +5 −5 src/org/jboss/byteman/rule/expression/Expression.java
  39. +110 −6 src/org/jboss/byteman/rule/expression/ExpressionHelper.java
  40. +116 −18 src/org/jboss/byteman/rule/expression/FieldExpression.java
  41. +6 −7 src/org/jboss/byteman/rule/expression/MethodExpression.java
  42. 0 {trunk → }/src/org/jboss/byteman/rule/expression/NewExpression.java
  43. 0 {trunk → }/src/org/jboss/byteman/rule/expression/NullLiteral.java
  44. +2 −2 src/org/jboss/byteman/rule/expression/NumericLiteral.java
  45. +7 −2 src/org/jboss/byteman/rule/expression/OperExpression.java
  46. +8 −3 src/org/jboss/byteman/rule/expression/PlusExpression.java
  47. +3 −4 src/org/jboss/byteman/rule/expression/ReturnExpression.java
  48. +53 −3 src/org/jboss/byteman/rule/expression/StaticExpression.java
  49. +3 −2 src/org/jboss/byteman/rule/expression/StringLiteral.java
  50. +6 −5 src/org/jboss/byteman/rule/expression/TernaryOperExpression.java
  51. +4 −6 src/org/jboss/byteman/rule/expression/ThrowExpression.java
  52. +3 −2 src/org/jboss/byteman/rule/expression/UnaryOperExpression.java
  53. +101 −4 src/org/jboss/byteman/rule/expression/Variable.java
  54. +925 −689 src/org/jboss/byteman/rule/grammar/ECAGrammarParser.java
  55. +256 −236 src/org/jboss/byteman/rule/grammar/ECATokenLexer.java
  56. +6 −0 src/org/jboss/byteman/rule/grammar/ParseNode.java
  57. +50 −46 src/org/jboss/byteman/rule/grammar/sym.java
  58. +2 −2 src/org/jboss/byteman/rule/helper/HelperAdapter.java
  59. +24 −9 src/org/jboss/byteman/rule/helper/InterpretedHelper.java
  60. +1 −1 src/org/jboss/byteman/rule/type/Type.java
  61. +92 −0 tests/build.xml
  62. 0 {trunk → }/tests/dd/scripts/javaops/TestAssign.txt
  63. 0 {trunk → }/tests/dd/scripts/javaops/TestNew.txt
  64. +25 −0 tests/src/org/jboss/byteman/tests/bugfixes/TestWaitAfterSignalWakeMustMeet.java
  65. +25 −0 tests/src/org/jboss/byteman/tests/helpers/TestWaitAfterSignalWakeMustMeetHelper.java
  66. 0 {trunk → }/tests/src/org/jboss/byteman/tests/javaops/TestAssign.java
  67. 0 {trunk → }/tests/src/org/jboss/byteman/tests/javaops/TestNew.java
  68. +25 −0 tests/src/org/jboss/byteman/tests/misc/TestInterfaceInjection.java
  69. +32 −4 tests/src/org/jboss/byteman/tests/misc/TestOverridingInjection.java
  70. +32 −5 tests/src/org/jboss/byteman/tests/misc/TestOverridingInterfaceInjection.java
  71. +25 −0 tests/src/org/jboss/byteman/tests/misc/TestReturnBinding.java
  72. +0 −53 trunk/README
  73. +0 −231 trunk/bin/bmjava.sh
  74. +0 −95 trunk/bin/bytemancheck.sh
  75. +0 −80 trunk/bin/submit.sh
  76. +0 −168 trunk/build-release-pkgs.xml
  77. +0 −259 trunk/build.xml
  78. +0 −3 trunk/dd/META-INF/MANIFEST.MF
  79. +0 −657 trunk/dd/grammar/cup/ECAGrammar.cup
  80. +0 −287 trunk/dd/grammar/flex/ECAToken.flex
  81. BIN trunk/docs/ProgrammersGuide.odt
  82. BIN trunk/docs/ProgrammersGuide.pdf
  83. +0 −23 trunk/docs/copyright.txt
  84. BIN trunk/ext/JFlex.jar
  85. BIN trunk/ext/asm-all-3.0.jar
  86. BIN trunk/ext/javacup.jar
  87. BIN trunk/ext/javacuprt.jar
  88. BIN trunk/ext/junit.jar
  89. +0 −388 trunk/ext/third_party_licenses.txt
  90. BIN trunk/images/banner900x60transp.png
  91. BIN trunk/images/banner900x60transp.xcf
  92. BIN trunk/images/logotransp.png
  93. BIN trunk/images/logotransp.xcf
  94. +0 −86 trunk/sample/build.xml
  95. +0 −65 trunk/sample/scripts/ClassLoadMonitor.txt
  96. +0 −121 trunk/sample/scripts/FileMonitor.txt
  97. +0 −65 trunk/sample/scripts/FinalizeMonitor.txt
  98. +0 −236 trunk/sample/scripts/SocketMonitor.txt
  99. +0 −110 trunk/sample/scripts/ThreadMonitor.txt
  100. +0 −421 trunk/sample/src/org/jboss/byteman/sample/helper/StackTraceHelper.java
  101. +0 −223 trunk/sample/src/org/jboss/byteman/sample/helper/ThreadMonitorHelper.java
  102. +0 −786 trunk/src/org/jboss/byteman/agent/Location.java
  103. +0 −191 trunk/src/org/jboss/byteman/agent/LocationType.java
  104. +0 −245 trunk/src/org/jboss/byteman/agent/Main.java
  105. +0 −337 trunk/src/org/jboss/byteman/agent/Retransformer.java
  106. +0 −361 trunk/src/org/jboss/byteman/agent/RuleScript.java
  107. +0 −602 trunk/src/org/jboss/byteman/agent/ScriptRepository.java
  108. +0 −125 trunk/src/org/jboss/byteman/agent/Transform.java
  109. +0 −138 trunk/src/org/jboss/byteman/agent/TransformContext.java
  110. +0 −454 trunk/src/org/jboss/byteman/agent/TransformListener.java
  111. +0 −1,197 trunk/src/org/jboss/byteman/agent/Transformer.java
  112. +0 −163 trunk/src/org/jboss/byteman/agent/adapter/AccessCheckAdapter.java
  113. +0 −190 trunk/src/org/jboss/byteman/agent/adapter/AccessTriggerAdapter.java
  114. +0 −92 trunk/src/org/jboss/byteman/agent/adapter/EntryCheckAdapter.java
  115. +0 −214 trunk/src/org/jboss/byteman/agent/adapter/EntryTriggerAdapter.java
  116. +0 −168 trunk/src/org/jboss/byteman/agent/adapter/ExitCheckAdapter.java
  117. +0 −145 trunk/src/org/jboss/byteman/agent/adapter/ExitTriggerAdapter.java
  118. +0 −147 trunk/src/org/jboss/byteman/agent/adapter/InvokeCheckAdapter.java
  119. +0 −178 trunk/src/org/jboss/byteman/agent/adapter/InvokeTriggerAdapter.java
  120. +0 −100 trunk/src/org/jboss/byteman/agent/adapter/LineCheckAdapter.java
  121. +0 −113 trunk/src/org/jboss/byteman/agent/adapter/LineTriggerAdapter.java
  122. +0 −527 trunk/src/org/jboss/byteman/agent/adapter/OpcodesHelper.java
  123. +0 −66 trunk/src/org/jboss/byteman/agent/adapter/RuleAdapter.java
  124. +0 −53 trunk/src/org/jboss/byteman/agent/adapter/RuleCheckAdapter.java
  125. +0 −159 trunk/src/org/jboss/byteman/agent/adapter/RuleCheckMethodAdapter.java
  126. +0 −1,434 trunk/src/org/jboss/byteman/agent/adapter/RuleGeneratorAdapter.java
  127. +0 −115 trunk/src/org/jboss/byteman/agent/adapter/RuleMethodAdapter.java
  128. +0 −40 trunk/src/org/jboss/byteman/agent/adapter/RuleTriggerAdapter.java
  129. +0 −877 trunk/src/org/jboss/byteman/agent/adapter/RuleTriggerMethodAdapter.java
  130. +0 −106 trunk/src/org/jboss/byteman/agent/adapter/SynchronizeCheckAdapter.java
  131. +0 −95 trunk/src/org/jboss/byteman/agent/adapter/SynchronizeTriggerAdapter.java
  132. +0 −111 trunk/src/org/jboss/byteman/agent/adapter/ThrowCheckAdapter.java
  133. +0 −132 trunk/src/org/jboss/byteman/agent/adapter/ThrowTriggerAdapter.java
  134. +0 −1,072 trunk/src/org/jboss/byteman/agent/adapter/cfg/BBlock.java
  135. +0 −1,282 trunk/src/org/jboss/byteman/agent/adapter/cfg/CFG.java
  136. +0 −88 trunk/src/org/jboss/byteman/agent/adapter/cfg/CodeLocation.java
  137. +0 −130 trunk/src/org/jboss/byteman/agent/adapter/cfg/FanOut.java
  138. +0 −236 trunk/src/org/jboss/byteman/agent/adapter/cfg/InstructionSequence.java
  139. +0 −116 trunk/src/org/jboss/byteman/agent/adapter/cfg/TriggerDetails.java
  140. +0 −140 trunk/src/org/jboss/byteman/agent/adapter/cfg/TryCatchDetails.java
  141. +0 −949 trunk/src/org/jboss/byteman/agent/submit/Submit.java
  142. +0 −175 trunk/src/org/jboss/byteman/rule/Action.java
  143. +0 −141 trunk/src/org/jboss/byteman/rule/Condition.java
  144. +0 −331 trunk/src/org/jboss/byteman/rule/Event.java
  145. +0 −799 trunk/src/org/jboss/byteman/rule/Rule.java
  146. +0 −423 trunk/src/org/jboss/byteman/rule/RuleElement.java
  147. +0 −349 trunk/src/org/jboss/byteman/rule/binding/Binding.java
  148. +0 −86 trunk/src/org/jboss/byteman/rule/binding/Bindings.java
  149. +0 −491 trunk/src/org/jboss/byteman/rule/compiler/Compiler.java
  150. +0 −89 trunk/src/org/jboss/byteman/rule/compiler/StackHeights.java
  151. +0 −40 trunk/src/org/jboss/byteman/rule/exception/CompileException.java
  152. +0 −60 trunk/src/org/jboss/byteman/rule/exception/EarlyReturnException.java
  153. +0 −41 trunk/src/org/jboss/byteman/rule/exception/ExecuteException.java
  154. +0 −40 trunk/src/org/jboss/byteman/rule/exception/ParseException.java
  155. +0 −44 trunk/src/org/jboss/byteman/rule/exception/ThrowException.java
  156. +0 −40 trunk/src/org/jboss/byteman/rule/exception/TypeException.java
  157. +0 −434 trunk/src/org/jboss/byteman/rule/expression/ArithmeticExpression.java
  158. +0 −204 trunk/src/org/jboss/byteman/rule/expression/ArrayExpression.java
  159. +0 −77 trunk/src/org/jboss/byteman/rule/expression/BinaryOperExpression.java
  160. +0 −280 trunk/src/org/jboss/byteman/rule/expression/BitExpression.java
  161. +0 −39 trunk/src/org/jboss/byteman/rule/expression/BooleanExpression.java
  162. +0 −94 trunk/src/org/jboss/byteman/rule/expression/BooleanLiteral.java
  163. +0 −456 trunk/src/org/jboss/byteman/rule/expression/ComparisonExpression.java
  164. +0 −132 trunk/src/org/jboss/byteman/rule/expression/ConditionalEvalExpression.java
  165. +0 −281 trunk/src/org/jboss/byteman/rule/expression/DollarExpression.java
  166. +0 −112 trunk/src/org/jboss/byteman/rule/expression/Expression.java
  167. +0 −708 trunk/src/org/jboss/byteman/rule/expression/ExpressionHelper.java
  168. +0 −372 trunk/src/org/jboss/byteman/rule/expression/FieldExpression.java
  169. +0 −115 trunk/src/org/jboss/byteman/rule/expression/LogicalExpression.java
  170. +0 −462 trunk/src/org/jboss/byteman/rule/expression/MethodExpression.java
  171. +0 −127 trunk/src/org/jboss/byteman/rule/expression/MinusExpression.java
  172. +0 −94 trunk/src/org/jboss/byteman/rule/expression/NotExpression.java
  173. +0 −122 trunk/src/org/jboss/byteman/rule/expression/NumericLiteral.java
  174. +0 −210 trunk/src/org/jboss/byteman/rule/expression/OperExpression.java
  175. +0 −197 trunk/src/org/jboss/byteman/rule/expression/PlusExpression.java
  176. +0 −240 trunk/src/org/jboss/byteman/rule/expression/ReturnExpression.java
  177. +0 −198 trunk/src/org/jboss/byteman/rule/expression/StaticExpression.java
  178. +0 −99 trunk/src/org/jboss/byteman/rule/expression/StringLiteral.java
  179. +0 −105 trunk/src/org/jboss/byteman/rule/expression/StringPlusExpression.java
  180. +0 −84 trunk/src/org/jboss/byteman/rule/expression/TernaryOperExpression.java
  181. +0 −357 trunk/src/org/jboss/byteman/rule/expression/ThrowExpression.java
  182. +0 −122 trunk/src/org/jboss/byteman/rule/expression/TwiddleExpression.java
  183. +0 −72 trunk/src/org/jboss/byteman/rule/expression/UnaryOperExpression.java
  184. +0 −232 trunk/src/org/jboss/byteman/rule/expression/Variable.java
  185. +0 −2,696 trunk/src/org/jboss/byteman/rule/grammar/ECAGrammarParser.java
  186. +0 −1,139 trunk/src/org/jboss/byteman/rule/grammar/ECATokenLexer.java
  187. +0 −573 trunk/src/org/jboss/byteman/rule/grammar/ParseNode.java
  188. +0 −125 trunk/src/org/jboss/byteman/rule/grammar/PrintableSymbol.java
  189. +0 −103 trunk/src/org/jboss/byteman/rule/grammar/sym.java
  190. +0 −1,111 trunk/src/org/jboss/byteman/rule/helper/Helper.java
  191. +0 −47 trunk/src/org/jboss/byteman/rule/helper/HelperAdapter.java
  192. +0 −172 trunk/src/org/jboss/byteman/rule/helper/InterpretedHelper.java
  193. +0 −1,074 trunk/src/org/jboss/byteman/rule/type/Type.java
  194. +0 −323 trunk/src/org/jboss/byteman/rule/type/TypeGroup.java
  195. +0 −431 trunk/src/org/jboss/byteman/rule/type/TypeHelper.java
  196. +0 −47 trunk/src/org/jboss/byteman/synchronization/CountDown.java
  197. +0 −60 trunk/src/org/jboss/byteman/synchronization/Counter.java
  198. +0 −136 trunk/src/org/jboss/byteman/synchronization/Joiner.java
  199. +0 −197 trunk/src/org/jboss/byteman/synchronization/Rendezvous.java
  200. +0 −51 trunk/src/org/jboss/byteman/synchronization/Timer.java
  201. +0 −143 trunk/src/org/jboss/byteman/synchronization/Waiter.java
  202. +0 −497 trunk/src/org/jboss/byteman/test/TestScript.java
  203. +0 −950 trunk/tests/build.xml
  204. +0 −35 trunk/tests/dd/scripts/bugfixes/TestEmptySignature.txt
  205. +0 −34 trunk/tests/dd/scripts/bugfixes/TestEnclosedSynchronizationPropagation.txt
  206. +0 −35 trunk/tests/dd/scripts/bugfixes/TestMethodParamName.txt
  207. +0 −35 trunk/tests/dd/scripts/bugfixes/TestMultiMethodMatch.txt
  208. +0 −36 trunk/tests/dd/scripts/bugfixes/TestThrowAction.txt
  209. +0 −123 trunk/tests/dd/scripts/bugfixes/TestWaitAfterSignalWakeMustMeet.txt
  210. +0 −111 trunk/tests/dd/scripts/javaops/TestArithmetic.txt
  211. +0 −37 trunk/tests/dd/scripts/javaops/TestArray.txt
  212. +0 −80 trunk/tests/dd/scripts/javaops/TestField.txt
  213. +0 −80 trunk/tests/dd/scripts/javaops/TestLogical.txt
  214. +0 −80 trunk/tests/dd/scripts/javaops/TestMethod.txt
  215. +0 −85 trunk/tests/dd/scripts/location/TestCall.txt
  216. +0 −53 trunk/tests/dd/scripts/location/TestEntry.txt
  217. +0 −53 trunk/tests/dd/scripts/location/TestExit.txt
  218. +0 −63 trunk/tests/dd/scripts/location/TestReadWrite.txt
  219. +0 −43 trunk/tests/dd/scripts/location/TestSynch.txt
  220. +0 −43 trunk/tests/dd/scripts/location/TestThrow.txt
  221. +0 −33 trunk/tests/dd/scripts/misc/TestInterfaceInjection.txt
  222. +0 −43 trunk/tests/dd/scripts/misc/TestOverridingInjection.txt
  223. +0 −33 trunk/tests/dd/scripts/misc/TestOverridingInterfaceInjection.txt
  224. +0 −78 trunk/tests/dd/scripts/misc/TestRecursiveTriggers.txt
  225. +0 −39 trunk/tests/dd/scripts/misc/TestReturnBinding.txt
  226. +0 −115 trunk/tests/src/org/jboss/byteman/tests/Test.java
  227. +0 −96 trunk/tests/src/org/jboss/byteman/tests/auxiliary/TestCallThrowSynchAuxiliary.java
  228. +0 −49 trunk/tests/src/org/jboss/byteman/tests/auxiliary/TestEntryExitAuxiliary.java
  229. +0 −46 trunk/tests/src/org/jboss/byteman/tests/auxiliary/TestEntryExitAuxiliarySub.java
  230. +0 −91 trunk/tests/src/org/jboss/byteman/tests/auxiliary/TestFieldMethodAuxiliary.java
  231. +0 −12 trunk/tests/src/org/jboss/byteman/tests/auxiliary/TestInterface.java
  232. +0 −82 trunk/tests/src/org/jboss/byteman/tests/auxiliary/TestReadWriteAuxiliary.java
  233. +0 −68 trunk/tests/src/org/jboss/byteman/tests/bugfixes/TestEmptySignature.java
  234. +0 −82 trunk/tests/src/org/jboss/byteman/tests/bugfixes/TestEnclosedSynchronizationPropagation.java
  235. +0 −62 trunk/tests/src/org/jboss/byteman/tests/bugfixes/TestMethodParamName.java
  236. +0 −83 trunk/tests/src/org/jboss/byteman/tests/bugfixes/TestMultiMethodMatch.java
  237. +0 −62 trunk/tests/src/org/jboss/byteman/tests/bugfixes/TestThrowAction.java
  238. +0 −146 trunk/tests/src/org/jboss/byteman/tests/bugfixes/TestWaitAfterSignalWakeMustMeet.java
  239. +0 −49 trunk/tests/src/org/jboss/byteman/tests/helpers/Default.java
  240. +0 −112 trunk/tests/src/org/jboss/byteman/tests/helpers/TestWaitAfterSignalWakeMustMeetHelper.java
  241. +0 −195 trunk/tests/src/org/jboss/byteman/tests/javaops/TestArithmetic.java
  242. +0 −76 trunk/tests/src/org/jboss/byteman/tests/javaops/TestArray.java
  243. +0 −192 trunk/tests/src/org/jboss/byteman/tests/javaops/TestField.java
  244. +0 −147 trunk/tests/src/org/jboss/byteman/tests/javaops/TestLogical.java
  245. +0 −192 trunk/tests/src/org/jboss/byteman/tests/javaops/TestMethod.java
  246. +0 −81 trunk/tests/src/org/jboss/byteman/tests/location/TestCall.java
  247. +0 −80 trunk/tests/src/org/jboss/byteman/tests/location/TestEntry.java
  248. +0 −79 trunk/tests/src/org/jboss/byteman/tests/location/TestExit.java
  249. +0 −75 trunk/tests/src/org/jboss/byteman/tests/location/TestReadWrite.java
  250. +0 −76 trunk/tests/src/org/jboss/byteman/tests/location/TestSynch.java
  251. +0 −104 trunk/tests/src/org/jboss/byteman/tests/location/TestThrow.java
  252. +0 −81 trunk/tests/src/org/jboss/byteman/tests/misc/TestInterfaceInjection.java
  253. +0 −88 trunk/tests/src/org/jboss/byteman/tests/misc/TestOverridingInjection.java
  254. +0 −84 trunk/tests/src/org/jboss/byteman/tests/misc/TestOverridingInterfaceInjection.java
  255. +0 −109 trunk/tests/src/org/jboss/byteman/tests/misc/TestRecursiveTriggers.java
  256. +0 −82 trunk/tests/src/org/jboss/byteman/tests/misc/TestReturnBinding.java
View
Oops, something went wrong.
@@ -86,10 +86,10 @@
<property name="svnbase"
value="https://svn.jboss.org/repos/byteman/tags"/>
<!-- The tag as it appears under svnbase -->
- <property name="tag" value="Byteman_1_2_1"/>
+ <property name="tag" value="Byteman_1_2_2"/>
<!-- The file name base for the user downloadable files. Derive it
from the tag -->
- <property name="filename" value="1.2.1"/>
+ <property name="version" value="1.2.2"/>
<!-- the location the Byteman web site content svn is checked out to -->
<property name="cmsdir" value="/home/adinn/jboss/byteman/"/>
<!-- the location the maven repository svn is checked out to.
@@ -116,27 +116,28 @@
</exec>
<!-- package the byteman source release (all src tree) -->
- <delete file="${workdir}/byteman-${filename}-src.zip"/>
+ <delete file="${workdir}/byteman-${version}-src.zip"/>
- <zip basedir="${workdir}" destfile="${workdir}/byteman-${filename}-src.zip"
+ <zip basedir="${workdir}" destfile="${workdir}/byteman-${version}-src.zip"
includes="${tag}/**"/>
<!-- build the binary release -->
- <delete file="${workdir}/byteman-${filename}.zip"/>
+ <delete file="${workdir}/byteman-${version}.zip"/>
<ant dir="${workdir}/${tag}" antfile="build.xml" target="zip">
- <property name="tag" value="${tag}"/>
+ <property name="version" value="${version}"/>
+ <property name="obfuscate.3rd.party" value="true"/>
</ant>
- <copy tofile="${workdir}/byteman-${filename}.zip" file="${workdir}/${tag}/build/byteman.zip">
+ <copy tofile="${workdir}/byteman-${version}.zip" file="${workdir}/${tag}/build/byteman.zip">
</copy>
</target>
<!-- copy the release into the cms svn tree (http://www.jboss.org/jbosstm web site content) -->
<target name="cms-repository" description="copy release bundles to JBossTS web site content">
- <mkdir dir="${cmsdir}/downloads/${filename}"/>
- <copy todir="${cmsdir}/downloads/${filename}">
- <fileset dir="${workdir}" includes="byteman-${filename}-src.zip"/>
+ <mkdir dir="${cmsdir}/downloads/${version}"/>
+ <copy todir="${cmsdir}/downloads/${version}">
+ <fileset dir="${workdir}" includes="byteman-${version}-src.zip"/>
</copy>
- <copy todir="${cmsdir}/downloads/${filename}">
- <fileset dir="${workdir}" includes="byteman-${filename}.zip"/>
+ <copy todir="${cmsdir}/downloads/${version}">
+ <fileset dir="${workdir}" includes="byteman-${version}.zip"/>
</copy>
<!-- TODO: notes dir, xml generation? project.xml edits -->
</target>
@@ -149,7 +150,7 @@
<!-- now package the Byteman release -->
<delete dir="${workdir}/build/${tag}"/>
- <unzip src="${workdir}/byteman-${filename}.zip" dest="${workdir}/build"/>
+ <unzip src="${workdir}/byteman-${version}.zip" dest="${workdir}/build"/>
<exec executable="mvn" dir="${workdir}">
<arg value="deploy:deploy-file"/>
@@ -159,7 +160,7 @@
<arg value="-DrepositoryId=${mvn.repositoryId}"/>
<arg value="-DgroupId=org.jboss.byteman"/>
<arg value="-DartifactId=byteman"/>
- <arg value="-Dversion=${filename}"/>
+ <arg value="-Dversion=${version}"/>
<arg value="-DgeneratePom=true"/>
</exec>
</target>
View
@@ -19,13 +19,14 @@
@author JBoss Inc.
-->
-<project name="byteman" default="jar" basedir=".">
+<project name="byteman" default="install" basedir=".">
+
+ <!-- define property obfuscate.3rd.party to hide 3rd party packages -->
- <!-- the directory in which your installed app server resides -->
<property environment="env"/>
<!-- version string stamped inside the manifests -->
- <property name="version" value="1.2.1"/>
+ <property name="version" value="1.2.2.SNAPSHOT"/>
<property name="ext.asm.jars" value="asm-all-3.0.jar"/>
@@ -61,7 +62,8 @@
<property name="byteman.jar" value="byteman.jar"/>
<property name="byteman-submit.jar" value="byteman-submit.jar"/>
<property name="byteman.bin.scripts" value="bytemancheck.sh submit.sh bmjava.sh"/>
- <property name="byteman.doc.files" value="ProgrammersGuide.pdf"/>
+ <property name="byteman.doc.files" value="ProgrammersGuide.pdf copyright.txt"/>
+ <property name="byteman.ext.lib.doc.files" value="third_party_licenses.txt"/>
<property name="manifest.file" value="${dd.dir}/META-INF/MANIFEST.MF"/>
<property name="javac.debug" value="on"/>
@@ -133,25 +135,47 @@
</javac>
</target>
- <target name="jar" depends="compile">
- <!--
- <unjar src="${ext.lib.dir}/junit.jar" dest="${build.classes.dir}"/>
- -->
- <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}/${byteman.jar}" manifest="${manifest.file}">
- <fileset dir="${build.classes.dir}" includes="**/*"/>
- <manifest>
- <attribute name="Implementation-Version" value="${version}"/>
- </manifest>
- </jar>
- <jar jarfile="${build.lib.dir}/${byteman-submit.jar}">
- <fileset dir="${build.classes.dir}" includes="**/Submit*.class"/>
- <manifest>
- <attribute name="Main-Class" value="org.jboss.byteman.agent.submit.Submit"/>
- <attribute name="Implementation-Version" value="${version}"/>
- </manifest>
- </jar>
+ <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
+ classpath="${ext.lib.dir}/jarjar-1.0.jar"/>
+
+ <target name="jar" depends="compile, byteman.jar, submit.jar">
+ </target>
+
+ <target name="byteman.jar.obfuscated" if="obfuscate.3rd.party">
+ <jarjar jarfile="${build.lib.dir}/${byteman.jar}" manifest="${manifest.file}">
+ <fileset dir="${build.classes.dir}" includes="**/*"/>
+ <zipfileset src="${ext.lib.dir}/asm-all-3.0.jar"/>
+ <zipfileset src="${ext.lib.dir}/javacuprt.jar"/>
+ <rule pattern="org.objectweb.asm.**" result="org.jboss.byteman.org.objectweb.asm.@1"/>
+ <rule pattern="java_cup.runtime.**" result="org.jboss.byteman.java_cup.runtime.@1"/>
+ <manifest>
+ <attribute name="Implementation-Version" value="${version}"/>
+ </manifest>
+ </jarjar>
+ </target>
+
+ <target name="byteman.jar.clear" unless="obfuscate.3rd.party">
+ <jarjar jarfile="${build.lib.dir}/${byteman.jar}" manifest="${manifest.file}">
+ <fileset dir="${build.classes.dir}" includes="**/*"/>
+ <zipfileset src="${ext.lib.dir}/asm-all-3.0.jar"/>
+ <zipfileset src="${ext.lib.dir}/javacuprt.jar"/>
+ <manifest>
+ <attribute name="Implementation-Version" value="${version}"/>
+ </manifest>
+ </jarjar>
+ </target>
+
+ <target name="byteman.jar" depends="byteman.jar.obfuscated, byteman.jar.clear">
+ </target>
+
+ <target name="submit.jar">
+ <jar jarfile="${build.lib.dir}/${byteman-submit.jar}">
+ <fileset dir="${build.classes.dir}" includes="**/Submit*.class"/>
+ <manifest>
+ <attribute name="Main-Class" value="org.jboss.byteman.agent.submit.Submit"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ </manifest>
+ </jar>
</target>
<!-- installation targets -->
@@ -176,6 +200,9 @@
<copy todir="${install.docs.dir}">
<fileset dir="${docs.src.dir}" includes="${byteman.doc.files}"/>
</copy>
+ <copy todir="${install.docs.dir}">
+ <fileset dir="${ext.lib.dir}" includes="${byteman.ext.lib.doc.files}"/>
+ </copy>
</target>
<!-- target to make and install samples in samples directory -->
@@ -218,6 +218,9 @@ terminal SEMI, COMMA, DOT;
/* assignment */
terminal ASSIGN;
+/* instance creation */
+terminal NEW;
+
/* operators of various flavours */
/* ternary operators */
@@ -255,6 +258,8 @@ terminal DOLLAR;
/* literals. strings and identifiers */
+terminal NULL_LITERAL;
+
terminal Float FLOAT_LITERAL;
terminal Integer INTEGER_LITERAL;
@@ -294,7 +299,9 @@ non terminal ParseNode field_expr;
non terminal ParseNode expr_field_expr;
non terminal ParseNode meth_expr;
non terminal ParseNode expr_meth_expr;
+non terminal ParseNode new_expr;
non terminal ParseNode simple_expr;
+non terminal ParseNode null_expr;
non terminal ParseNode array_idx_list;
non terminal ParseNode array_idx;
@@ -474,6 +481,10 @@ throw_return_expr
{: RESULT = node(ParseNode.THROW, ileft, iright, i, null); :}
| THROW name:i LPAREN expr_list:args RPAREN
{: RESULT = node(ParseNode.THROW, ileft, iright, i, args); :}
+ | THROW NEW name:i LPAREN RPAREN
+ {: RESULT = node(ParseNode.THROW, ileft, iright, i, null); :}
+ | THROW NEW name:i LPAREN expr_list:args RPAREN
+ {: RESULT = node(ParseNode.THROW, ileft, iright, i, args); :}
;
expr_list
@@ -491,8 +502,13 @@ expr
| array_expr:e {: RESULT = e; :}
| field_expr:e {: RESULT = e; :}
| meth_expr:e {: RESULT = e; :}
+ | new_expr:ne {: RESULT = ne; :}
| simple_expr:e {: RESULT = e; :}
+ | null_expr:e {: RESULT = e; :}
| simple_name:n {: RESULT = n; :}
+ | simple_name:s ASSIGN expr:e {: RESULT = node(ParseNode.ASSIGN, sleft, sright, s, e); :}
+ | DOLLAR:d ASSIGN expr:e {: RESULT = node(ParseNode.ASSIGN, dleft, dright, node(ParseNode.DOLLAR, dleft, dright, d), e); :}
+ | field_expr:f ASSIGN expr:e {: RESULT = node(ParseNode.ASSIGN, fleft, fright, f, e); :}
| error:err expr:e {: error("invalid expression", errleft, errright); RESULT = e; :}
;
@@ -596,6 +612,13 @@ expr_meth_expr
{: RESULT = node(ParseNode.METH, mleft, mright, m, efe, args); :}
;
+new_expr
+ ::= NEW name:i LPAREN RPAREN
+ {: RESULT = node(ParseNode.NEW, ileft, iright, i, null); :}
+ | NEW name:i LPAREN expr_list:args RPAREN
+ {: RESULT = node(ParseNode.NEW, ileft, iright, i, args); :}
+ ;
+
simple_expr
::= INTEGER_LITERAL:i
{: RESULT = node(ParseNode.INTEGER_LITERAL, ileft, iright, i); :}
@@ -610,6 +633,12 @@ simple_expr
| LPAREN expr:e RPAREN
{: RESULT = e; :}
;
+
+null_expr
+ ::= NULL_LITERAL:n
+ {: RESULT = node(ParseNode.NULL_LITERAL, nleft, nright); :}
+ ;
+
name ::= simple_name:n
{: RESULT = n; :}
| path:p DOT IDENTIFIER:i
@@ -129,6 +129,8 @@ Float = {Sign}? {PosFloat}
"THROW"|"throw" { return symbol(sym.THROW); }
+"NEW"|"new" { return symbol(sym.NEW); }
+
/* various bracket pairs */
"(" { return symbol(sym.LPAREN); }
@@ -225,6 +227,8 @@ Float = {Sign}? {PosFloat}
/* identifiers */
+"NULL" | "null" { return symbol(sym.NULL_LITERAL); }
+
{Identifier} { return symbol(sym.IDENTIFIER, yytext()); }
/* numbers */
Binary file not shown.
Binary file not shown.
View
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2008-9, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008-10, Red Hat Middleware LLC, and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
File renamed without changes.
@@ -6,8 +6,8 @@ THE SOFTWARE THAT IS THE PARTICULAR THIRD PARTY PRODUCT AND DO NOT
OVERRIDE ANY JBOSS SOFTWARE OR ANY OTHER PRODUCTS TERMS ASSOCIATED
WITH OTHER ELEMENTS OF THE SOFTWARE.
-LICENSE TERMS FOR ASM, JAVACUP AND JFLEX SOFTWARE THAT MAY ACCOMPANY
-THE JBOSS SOFTWARE
+LICENSE TERMS FOR ASM, JAVACUP, JFLEX AND JARJAR SOFTWARE THAT MAY
+ACCOMPANY THE JBOSS SOFTWARE
--------------------------------------------------------
License for ASM 3.0 software
@@ -72,7 +72,8 @@ JFlex - Copying, Warranty & License
-JFlex is free software, published under the terms of the GNU General Public License.
+JFlex is free software, published under the terms of the GNU General
+Public License.
There is absolutely NO WARRANTY for JFlex, its code and its documentation.
@@ -371,3 +372,17 @@ POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
+--------------------------------------------------------
+License for jarjar software
+
+Licensed under the Apache License, Version 2.0 (the "License"); you
+may not use this file except in compliance with the License. You may
+obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied. See the License for the specific language governing
+permissions and limitations under the License.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
@@ -1,3 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009-10, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * (C) 2009-10,
+ * @authors Andrew Dinn
+ */
package org.jboss.byteman.agent;
import java.util.*;
@@ -1,3 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009-10, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * (C) 2009-10,
+ * @authors Andrew Dinn
+ */
package org.jboss.byteman.agent;
import org.jboss.byteman.rule.type.TypeHelper;
Oops, something went wrong.

0 comments on commit 07220a8

Please sign in to comment.