Merge remote-tracking branch 'origin/master' into fangzhen

* origin/master: (52 commits)
  also mount $HOME/.buildr into docker container.
  small improvement for POM creation.
  re-adding pom with dependency builder.
  fixes ODE-991. Thanks to Ciaran Jessup for the patch.
  ODE-1032: fix missing dependency.
  ODE-1032: Update xerces to the latest 2.11.0 version. Thanks to Igor Vorobiov 
for the patch.
  fixing ODE-1031, thanks to Igor Vorobiov for the patch.
  fixes ODE-1019.
  fixes ODE-1023.
  ODE-928: e.printStackTrace()s removed, backport from 1.3.x
  Revert "revert Buildr to 1.4.21 to fix CI builds."
  removed tty options from docker run command
  Added the required buildr dependencies in Gemfile and updated the CI build 
script
  revert Buildr to 1.4.21 to fix CI builds.
  add rspec dependencies to Gemfile.
  fix test case clean up.
  improve logging to chase a test failure.
  temporarily disable doclint setting as this breaks with older JDKs.
  disable doclint to allow builds with Java 8.
  remove warning.
  ...

# Conflicts:
#       .gitignore
#       Rakefile
#       
bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenContexts.java
#       
bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java
#       dependencies.rb


Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/c3fb4231
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/c3fb4231
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/c3fb4231

Branch: refs/heads/master
Commit: c3fb423161682f8956061f4db72b816567d06856
Parents: b13f4c3 f23e68e
Author: Tammo van Lessen <[email protected]>
Authored: Fri Jul 17 20:36:57 2015 +0200
Committer: Tammo van Lessen <[email protected]>
Committed: Fri Jul 17 20:36:57 2015 +0200

----------------------------------------------------------------------
 .gitignore                                      |   1 +
 Rakefile                                        |  67 ++-
 .../bpel/explang/ConfigurationException.java    |   2 +-
 .../ode/bpel/explang/EvaluationContext.java     |  10 +-
 .../bpel/explang/ExpressionLanguageRuntime.java |   2 +-
 .../apache/ode/bpel/iapi/DebuggerContext.java   |   2 +-
 .../org/apache/ode/bpel/iapi/ProcessConf.java   |   9 +-
 .../ode/bpel/pmapi/BpelManagementFacade.java    |   2 +-
 .../ode/bpel/compiler/ActivityGenerator.java    |   4 +-
 .../ode/bpel/compiler/AssignGenerator.java      | 129 ++--
 .../org/apache/ode/bpel/compiler/BpelC.java     | 158 ++++-
 .../apache/ode/bpel/compiler/BpelCompiler.java  | 581 +++++++++----------
 .../ode/bpel/compiler/CompensateGenerator.java  |   4 +-
 .../bpel/compiler/CompensateScopeGenerator.java |   6 +-
 .../bpel/compiler/DefaultActivityGenerator.java |  10 +-
 .../ode/bpel/compiler/EmptyGenerator.java       |   4 +-
 .../compiler/ExpressionValidatorFactory.java    |   2 +-
 .../apache/ode/bpel/compiler/FlowGenerator.java |  30 +-
 .../ode/bpel/compiler/ForEachGenerator.java     |  32 +-
 .../apache/ode/bpel/compiler/IfGenerator.java   |  13 +-
 .../ode/bpel/compiler/InvokeGenerator.java      |  60 +-
 .../apache/ode/bpel/compiler/PickGenerator.java |  18 +-
 .../ode/bpel/compiler/PickReceiveGenerator.java |  49 +-
 .../ode/bpel/compiler/ReceiveGenerator.java     |  12 +-
 .../ode/bpel/compiler/RepeatUntilGenerator.java |   8 +-
 .../ode/bpel/compiler/ReplyGenerator.java       |  70 +--
 .../ode/bpel/compiler/RethrowGenerator.java     |   4 +-
 .../ode/bpel/compiler/SequenceGenerator.java    |   6 +-
 .../ode/bpel/compiler/SwitchGenerator.java      |   8 +-
 .../ode/bpel/compiler/TerminateGenerator.java   |   4 +-
 .../ode/bpel/compiler/ThrowGenerator.java       |   8 +-
 .../apache/ode/bpel/compiler/WaitGenerator.java |   8 +-
 .../ode/bpel/compiler/WhileGenerator.java       |   8 +-
 .../ode/bpel/compiler/api/CompilerContext.java  |  24 +-
 .../bpel/compiler/api/ExpressionCompiler.java   |  12 +-
 .../bpel/compiler/api/ExpressionValidator.java  |   2 +-
 .../apache/ode/bpel/compiler/bom/package.html   |  39 --
 .../org/apache/ode/bpel/compiler/package.html   |  39 --
 .../xpath10/compiler/JaxenBpelHandler.java      |  34 +-
 .../XPath10ExpressionCompilerBPEL11.java        |   8 +-
 .../XPath10ExpressionCompilerBPEL20.java        |  10 +-
 .../compiler/XPath10ExpressionCompilerImpl.java |   4 +-
 .../xpath10/compiler/XslCompileUriResolver.java |   8 +-
 .../xpath20/compiler/JaxpFunctionResolver.java  |  18 +-
 .../xpath20/compiler/JaxpVariableResolver.java  |  32 +-
 .../compiler/XPath20ExpressionCompilerImpl.java |  10 +-
 .../XQuery10ExpressionCompilerImpl.java         |  38 +-
 .../org/apache/ode/bpel/compiler/XPathTest.java |  38 +-
 .../ode/bpel/compiler_2_0/GoodCompileTest.java  | 546 ++++++++---------
 .../compiler_2_0/JavaSerializationTest.java     |  57 ++
 .../compiler_2_0/JsonSerializationTest.java     |  10 +
 .../ode/bpel/compiler_2_0/MigrationTest.java    |  75 +++
 .../compiler_2_0/SmileSerializationTest.java    |  11 +
 .../apache/ode/bpel/compiler_2_0/XslTest.java   |  12 +-
 .../src/test/resources/log4j.properties         |   5 +-
 .../2.0/good/AsyncProcess/AsyncProcess2.cbp     | Bin 0 -> 47357 bytes
 .../oldcbp/2.0/good/assign/Assign1-2.0.cbp      | Bin 0 -> 32687 bytes
 .../oldcbp/2.0/good/assign/Assign2-2.0.cbp      | Bin 0 -> 33280 bytes
 .../oldcbp/2.0/good/assign/Assign3-2.0.cbp      | Bin 0 -> 36755 bytes
 .../oldcbp/2.0/good/assign/Assign5-2.0.cbp      | Bin 0 -> 32368 bytes
 .../oldcbp/2.0/good/assign/Assign6-2.0.cbp      | Bin 0 -> 32321 bytes
 .../oldcbp/2.0/good/assign/Assign7-2.0.cbp      | Bin 0 -> 31121 bytes
 .../oldcbp/2.0/good/assign/Assign8-2.0.cbp      | Bin 0 -> 30889 bytes
 .../oldcbp/2.0/good/assign/Assign9-2.0.cbp      | Bin 0 -> 29188 bytes
 .../circularReference/CircularReference.cbp     | Bin 0 -> 14991 bytes
 .../oldcbp/2.0/good/compensation/comp2-2.0.cbp  | Bin 0 -> 39468 bytes
 .../oldcbp/2.0/good/flow/flow2-2.0.cbp          | Bin 0 -> 19962 bytes
 .../oldcbp/2.0/good/flow/flow3-2.0.cbp          | Bin 0 -> 23574 bytes
 .../oldcbp/2.0/good/flow/flow4-2.0.cbp          | Bin 0 -> 20481 bytes
 .../oldcbp/2.0/good/flow/flow5-2.0.cbp          | Bin 0 -> 22729 bytes
 .../oldcbp/2.0/good/flow/flow6-2.0.cbp          | Bin 0 -> 23036 bytes
 .../oldcbp/2.0/good/flow/flow7-2.0.cbp          | Bin 0 -> 21019 bytes
 .../oldcbp/2.0/good/foreach/ForEach1-2.0.cbp    | Bin 0 -> 23325 bytes
 .../oldcbp/2.0/good/foreach/ForEach2-2.0.cbp    | Bin 0 -> 26196 bytes
 .../oldcbp/2.0/good/foreach/ForEach3-2.0.cbp    | Bin 0 -> 23950 bytes
 .../resources/oldcbp/2.0/good/if/If1-2.0.cbp    | Bin 0 -> 24684 bytes
 .../resources/oldcbp/2.0/good/if/If2-2.0.cbp    | Bin 0 -> 24685 bytes
 .../resources/oldcbp/2.0/good/if/If3-2.0.cbp    | Bin 0 -> 24685 bytes
 .../oldcbp/2.0/good/pick/Pick3-2.0.cbp          | Bin 0 -> 18036 bytes
 .../oldcbp/2.0/good/pick/Pick4-2.0.cbp          | Bin 0 -> 22661 bytes
 .../oldcbp/2.0/good/pick/Pick5-2.0.cbp          | Bin 0 -> 20291 bytes
 .../oldcbp/2.0/good/pick/Pick6-2.0.cbp          | Bin 0 -> 20728 bytes
 .../oldcbp/2.0/good/rethrow/Rethrow1-2.0.cbp    | Bin 0 -> 25547 bytes
 .../oldcbp/2.0/good/rethrow/Rethrow2-2.0.cbp    | Bin 0 -> 25957 bytes
 .../oldcbp/2.0/good/throw/Throw1-2.0.cbp        | Bin 0 -> 23565 bytes
 .../oldcbp/2.0/good/throw/Throw2-2.0.cbp        | Bin 0 -> 25235 bytes
 .../oldcbp/2.0/good/throw/Throw3-2.0.cbp        | Bin 0 -> 25714 bytes
 .../oldcbp/2.0/good/throw/Throw4-2.0.cbp        | Bin 0 -> 19586 bytes
 .../oldcbp/2.0/good/throw/Throw5-2.0.cbp        | Bin 0 -> 27764 bytes
 .../oldcbp/2.0/good/throw/Throw6-2.0.cbp        | Bin 0 -> 27722 bytes
 .../oldcbp/2.0/good/throw/Throw7-2.0.cbp        | Bin 0 -> 23492 bytes
 .../oldcbp/2.0/good/wait/Wait1-2.0.cbp          | Bin 0 -> 17041 bytes
 .../oldcbp/2.0/good/wait/Wait2-2.0.cbp          | Bin 0 -> 17090 bytes
 .../oldcbp/2.0/good/while/While1-2.0.cbp        | Bin 0 -> 18748 bytes
 .../good/xpath10-func/GetVariableData1-2.0.cbp  | Bin 0 -> 31721 bytes
 .../good/xpath10-func/GetVariableData2-2.0.cbp  | Bin 0 -> 31743 bytes
 .../good/xpath10-func/GetVariableData3-2.0.cbp  | Bin 0 -> 31742 bytes
 .../good/xpath10-func/GetVariableData4-2.0.cbp  | Bin 0 -> 31742 bytes
 .../xpath10-func/GetVariableProperty1-2.0.cbp   | Bin 0 -> 31817 bytes
 .../xpath20-func/GetVariableData2-xp2.0.cbp     | Bin 0 -> 31924 bytes
 .../xpath20-func/GetVariableData3-xp2.0.cbp     | Bin 0 -> 31462 bytes
 .../xpath20-func/GetVariableData4-xp2.0.cbp     | Bin 0 -> 31476 bytes
 .../xpath20-func/GetVariableProperty1-xp2.0.cbp | Bin 0 -> 31537 bytes
 .../2.0/good/xsd-import/helloworld-Server.cbp   | Bin 0 -> 27661 bytes
 bpel-nobj/Readme.md                             |  41 ++
 .../elang/xpath10/obj/OXPath10Expression.java   | 375 ++++++++++++
 .../xpath10/obj/OXPath10ExpressionBPEL20.java   |  79 +++
 .../xpath20/obj/OXPath20ExpressionBPEL20.java   |  59 ++
 .../xquery10/obj/OXQuery10ExpressionBPEL20.java |  58 ++
 .../java/org/apache/ode/bpel/obj/DebugInfo.java | 145 +++++
 .../org/apache/ode/bpel/obj/Extensible.java     |  36 ++
 .../org/apache/ode/bpel/obj/ExtensibleImpl.java | 128 ++++
 .../java/org/apache/ode/bpel/obj/OActivity.java | 186 ++++++
 .../java/org/apache/ode/bpel/obj/OAgent.java    | 125 ++++
 .../java/org/apache/ode/bpel/obj/OAssign.java   | 489 ++++++++++++++++
 .../java/org/apache/ode/bpel/obj/OBase.java     | 127 ++++
 .../java/org/apache/ode/bpel/obj/OCatch.java    |  65 +++
 .../org/apache/ode/bpel/obj/OCompensate.java    |  50 ++
 .../ode/bpel/obj/OCompensationHandler.java      |  33 ++
 .../ode/bpel/obj/OConstantExpression.java       |  50 ++
 .../apache/ode/bpel/obj/OConstantVarType.java   |  69 +++
 .../org/apache/ode/bpel/obj/OConstants.java     | 284 +++++++++
 .../apache/ode/bpel/obj/OElementVarType.java    |  58 ++
 .../java/org/apache/ode/bpel/obj/OEmpty.java    |  32 +
 .../org/apache/ode/bpel/obj/OEventHandler.java  | 248 ++++++++
 .../org/apache/ode/bpel/obj/OExpression.java    |  49 ++
 .../ode/bpel/obj/OExpressionLanguage.java       |  77 +++
 .../java/org/apache/ode/bpel/obj/OExtVar.java   |  72 +++
 .../apache/ode/bpel/obj/OFailureHandling.java   |  90 +++
 .../org/apache/ode/bpel/obj/OFaultHandler.java  |  59 ++
 .../java/org/apache/ode/bpel/obj/OFlow.java     |  85 +++
 .../java/org/apache/ode/bpel/obj/OForEach.java  | 161 +++++
 .../java/org/apache/ode/bpel/obj/OInvoke.java   | 233 ++++++++
 .../apache/ode/bpel/obj/OLValueExpression.java  |  60 ++
 .../java/org/apache/ode/bpel/obj/OLink.java     | 100 ++++
 .../apache/ode/bpel/obj/OMessageVarType.java    | 161 +++++
 .../apache/ode/bpel/obj/OModelException.java    |  10 +
 .../org/apache/ode/bpel/obj/OPartnerLink.java   | 309 ++++++++++
 .../org/apache/ode/bpel/obj/OPickReceive.java   | 271 +++++++++
 .../java/org/apache/ode/bpel/obj/OProcess.java  | 571 ++++++++++++++++++
 .../apache/ode/bpel/obj/OProcessWrapper.java    | 134 +++++
 .../org/apache/ode/bpel/obj/ORepeatUntil.java   |  63 ++
 .../java/org/apache/ode/bpel/obj/OReply.java    | 176 ++++++
 .../java/org/apache/ode/bpel/obj/ORethrow.java  |  32 +
 .../java/org/apache/ode/bpel/obj/OScope.java    | 490 ++++++++++++++++
 .../java/org/apache/ode/bpel/obj/OSequence.java |  52 ++
 .../java/org/apache/ode/bpel/obj/OSwitch.java   |  91 +++
 .../org/apache/ode/bpel/obj/OTerminate.java     |  35 ++
 .../ode/bpel/obj/OTerminationHandler.java       |  33 ++
 .../java/org/apache/ode/bpel/obj/OThrow.java    |  63 ++
 .../java/org/apache/ode/bpel/obj/OVarType.java  |  46 ++
 .../java/org/apache/ode/bpel/obj/OWait.java     |  75 +++
 .../java/org/apache/ode/bpel/obj/OWhile.java    |  61 ++
 .../apache/ode/bpel/obj/OXsdTypeVarType.java    |  76 +++
 .../java/org/apache/ode/bpel/obj/OXslSheet.java |  63 ++
 .../bpel/obj/migrate/AbstractObjectVisitor.java | 183 ++++++
 .../bpel/obj/migrate/DeepEqualityHelper.java    | 372 ++++++++++++
 .../bpel/obj/migrate/DomElementComparator.java  |  92 +++
 .../bpel/obj/migrate/EqualityComparator.java    |  19 +
 .../obj/migrate/ExtensibeImplEqualityComp.java  |  95 +++
 .../obj/migrate/LegacySerializerAdapter.java    |  42 ++
 .../apache/ode/bpel/obj/migrate/MigUtils.java   |  33 ++
 .../ode/bpel/obj/migrate/ObjectTraverser.java   | 179 ++++++
 .../ode/bpel/obj/migrate/ObjectVisitor.java     |  24 +
 .../apache/ode/bpel/obj/migrate/OmOld2new.java  | 219 +++++++
 .../ode/bpel/obj/migrate/OmUpgradeVisitor.java  |  50 ++
 .../ode/bpel/obj/migrate/UpgradeChecker.java    |  60 ++
 .../apache/ode/bpel/obj/serde/DeSerializer.java | 229 ++++++++
 .../bpel/obj/serde/JavaSerOmDeserializer.java   |  34 ++
 .../ode/bpel/obj/serde/JavaSerOmSerializer.java |  34 ++
 .../ode/bpel/obj/serde/JsonOmDeserializer.java  | 296 ++++++++++
 .../ode/bpel/obj/serde/JsonOmSerializer.java    | 223 +++++++
 .../bpel/obj/serde/KeyAsJsonDeserializer.java   |  34 ++
 .../ode/bpel/obj/serde/KeyAsJsonSerializer.java |  32 +
 .../ode/bpel/obj/serde/OmDeserializer.java      |  13 +
 .../ode/bpel/obj/serde/OmSerdeFactory.java      |  92 +++
 .../apache/ode/bpel/obj/serde/OmSerializer.java |  13 +
 .../bpel/obj/serde/SerializaionRtException.java |  10 +
 .../ode/bpel/obj/serde/SmileOmDeserializer.java |  19 +
 .../ode/bpel/obj/serde/SmileOmSerializer.java   |  21 +
 .../serde/jacksonhack/TypeBeanSerializer.java   | 161 +++++
 .../jacksonhack/TypeBeanSerializerBuilder.java  |  46 ++
 .../jacksonhack/TypeBeanSerializerFactory.java  |  34 ++
 .../jacksonhack/UniqueStringIdGenerator.java    |  56 ++
 .../ode/bpel/obj/migrate/DeepEqualityTest.java  |  83 +++
 .../ode/bpel/obj/serde/SerializerTest.java      |  31 +
 .../bpel/obj/serde/jacksonhack/JacksonTest.java | 161 +++++
 bpel-nobj/src/test/resources/log4j.properties   |  13 +
 .../java/org/apache/ode/bpel/o/OProcess.java    |   7 -
 .../main/java/org/apache/ode/bpel/o/OScope.java |   3 -
 .../java/org/apache/ode/bpel/o/Serializer.java  |   7 -
 .../ode/bpel/elang/XslRuntimeUriResolver.java   |   6 +-
 .../elang/xpath10/runtime/JaxenContexts.java    |  90 +--
 .../runtime/XPath10ExpressionRuntime.java       |  20 +-
 .../xpath20/runtime/JaxpFunctionResolver.java   | 102 ++--
 .../xpath20/runtime/JaxpVariableResolver.java   |  28 +-
 .../runtime/XPath20ExpressionRuntime.java       |  34 +-
 .../runtime/XQuery10ExpressionRuntime.java      |  26 +-
 .../apache/ode/bpel/engine/BpelEngineImpl.java  |  22 +-
 .../bpel/engine/BpelManagementFacadeImpl.java   |   2 +-
 .../org/apache/ode/bpel/engine/BpelProcess.java |  76 ++-
 .../ode/bpel/engine/BpelRuntimeContextImpl.java |  92 +--
 .../apache/ode/bpel/engine/BpelServerImpl.java  |   2 +-
 .../apache/ode/bpel/engine/DebuggerSupport.java |   2 +-
 .../ode/bpel/engine/PartnerLinkMyRoleImpl.java  |  38 +-
 .../bpel/engine/PartnerLinkPartnerRoleImpl.java |   2 +-
 .../ode/bpel/engine/PartnerLinkRoleImpl.java    |   4 +-
 .../ProcessAndInstanceManagementImpl.java       |  12 +-
 .../ode/bpel/engine/ReplacementMapImpl.java     |   4 +-
 .../engine/extvar/ExternalVariableManager.java  |  36 +-
 .../migration/CorrelationKeyMigration.java      |  10 +-
 .../CorrelationKeySetDataMigration.java         |   4 +-
 .../migration/CorrelationKeySetMigration.java   |   2 +-
 .../engine/migration/CorrelatorsMigration.java  |   4 +-
 .../ReplayerBpelRuntimeContextImpl.java         |   6 +-
 .../org/apache/ode/bpel/runtime/ACTIVITY.java   |  30 +-
 .../apache/ode/bpel/runtime/ACTIVITYGUARD.java  |  48 +-
 .../org/apache/ode/bpel/runtime/ASSIGN.java     | 190 +++---
 .../apache/ode/bpel/runtime/ActivityInfo.java   |   2 +-
 .../bpel/runtime/ActivityTemplateFactory.java   |   2 +-
 .../ode/bpel/runtime/BpelJacobRunnable.java     |  20 +-
 .../ode/bpel/runtime/BpelRuntimeContext.java    |   8 +-
 .../org/apache/ode/bpel/runtime/COMPENSATE.java |   6 +-
 .../ode/bpel/runtime/COMPENSATIONHANDLER_.java  |  10 +-
 .../bpel/runtime/CorrelationSetInstance.java    |   2 +-
 .../org/apache/ode/bpel/runtime/EH_ALARM.java   |  32 +-
 .../org/apache/ode/bpel/runtime/EH_EVENT.java   |  50 +-
 .../ode/bpel/runtime/EventContextImpl.java      |  10 +-
 .../bpel/runtime/ExprEvaluationContextImpl.java |  22 +-
 .../ExpressionLanguageRuntimeRegistry.java      |  10 +-
 .../java/org/apache/ode/bpel/runtime/FLOW.java  |  14 +-
 .../org/apache/ode/bpel/runtime/FOREACH.java    |  44 +-
 .../org/apache/ode/bpel/runtime/INVOKE.java     |  46 +-
 .../ode/bpel/runtime/InstanceGlobals.java       |   2 +-
 .../org/apache/ode/bpel/runtime/LinkFrame.java  |   2 +-
 .../org/apache/ode/bpel/runtime/LinkInfo.java   |   2 +-
 .../java/org/apache/ode/bpel/runtime/PICK.java  | 114 ++--
 .../org/apache/ode/bpel/runtime/PROCESS.java    |  18 +-
 .../ode/bpel/runtime/PartnerLinkInstance.java   |   2 +-
 .../runtime/PropertyAliasEvaluationContext.java |  28 +-
 .../apache/ode/bpel/runtime/REPEATUNTIL.java    |   8 +-
 .../java/org/apache/ode/bpel/runtime/REPLY.java |  24 +-
 .../java/org/apache/ode/bpel/runtime/SCOPE.java |  92 +--
 .../org/apache/ode/bpel/runtime/SCOPEACT.java   |  22 +-
 .../org/apache/ode/bpel/runtime/SEQUENCE.java   |   8 +-
 .../org/apache/ode/bpel/runtime/SWITCH.java     |  14 +-
 .../org/apache/ode/bpel/runtime/ScopeFrame.java |  66 +--
 .../java/org/apache/ode/bpel/runtime/THROW.java |  12 +-
 .../ode/bpel/runtime/VariableInstance.java      |   2 +-
 .../java/org/apache/ode/bpel/runtime/WAIT.java  |   8 +-
 .../java/org/apache/ode/bpel/runtime/WHILE.java |   8 +-
 .../ode/bpel/runtime/channels/FaultData.java    |  12 +-
 .../ode/bpel/runtime/channels/ParentScope.java  |   2 +-
 .../KonstExpressionLanguageRuntimeImpl.java     |   4 +-
 .../bpel/runtime/monitor/ProcessMonitor.java    |   2 +-
 .../apache/ode/bpel/elang/URIResolverTest.java  |   2 +-
 .../runtime/XPath10ExpressionRuntimeTest.java   |  29 +-
 .../xpath20/runtime/MockCompilerContext.java    |  40 +-
 .../runtime/XPath20ExpressionRuntimeTest.java   |  18 +-
 .../ode/bpel/runtime/ActivityRecoveryTest.java  |   2 +-
 .../apache/ode/bpel/runtime/CoreBpelTest.java   | 118 ++--
 .../org/apache/ode/store/DeploymentUnitDir.java |  10 +-
 .../org/apache/ode/store/ProcessConfImpl.java   |  16 +-
 dependencies.rb                                 |   6 +
 .../java/org/apache/ode/jbi/OdeContext.java     |  21 +-
 repositories.rb                                 |   1 +
 .../tools/sendsoap/cline/HttpSoapSender.java    |   1 +
 267 files changed, 11775 insertions(+), 2029 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/c3fb4231/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 2614e82,8a19298..9981fd7
--- a/.gitignore
+++ b/.gitignore
@@@ -20,4 -20,4 +20,5 @@@ report
  test-output
  _buildr.rb
  derby.log
 +Gemfile.lock
+ spoon

http://git-wip-us.apache.org/repos/asf/ode/blob/c3fb4231/Rakefile
----------------------------------------------------------------------
diff --cc Rakefile
index 2a23e7b,c53f7f0..f29ef92
--- a/Rakefile
+++ b/Rakefile
@@@ -25,7 -26,10 +25,9 @@@ require "buildr/hibernate
  require File.join(File.dirname(__FILE__), 'repositories.rb')
  require File.join(File.dirname(__FILE__), 'dependencies.rb')
  
 -Buildr.settings.build['jmock'] = "1.2.0"
 -Buildr.settings.build['junit'] = "4.11"
 -Buildr::JUnit.instance_eval { @dependencies = ["junit:junit:jar:#{version}", 
"org.hamcrest:hamcrest-core:jar:1.3"] + Buildr::JMock.dependencies}
 -
 +Buildr::Hibernate::REQUIRES[:hibernate] = HIBERNATE,
++#Buildr.settings.build['junit'] = "4.11"
++#Buildr::JUnit.instance_eval { @dependencies = ["junit:junit:jar:#{version}", 
"org.hamcrest:hamcrest-core:jar:1.3"] + Buildr::JMock.dependencies}
  Buildr::Hibernate::REQUIRES[:xdoclet] = Buildr.group("xdoclet", 
"xdoclet-xdoclet-module", "xdoclet-hibernate-module", 
   :under=>"xdoclet", :version=>"1.2.3") + ["xdoclet:xjavadoc:jar:1.1-j5"] 
  
@@@ -114,9 -113,9 +116,9 @@@ define "ode" d
      end
      
package(:war).path("WEB-INF/modules").include(artifacts(AXIS2_MODULES.mods))
      package(:war).tap do |root|
 -      
root.merge(artifact(AXIS2_WAR)).exclude("WEB-INF/*").exclude("META-INF/*")
 +      root.merge(artifact(AXIS2_WAR)).include("WEB-INF/classes/org/*")
      end
- 
+       
      task("start"=>[package(:war), jetty.use]) do |task|
        class << task ; attr_accessor :url, :path ; end
        task.url = "http://localhost:8080/ode";
@@@ -130,8 -129,8 +132,8 @@@
        end
      end
  
 -    test.using :testng, :forkmode=>'perTest', :properties=>{ 
"org.apache.commons.logging.LogFactory" => 
"org.apache.commons.logging.impl.LogFactoryImpl", 
"log4j.configuration"=>"test-log4j.properties", "test.ports" => 
ENV['TEST_PORTS'], "org.apache.ode.scheduler.deleteJobsOnStart" => "true", 
"org.apache.ode.autoRetireProcess"=>"true" } , :java_args=>['-Xdebug', 
'-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=6001', '-Xmx4g', 
'-XX:MaxPermSize=1g']
 -    test.with projects("tools", "bpel-obj"), libs, AXIS2_MODULES.mods, AXIOM, 
JAVAX.servlet, Buildr::Jetty::REQUIRES, HIBERNATE, DOM4J, H2::REQUIRES, 
SPRING_TEST, JACKSON
 +    test.using :testng, :forkmode=>'perTest', :properties=>{ 
"org.apache.commons.logging.LogFactory" => 
"org.apache.commons.logging.impl.LogFactoryImpl", 
"log4j.configuration"=>"test-log4j.properties", "test.ports" => 
ENV['TEST_PORTS'], "org.apache.ode.scheduler.deleteJobsOnStart" => "true", 
"org.apache.ode.autoRetireProcess"=>"true" } , :java_args=>['-Xmx2048m', 
'-XX:MaxPermSize=256m'] #'-Xdebug', 
'-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=6001',
-     test.with [projects("tools"), libs, AXIS2_MODULES.mods, AXIOM, 
JAVAX.servlet, Buildr::Jetty::REQUIRES, HIBERNATE, DOM4J, H2::REQUIRES, 
SPRING_TEST].uniq
++    test.with [projects("tools", 'bpel-obj'), libs, AXIS2_MODULES.mods, 
AXIOM, JAVAX.servlet, Buildr::Jetty::REQUIRES, HIBERNATE, DOM4J, H2::REQUIRES, 
SPRING_TEST, JACKSON].uniq
      webapp_dir = "#{test.compile.target}/webapp"
      test.setup task(:prepare_webapp) do |task|
        cp_r _("src/main/webapp"), test.compile.target.to_s
@@@ -224,15 -230,16 +233,16 @@@
  
    desc "ODE Runtime Engine"
    define "bpel-runtime" do
-     compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", 
"bpel-epr", "bpel-obj", "bpel-schemas",
+     compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", 
"bpel-epr", "bpel-nobj", "bpel-schemas",
        "bpel-store", "utils", "agents"),
-       COMMONS.collections, COMMONS.httpclient, JACOB, JAVAX.persistence, 
JAVAX.stream, JAXEN, SAXON, WSDL4J, XMLBEANS, SPRING, SLF4J, LOG4J
+       COMMONS.collections, COMMONS.httpclient, JACOB, JAVAX.persistence, 
JAVAX.stream, JAXEN, SAXON, WSDL4J, XMLBEANS, SPRING, SLF4J, LOG4J,
+         JACKSON, JAVAX.connector
  
  
-     test.with projects("scheduler-simple", "dao-jpa", "dao-hibernate", 
"bpel-epr"),
-         BACKPORT, COMMONS.pool, COMMONS.lang, COMMONS.io, DERBY, 
JAVAX.connector, JAVAX.transaction,
-         GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, TRANQL, 
HSQLDB, JAVAX.ejb,
-         OPENJPA, XERCES, XALAN, DOM4J, HIBERNATE, SPRING_TEST, H2::REQUIRES,
+     test.with projects("scheduler-simple", "dao-jpa", "dao-hibernate", 
"bpel-epr", "bpel-obj"),
+ #         BACKPORT, COMMONS.pool, COMMONS.lang, COMMONS.io, DERBY, 
JAVAX.connector, JAVAX.transaction,
+         GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, TRANQL, 
HSQLDB, JAVAX.ejb, JAVAX.transaction,
 -        OPENJPA, XERCES, XALAN, DOM4J, HIBERNATE, SPRING_TEST, JACKSON, DERBY,
++        OPENJPA, XERCES, XALAN, DOM4J, HIBERNATE, SPRING_TEST, H2::REQUIRES, 
JACKSON,
          "tranql:tranql-connector-derby-common:jar:1.1"
  
      package :jar
@@@ -269,9 -276,9 +279,9 @@@
      compile { open_jpa_enhance }
      resources hibernate_doclet(:package=>"org.apache.ode.store.hib", 
:excludedtags=>"@version,@author,@todo")
  
-     test.with COMMONS.collections, COMMONS.lang, JAVAX.connector, 
JAVAX.transaction, DOM4J, 
+     test.with projects("bpel-obj"), COMMONS.collections, COMMONS.lang, 
JAVAX.connector, JAVAX.transaction, DOM4J, 
        XERCES, XALAN, JAXEN, SAXON, OPENJPA, GERONIMO.transaction, SLF4J, 
SPRING_TEST, DERBY,
 -      GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, 
JAVAX.connector, JAVAX.ejb
 +      GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, 
JAVAX.connector, JAVAX.ejb, H2::REQUIRES
      package :jar
    end
  
@@@ -284,9 -291,9 +294,9 @@@
        SPRING_TEST, COMMONS.codec, SLF4J, LOG4J
  
      test.using :properties=>{ "org.apache.ode.autoRetireProcess"=>"true" }
-     test.with projects("bpel-obj", "bpel-schemas", "bpel-scripts"),
+     test.with projects("bpel-nobj", "bpel-obj", "bpel-schemas", 
"bpel-scripts"),
        COMMONS.collections, COMMONS.lang, DERBY, JACOB, JAVAX.connector,
-       JAVAX.stream, JAVAX.transaction, JAVAX.connector, JAXEN, HSQLDB, SAXON, 
XERCES, XMLBEANS, XALAN, GERONIMO.transaction, SPRING, HIBERNATE, DOM4J, 
H2::REQUIRES
 -      JAVAX.stream, JAVAX.transaction, JAVAX.connector, JAXEN, HSQLDB, SAXON, 
XERCES, XMLBEANS, XALAN, GERONIMO.transaction, SPRING, HIBERNATE, DOM4J, JACKSON
++      JAVAX.stream, JAVAX.transaction, JAVAX.connector, JAXEN, HSQLDB, SAXON, 
XERCES, XMLBEANS, XALAN, GERONIMO.transaction, SPRING, HIBERNATE, DOM4J, 
H2::REQUIRES, JACKSON
  
      package :jar
    end
@@@ -383,10 -390,9 +393,10 @@@
        sql = 
concat(_("target/#{db}.sql")=>[_("src/main/scripts/license-header.sql"), 
common_sql, partial_sql, scheduler_sql])
        build sql
      end
 -    derby_db = Derby.create(_("target/derby/jpadb")=>_("target/derby.sql"))
 +    derby_db = Derby.create(_("target/derby-jpadb")=>_("target/derby.sql"))
 +    h2_db = H2.create("ode-jpa-h2", _("target/h2-jpadb")=>_("target/h2.sql"))
  
-     test.with projects("bpel-api", "bpel-dao", "bpel-obj", "bpel-epr", 
"dao-jpa", "utils"),
+     test.with projects("bpel-api", "bpel-dao", "bpel-nobj", "bpel-epr", 
"dao-jpa", "utils"),
        BACKPORT, COMMONS.collections, COMMONS.lang, COMMONS.logging, 
GERONIMO.transaction,
        GERONIMO.kernel, GERONIMO.connector, HSQLDB, JAVAX.connector, 
JAVAX.ejb, JAVAX.persistence,
        JAVAX.transaction, LOG4J, OPENJPA, XERCES, WSDL4J

http://git-wip-us.apache.org/repos/asf/ode/blob/c3fb4231/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenContexts.java
----------------------------------------------------------------------
diff --cc 
bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenContexts.java
index 7cc32c8,b7130a3..0abee3c
--- 
a/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenContexts.java
+++ 
b/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenContexts.java
@@@ -185,41 -173,26 +185,41 @@@ class JaxenContexts implements Function
                  Node variableNode = _xpathEvalCtx.readVariable(variable, 
part);
                  if (variableNode == null)
                      throw new 
WrappedFaultException.JaxenUnresolvableException(
-                             new 
FaultException(variable.getOwner().constants.qnSelectionFailure,
+                             new 
FaultException(variable.getOwner().getConstants().getQnSelectionFailure(),
                                      "Unknown variable " + localName));
-                 OVarType type = variable.type;
+                 OVarType type = variable.getType();
                  if (type instanceof OMessageVarType) {
-                     OMessageVarType.Part typePart = 
((OMessageVarType)type).parts.get(partName);
+                     OMessageVarType.Part typePart = 
((OMessageVarType)type).getParts().get(partName);
                      if (typePart == null) {
                          throw new 
WrappedFaultException.JaxenUnresolvableException(
-                                 new 
FaultException(variable.getOwner().constants.qnSelectionFailure,
+                                 new 
FaultException(variable.getOwner().getConstants().getQnSelectionFailure(),
                                          "Unknown part " + partName + " for 
variable " + localName));
                      }
-                     type = typePart.type;
+                     type = typePart.getType();
                  }
  
-                 if (_xpathEvalCtx.narrowTypes() && type instanceof 
OXsdTypeVarType && ((OXsdTypeVarType)type).simple) {
+                 if (_xpathEvalCtx.narrowTypes() && type instanceof 
OXsdTypeVarType && ((OXsdTypeVarType)type).isSimple()) {
                        String value = variableNode.getTextContent();
                        OXsdTypeVarType theType = (OXsdTypeVarType)type;
 -                      
 +
-                     // cast booleans to boolean
-                     if (BOOLEAN.equals(theType.xsdType)) {
++                        // cast booleans to boolean
+                       if (BOOLEAN.equals(theType.getXsdType())) {
 -                              return new Boolean(value) ;
 -                      }
 +                        return new Boolean(value) ;
 +                    }
 +
 +                    // and numbers to numbers (XPath only understands Double, 
so Double it shall be.
-                     if (INT.equals(theType.xsdType) || 
UNSIGNED_SHORT.equals(theType.xsdType) ||
-                             INTEGER.equals(theType.xsdType) ||
-                             LONG.equals(theType.xsdType) || 
UNSIGNED_INT.equals(theType.xsdType) ||
-                             SHORT.equals(theType.xsdType) || 
UNSIGNED_BYTE.equals(theType.xsdType) ||
-                             BYTE.equals(theType.xsdType) ||
-                             DECIMAL.equals(theType.xsdType) ||
-                             FLOAT.equals(theType.xsdType) ||
-                             DOUBLE.equals(theType.xsdType)
++                    if (INT.equals(theType.getXsdType()) || 
UNSIGNED_SHORT.equals(theType.getXsdType()) ||
++                            INTEGER.equals(theType.getXsdType()) ||
++                            LONG.equals(theType.getXsdType()) || 
UNSIGNED_INT.equals(theType.getXsdType()) ||
++                            SHORT.equals(theType.getXsdType()) || 
UNSIGNED_BYTE.equals(theType.getXsdType()) ||
++                            BYTE.equals(theType.getXsdType()) ||
++                            DECIMAL.equals(theType.getXsdType()) ||
++                            FLOAT.equals(theType.getXsdType()) ||
++                            DOUBLE.equals(theType.getXsdType())
 +                            ) {
 +                        return new Double(value);
 +                    }
 +
                      return value;
                  } else {
                      return variableNode;

http://git-wip-us.apache.org/repos/asf/ode/blob/c3fb4231/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/XPath10ExpressionRuntime.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ode/blob/c3fb4231/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpFunctionResolver.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ode/blob/c3fb4231/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ode/blob/c3fb4231/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ode/blob/c3fb4231/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ode/blob/c3fb4231/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath10/runtime/XPath10ExpressionRuntimeTest.java
----------------------------------------------------------------------
diff --cc 
bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath10/runtime/XPath10ExpressionRuntimeTest.java
index f31904d,0000000..6be5998
mode 100644,000000..100644
--- 
a/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath10/runtime/XPath10ExpressionRuntimeTest.java
+++ 
b/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath10/runtime/XPath10ExpressionRuntimeTest.java
@@@ -1,140 -1,0 +1,129 @@@
 +package org.apache.ode.bpel.elang.xpath10.runtime;
 +
 +import static org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertNotNull;
 +
 +import java.net.URI;
 +import java.util.Date;
 +import java.util.HashMap;
 +
 +import javax.xml.namespace.QName;
 +
 +import org.apache.ode.bpel.common.FaultException;
 +import org.apache.ode.bpel.compiler.bom.Expression;
 +import 
org.apache.ode.bpel.elang.xpath10.compiler.XPath10ExpressionCompilerBPEL20;
- import org.apache.ode.bpel.elang.xpath10.o.OXPath10Expression;
++import org.apache.ode.bpel.elang.xpath10.obj.OXPath10Expression;
 +import org.apache.ode.bpel.elang.xpath20.runtime.MockCompilerContext;
 +import org.apache.ode.bpel.explang.EvaluationContext;
 +import org.apache.ode.bpel.explang.EvaluationException;
- import org.apache.ode.bpel.o.OExpression;
- import org.apache.ode.bpel.o.OLink;
- import org.apache.ode.bpel.o.OMessageVarType.Part;
- import org.apache.ode.bpel.o.OProcess.OProperty;
- import org.apache.ode.bpel.o.OScope.Variable;
++import org.apache.ode.bpel.obj.OExpression;
++import org.apache.ode.bpel.obj.OLink;
++import org.apache.ode.bpel.obj.OMessageVarType.Part;
++import org.apache.ode.bpel.obj.OProcess;
++import org.apache.ode.bpel.obj.OScope;
++import org.apache.ode.bpel.obj.OScope.Variable;
 +import org.apache.ode.utils.DOMUtils;
 +import org.apache.ode.utils.NSContext;
 +import org.junit.After;
 +import org.junit.Before;
 +import org.junit.Test;
 +import org.w3c.dom.Document;
 +import org.w3c.dom.Element;
 +import org.w3c.dom.Node;
 +
 +public class XPath10ExpressionRuntimeTest implements EvaluationContext {
 +
 +    private XPath10ExpressionRuntime _runtime;
 +    private XPath10ExpressionCompilerBPEL20 _compiler;
 +
 +    private MockCompilerContext _cc;
 +    
 +    @Before
 +    public void setUp() throws Exception {
 +        _cc = new MockCompilerContext();
 +        _runtime = new XPath10ExpressionRuntime();
 +        _runtime.initialize(new HashMap());
 +        _compiler = new XPath10ExpressionCompilerBPEL20();
 +        _compiler.setCompilerContext(_cc);
 +    }
 +    
 +    @After
 +    public void tearDown() throws Exception {
 +        _cc = null;
 +        _runtime = null;
 +        _compiler = null;
 +    }
 +
 +    private OXPath10Expression compile(String xpath) {
 +        Document doc = DOMUtils.newDocument();
 +        Element e = doc.createElementNS(null, "expression");
 +        doc.appendChild(e);
 +        e.appendChild(doc.createTextNode(xpath));
 +        Expression exp = new Expression(e);
 +        return (OXPath10Expression)_compiler.compileLValue(exp);
 +    }
 +
 +    @Test
 +    public void testEvaluate_NaN() throws Exception {
 +        OXPath10Expression exp = compile("number('/tns:Title/tns:Data')");
 +        NSContext context = new NSContext();
 +        context.register("tns", "http://foobar";);
-         exp.namespaceCtx = context;
++        exp.setNamespaceCtx(context);
 +
 +        Node retVal = _runtime.evaluateNode(exp, this);
 +
 +        assertNotNull(retVal);
 +        assertEquals(String.valueOf(Double.NaN), retVal.getTextContent());
 +    }
 +
-     @Override
 +    public Node readVariable(Variable variable, Part part)
 +            throws FaultException {
 +        return null;
 +    }
 +
-     @Override
 +    public Node getPartData(Element message, Part part) throws FaultException 
{
 +        return null;
 +    }
 +
-     @Override
-     public String readMessageProperty(Variable variable, OProperty property)
++    public String readMessageProperty(OScope.Variable variable, 
OProcess.OProperty property)
 +            throws FaultException {
 +        return null;
 +    }
 +
-     @Override
 +    public boolean isLinkActive(OLink olink) throws FaultException {
 +        return false;
 +    }
 +
-     @Override
 +    public Node getRootNode() {
 +        return null;
 +    }
 +
-     @Override
 +    public Node evaluateQuery(Node root, OExpression expr)
 +            throws FaultException, EvaluationException {
 +        return null;
 +    }
 +
-     @Override
 +    public Long getProcessId() {
 +        return null;
 +    }
 +
-     @Override
 +    public QName getProcessQName() {
 +        return null;
 +    }
 +
-     @Override
 +    public boolean narrowTypes() {
 +        return false;
 +    }
 +
-     @Override
 +    public URI getBaseResourceURI() {
 +        return null;
 +    }
 +
-     @Override
 +    public Node getPropertyValue(QName propertyName) {
 +        return null;
 +    }
 +
-     @Override
 +    public Date getCurrentEventDateTime() {
 +        return null;
 +    }
 +}

http://git-wip-us.apache.org/repos/asf/ode/blob/c3fb4231/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntimeTest.java
----------------------------------------------------------------------
diff --cc 
bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntimeTest.java
index 137a848,a430650..68d55a8
--- 
a/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntimeTest.java
+++ 
b/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntimeTest.java
@@@ -36,15 -36,14 +36,15 @@@ import javax.xml.namespace.QName
  import org.apache.ode.bpel.common.FaultException;
  import org.apache.ode.bpel.compiler.bom.Expression;
  import 
org.apache.ode.bpel.elang.xpath20.compiler.XPath20ExpressionCompilerBPEL20;
- import org.apache.ode.bpel.elang.xpath20.o.OXPath20ExpressionBPEL20;
+ import org.apache.ode.bpel.elang.xpath20.obj.OXPath20ExpressionBPEL20;
  import org.apache.ode.bpel.explang.EvaluationContext;
- import org.apache.ode.bpel.o.OExpression;
- import org.apache.ode.bpel.o.OLink;
- import org.apache.ode.bpel.o.OMessageVarType.Part;
- import org.apache.ode.bpel.o.OProcess.OProperty;
- import org.apache.ode.bpel.o.OScope.Variable;
+ import org.apache.ode.bpel.obj.OExpression;
+ import org.apache.ode.bpel.obj.OLink;
+ import org.apache.ode.bpel.obj.OMessageVarType.Part;
+ import org.apache.ode.bpel.obj.OProcess.OProperty;
+ import org.apache.ode.bpel.obj.OScope.Variable;
  import org.apache.ode.utils.DOMUtils;
 +import org.apache.ode.utils.Namespaces;
  import org.junit.After;
  import org.junit.Before;
  import org.junit.Test;
@@@ -231,17 -230,9 +231,17 @@@ public class XPath20ExpressionRuntimeTe
                fail("Missing '"+insertElementName+"' element has not been 
inserted");
          }
      }
 +    
 +    public void testODE911() throws Exception {
 +        OXPath20ExpressionBPEL20 exp = 
compile("ode:delete($ODE991var/tns:empty)");
 +        Element retVal = (Element)_runtime.evaluateNode(exp, this);
 +        assertNotNull(retVal);
 +        assertEquals(3, retVal.getElementsByTagNameNS("http://foobar";, 
"notempty").getLength());
 +        assertEquals(0, retVal.getElementsByTagNameNS("http://foobar";, 
"empty").getLength());
 +    }
  
      public Node readVariable(Variable variable, Part part) throws 
FaultException {
-         return _vars.get(variable.name);
+         return _vars.get(variable.getName());
      }
  
      public Node getPartData(Element message, Part part) throws FaultException 
{

http://git-wip-us.apache.org/repos/asf/ode/blob/c3fb4231/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ActivityRecoveryTest.java
----------------------------------------------------------------------
diff --cc 
bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ActivityRecoveryTest.java
index e8032ec,615a70b..d0b33a7
--- 
a/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ActivityRecoveryTest.java
+++ 
b/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ActivityRecoveryTest.java
@@@ -31,9 -23,8 +31,9 @@@ import org.apache.ode.bpel.engine.BpelS
  import org.apache.ode.bpel.iapi.Message;
  import org.apache.ode.bpel.iapi.MessageExchange;
  import org.apache.ode.bpel.iapi.MessageExchangeContext;
 +import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
  import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange;
- import org.apache.ode.bpel.o.OFailureHandling;
+ import org.apache.ode.bpel.obj.OFailureHandling;
  import org.apache.ode.bpel.pmapi.BpelManagementFacade;
  import org.apache.ode.bpel.pmapi.ProcessInfoDocument;
  import org.apache.ode.bpel.pmapi.TActivityInfo;

http://git-wip-us.apache.org/repos/asf/ode/blob/c3fb4231/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ode/blob/c3fb4231/dependencies.rb
----------------------------------------------------------------------
diff --cc dependencies.rb
index 9fae7fc,a4c194d..23781df
--- a/dependencies.rb
+++ b/dependencies.rb
@@@ -76,8 -72,13 +76,13 @@@ GERONIMO            = struct
    :connector        
=>"org.apache.geronimo.components:geronimo-connector:jar:2.0.1"
  )
  HIBERNATE           = [ "org.hibernate:hibernate-core:jar:3.3.2.GA", 
"javassist:javassist:jar:3.9.0.GA", "antlr:antlr:jar:2.7.6",
 -                         "asm:asm:jar:3.3.1", "cglib:cglib:jar:2.2", 
"net.sf.ehcache:ehcache:jar:1.2.3" ]
 +                        "asm:asm:jar:3.3.1", "cglib:cglib:jar:2.2", 
"net.sf.ehcache:ehcache:jar:1.2.3" ]
  HSQLDB              = "hsqldb:hsqldb:jar:1.8.0.7"
+ JACKSON              = [ "com.fasterxml.jackson.core:jackson-core:jar:2.4.0", 
+                         
"com.fasterxml.jackson.core:jackson-databind:jar:2.4.0",
+                         
"com.fasterxml.jackson.core:jackson-annotations:jar:2.4.0",
+                         
"com.fasterxml.jackson.dataformat:jackson-dataformat-smile:jar:2.4.0",
+                         
"com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.4.0"]
  JACOB               = "org.apache.ode:jacob:jar:2.0a-SNAPSHOT"
  JAVAX               = struct(
    :activation       =>"javax.activation:activation:jar:1.1",
@@@ -104,7 -105,8 +109,8 @@@ KARAF               = 
                            :under=>"org.apache.felix", :version=>"0.6.1")
                        ]
  LOG4J               = "log4j:log4j:jar:1.2.17"
 -OBJECT_DIFF           ="de.danielbechler:java-object-diff:jar:0.13.1"
 -OPENJPA             = ["org.apache.openjpa:openjpa:jar:1.2.1",
++OBJECT_DIFF         = "de.danielbechler:java-object-diff:jar:0.13.1"
 +OPENJPA             = ["org.apache.openjpa:openjpa:jar:1.2.3",
                         "net.sourceforge.serp:serp:jar:1.13.1"]
  
  SAXON               = ["net.sourceforge.saxon:saxon:jar:9.1.0.8", 
"net.sourceforge.saxon:saxon:jar:xpath:9.1.0.8", 
"net.sourceforge.saxon:saxon:jar:dom:9.1.0.8", 
"net.sourceforge.saxon:saxon:jar:xqj:9.1.0.8"]

Reply via email to