ode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mr...@apache.org
Subject svn commit: r694852 [1/4] - in /ode/trunk: ./ axis2-war/src/test/java/org/apache/ode/axis2/ bpel-api/src/main/java/org/apache/ode/bpel/iapi/ bpel-api/src/main/java/org/apache/ode/bpel/rapi/ bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ bpel...
Date Sat, 13 Sep 2008 00:08:22 GMT
Author: mriou
Date: Fri Sep 12 17:08:12 2008
New Revision: 694852

URL: http://svn.apache.org/viewvc?rev=694852&view=rev
Log:
1.X back with a twist.

Added:
    ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/TestSimpleScenarioV1.java
    ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/TestOModelVersions.java
    ode/trunk/bpel-compiler/src/test/resources/TestActivityFlow-v1.cbp   (with props)
    ode/trunk/bpel-compiler/src/test/resources/TestActivityFlow-v2.cbp   (with props)
    ode/trunk/runtimes/src/test/java/org/apache/ode/bpel/rtrep/v1/CompatibilityTest.java
    ode/trunk/runtimes/src/test/resources/
    ode/trunk/runtimes/src/test/resources/TestActivityFlow.cbp   (with props)
    ode/trunk/runtimes/src/test/resources/soups/
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-0   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-10   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1000   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1001   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1002   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1003   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1004   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1005   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1006   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1007   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1008   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1009   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-101   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1010   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1011   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1012   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1013   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1014   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1015   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1016   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1017   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1018   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1019   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-102   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1020   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1021   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1022   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1023   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1024   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1025   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1026   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1027   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1028   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1029   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-103   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1030   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1032   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1034   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1037   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-104   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1040   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1041   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1042   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1043   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1044   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1045   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1046   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1047   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1048   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1049   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-105   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1050   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1051   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1052   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1053   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1054   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1055   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1056   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1057   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1058   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1059   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-106   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1060   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1061   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1062   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1063   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1064   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1065   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1066   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1067   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1068   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1069   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-107   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1070   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1071   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1072   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1073   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1074   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1075   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1076   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1077   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1078   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1079   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-108   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1080   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1081   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1082   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1083   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1084   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1085   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1086   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1087   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1088   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1089   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-109   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1090   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1091   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1092   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1093   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1094   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1095   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1096   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1097   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1098   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1099   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-11   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-110   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1100   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1101   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1102   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1103   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1104   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1105   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1106   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1107   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1108   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1109   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-111   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1110   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1111   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1112   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1113   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1114   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1115   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1116   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1117   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1118   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1119   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-112   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1120   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1121   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1122   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1123   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1124   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1125   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1126   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1127   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1128   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1129   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-113   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1130   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1131   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1132   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1133   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1135   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1136   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1137   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1138   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1139   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-114   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1140   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1141   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1142   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1143   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1144   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1145   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1146   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1147   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1148   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1149   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-115   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1150   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1151   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1152   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1153   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1154   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1155   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1157   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1158   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1159   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1160   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1161   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1162   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1163   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1164   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1165   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1166   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1167   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1168   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1169   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-117   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1170   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1171   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1172   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1173   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1174   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1175   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1176   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1177   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1178   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-1179   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-118   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-950   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-951   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-952   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-953   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-954   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-955   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-956   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-957   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-958   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-959   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-96   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-960   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-961   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-962   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-963   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-964   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-965   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-966   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-967   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-968   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-969   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-97   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-970   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-971   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-972   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-973   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-974   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-975   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-976   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-977   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-978   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-979   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-98   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-980   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-981   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-982   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-983   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-984   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-985   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-986   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-987   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-988   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-989   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-99   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-990   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-991   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-992   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-993   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-994   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-995   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-996   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-997   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-998   (with props)
    ode/trunk/runtimes/src/test/resources/soups/sa-soup-999   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-0   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-1   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-10   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-100   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-101   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-102   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-103   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-104   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-105   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-106   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-107   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-108   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-109   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-11   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-110   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-111   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-112   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-113   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-114   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-115   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-116   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-117   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-118   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-119   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-12   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-120   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-121   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-122   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-123   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-124   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-125   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-126   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-127   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-128   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-129   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-13   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-130   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-131   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-132   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-133   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-134   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-135   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-136   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-137   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-138   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-139   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-14   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-140   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-141   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-142   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-143   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-144   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-145   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-146   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-147   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-148   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-149   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-15   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-150   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-151   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-152   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-153   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-154   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-155   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-156   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-157   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-158   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-159   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-16   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-160   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-161   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-162   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-163   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-164   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-165   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-166   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-167   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-168   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-169   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-17   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-170   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-171   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-172   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-173   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-174   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-175   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-176   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-177   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-178   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-179   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-18   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-180   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-181   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-19   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-2   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-20   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-21   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-22   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-23   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-24   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-25   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-26   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-27   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-28   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-29   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-3   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-30   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-31   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-32   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-33   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-34   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-35   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-36   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-37   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-38   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-39   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-4   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-40   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-41   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-42   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-43   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-44   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-45   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-46   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-47   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-48   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-49   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-5   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-50   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-51   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-52   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-53   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-54   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-55   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-56   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-57   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-58   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-59   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-6   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-60   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-61   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-62   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-63   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-64   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-65   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-66   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-67   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-68   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-69   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-7   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-70   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-71   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-72   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-73   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-74   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-75   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-76   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-77   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-78   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-79   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-8   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-80   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-81   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-82   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-83   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-84   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-85   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-86   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-87   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-88   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-89   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-9   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-90   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-91   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-92   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-93   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-94   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-95   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-96   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-97   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-98   (with props)
    ode/trunk/runtimes/src/test/resources/soups/soup-99   (with props)
Removed:
    ode/trunk/engine/src/test/java/org/apache/ode/bpel/engine/
    ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/Serializers.java
    ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/Serializer.java
    ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/Serializer.java
Modified:
    ode/trunk/Rakefile
    ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/TestSimpleScenario.java
    ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java
    ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRuntime.java
    ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ProcessModel.java
    ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Serializer.java
    ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
    ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompilerFactory.java
    ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler.java
    ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler11.java
    ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler20.java
    ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler20Draft.java
    ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/xpath10/XPath10ExpressionCompilerImpl.java
    ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/xpath20/XPath20ExpressionCompilerImpl.java
    ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
    ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
    ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
    ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
    ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java
    ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
    ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
    ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OProcess.java
    ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OScope.java
    ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/RuntimeImpl.java
    ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ASSIGN.java
    ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OProcess.java
    ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeImpl.java
    ode/trunk/runtimes/src/test/java/org/apache/ode/bpel/rtrep/v1/CoreBpelTest.java

Modified: ode/trunk/Rakefile
URL: http://svn.apache.org/viewvc/ode/trunk/Rakefile?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/Rakefile (original)
+++ ode/trunk/Rakefile Fri Sep 12 17:08:12 2008
@@ -299,7 +299,7 @@
     compile.from apt
     compile.with projects("bpel-api", "bpel-dao", "jacob", "jacob-ap", "utils"),
       COMMONS.logging, COMMONS.collections, COMMONS.httpclient, COMMONS.lang, JAXEN, JAVAX.persistence,
-      JAVAX.stream, SAXON, WSDL4J, XMLBEANS, JAVAX.transaction
+      JAVAX.stream, SAXON, WSDL4J, XMLBEANS, XERCES, JAVAX.transaction
 
     package :jar
   end

Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/TestSimpleScenario.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/TestSimpleScenario.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/TestSimpleScenario.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/TestSimpleScenario.java Fri Sep 12 17:08:12 2008
@@ -1,5 +1,7 @@
 package org.apache.ode.axis2;
 
+import org.apache.ode.bpel.compiler.BpelCompilerFactory;
+
 public class TestSimpleScenario extends Axis2TestBase {
 
     public void testHelloWorld2() throws Exception {
@@ -15,7 +17,6 @@
         }
 
     }
-
     
     public void testDynPartner() throws Exception {
         String bundleName = "TestDynPartner";

Added: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/TestSimpleScenarioV1.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/TestSimpleScenarioV1.java?rev=694852&view=auto
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/TestSimpleScenarioV1.java (added)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/TestSimpleScenarioV1.java Fri Sep 12 17:08:12 2008
@@ -0,0 +1,53 @@
+package org.apache.ode.axis2;
+
+import org.apache.ode.bpel.compiler.BpelCompilerFactory;
+
+public class TestSimpleScenarioV1 extends Axis2TestBase {
+
+    public void testHelloWorld2() throws Exception {
+        String bundleName = "TestHelloWorld2";
+        BpelCompilerFactory.forceVersion = 1;
+        if(!server._ode.getProcessStore().getPackages().contains(bundleName)) server.deployProcess(bundleName);
+        try {
+            String response = server.sendRequestFile("http://localhost:8080/ode/processes/helloWorld",
+                    bundleName, "testRequest.soap");
+
+            assertTrue(response.indexOf("Hello World") > 0);
+        } finally {
+            server.undeployProcess(bundleName);
+        }
+
+    }
+
+    public void testDynPartner() throws Exception {
+        String bundleName = "TestDynPartner";
+        BpelCompilerFactory.forceVersion = 1;
+        if(!server._ode.getProcessStore().getPackages().contains(bundleName)) server.deployProcess(bundleName);
+        try {
+            String response = server.sendRequestFile("http://localhost:8080/ode/processes/DynMainService",
+                    bundleName, "testRequest.soap");
+
+            assertTrue(response.indexOf("OK") > 0);
+            System.out.println("=> " + response);
+        } finally {
+            server.undeployProcess(bundleName);
+        }
+
+    }
+
+    public void testMagicSession() throws Exception {
+        String bundleName = "TestMagicSession";
+        BpelCompilerFactory.forceVersion = 1;
+        if(!server._ode.getProcessStore().getPackages().contains(bundleName)) server.deployProcess(bundleName);
+        try {
+            String response = server.sendRequestFile("http://localhost:8080/ode/processes/MSMainExecuteService",
+                    bundleName, "testRequest.soap");
+
+            System.out.println("->" + response);
+            assertTrue(response.indexOf("OK") > 0);
+        } finally {
+            server.undeployProcess(bundleName);
+        }
+
+    }
+}
\ No newline at end of file

Modified: ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java (original)
+++ ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java Fri Sep 12 17:08:12 2008
@@ -58,8 +58,6 @@
      */
     long getVersion();
 
-    int getRuntimeVersion();
-
     /**
      * Is this a <em>transient</em> process? Transient processes are not persisted in the store.
      * @return <code>true</code> if this is a transient process.

Modified: ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRuntime.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRuntime.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRuntime.java (original)
+++ ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRuntime.java Fri Sep 12 17:08:12 2008
@@ -10,7 +10,7 @@
 
 public interface OdeRuntime {
     
-    void init(ProcessConf pconf);
+    void init(ProcessConf pconf, ProcessModel pmodel);
 
     OdeRTInstance newInstance(Object state);
 

Modified: ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ProcessModel.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ProcessModel.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ProcessModel.java (original)
+++ ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ProcessModel.java Fri Sep 12 17:08:12 2008
@@ -20,4 +20,6 @@
 	List<String> getCorrelators();
 
     ActivityModel getChild(final int id);
+
+    int getModelVersion();
 }

Modified: ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Serializer.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Serializer.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Serializer.java (original)
+++ ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Serializer.java Fri Sep 12 17:08:12 2008
@@ -1,17 +1,225 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.ode.bpel.rapi;
 
 import javax.xml.namespace.QName;
-import java.io.OutputStream;
-import java.io.IOException;
-
-public interface Serializer {
-
-    public String getGuid();
-
-    public QName getType();
-
-    public void writePModel(ProcessModel process, OutputStream os) throws IOException;
-
-    public ProcessModel readPModel() throws IOException, ClassNotFoundException;
+import java.io.*;
+import java.util.Arrays;
 
+/**
+ * Header written at the beginning of every compiled BPEL object file.
+ */
+public class Serializer {
+
+    public static final byte[] MAGIC_NUMBER_OFH_20040908 =
+            new byte[]  { 0x55, '5', 'S', 0x00, 'O', 'F', 'H', 0x20, 0x04, 0x09, 0x08  };
+
+    public static final byte[] MAGIC_NUMBER_OFH_20061101 =
+        new byte[]  { 0x55, '5', 'S', 0x00, 'O', 'F', 'H', 0x20, 0x06, 0x11, 0x01  };
+
+    public static final byte[] MAGIC_NUMBER = MAGIC_NUMBER_OFH_20061101;
+
+    public static final short FORMAT_SERIALIZED_JAVA14 = 0x01;
+
+    // START PERSISTED FIELDS
+    public final byte[] magic = new byte[MAGIC_NUMBER.length];
+
+    /** Compiled Process representation format. */
+    public short format;
+
+    /** Time of compilation (system local time). */
+    public long compileTime;
+
+    /** Deprecated, only one process per file.  */
+    public final int numProcesses = 1;
+
+    public InputStream _inputStream;
+
+    public String guid;
+
+    public QName type;
+    
+
+  // END PERSISTED FIELDS
+
+    public Serializer(long compileTime) {
+        System.arraycopy(MAGIC_NUMBER, 0, magic, 0, MAGIC_NUMBER.length);
+        this.format = FORMAT_SERIALIZED_JAVA14;
+        this.compileTime  = compileTime;
+    }
+
+    public Serializer() {}
+
+    public Serializer(InputStream inputStream) throws IOException {
+        _inputStream = inputStream;
+        read(inputStream);
+    }
+
+
+    public void read(InputStream is) throws IOException {
+        DataInputStream oin = new DataInputStream(is);
+        byte[] magic = new byte[MAGIC_NUMBER.length];
+        oin.read(magic, 0, magic.length);
+
+        if (Arrays.equals(MAGIC_NUMBER_OFH_20040908, magic)) {
+            // Old format requires us to read the OModel to get the type and guid. 
+            this.format = oin.readShort();
+            this.compileTime = oin.readLong();
+            oin.readInt();
+            ObjectInputStream ois = new CustomObjectInputStream(_inputStream);
+            ProcessModel pmodel;
+            try {
+                pmodel = (ProcessModel) ois.readObject();
+            } catch (ClassNotFoundException e) {
+                throw new IOException("DataStream Error");
+            }
+            this.type  = pmodel.getQName();
+            this.guid = "OLD-FORMAT-NO-GUID";
+            
+            return;
+        }
+        // The current (most recent) scheme
+        if (Arrays.equals(MAGIC_NUMBER, magic)) {
+            this.format = oin.readShort();
+            this.compileTime = oin.readLong();
+            this.guid = oin.readUTF();
+            String tns = oin.readUTF();
+            String name = oin.readUTF();
+            this.type = new QName(tns, name);
+            return;
+        }
+
+        throw new IOException("Unrecognized file format (bad magic number).");
+    }
+ 
+    public void writePModel(ProcessModel pmodel, OutputStream os) throws IOException {
+        DataOutputStream out = new DataOutputStream(os);
+
+        out.write(MAGIC_NUMBER);
+        out.writeShort(format);
+        out.writeLong(compileTime);
+        out.writeUTF(pmodel.getGuid());
+        out.writeUTF(pmodel.getQName().getNamespaceURI());
+        out.writeUTF(pmodel.getQName().getLocalPart());
+        out.flush();
+        ObjectOutputStream oos = new CustomObjectOutputStream(os);
+        oos.writeObject(pmodel);
+        oos.flush();
+    }
+
+    public ProcessModel readPModel() throws IOException, ClassNotFoundException {
+        ObjectInputStream ois = new CustomObjectInputStream(_inputStream);
+        ProcessModel pmodel;
+        try {
+            pmodel = (ProcessModel) ois.readObject();
+        } catch (ClassNotFoundException e) {
+            throw new IOException("DataStream Error", e);
+        }
+            
+        return pmodel;
+    }
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public QName getType() {
+        return type;
+    }
+
+    static class CustomObjectOutputStream extends ObjectOutputStream {
+
+        /**
+         * @param out
+         * @throws IOException
+         */
+        public CustomObjectOutputStream(OutputStream out) throws IOException {
+            super(out);
+            enableReplaceObject(true);
+        }
+        
+        protected Object replaceObject(Object obj) throws IOException{
+            if(obj instanceof QName){
+                QName q = (QName)obj;
+                return new OQName(q.getNamespaceURI(), q.getLocalPart(), q.getPrefix());
+            }
+            return super.replaceObject(obj);
+        }
+      
+    }
+  
+    static class CustomObjectInputStream extends ObjectInputStream {
+
+        /**
+         * @param in
+         * @throws IOException
+         */
+        public CustomObjectInputStream(InputStream in) throws IOException {
+            super(in);
+            enableResolveObject(true);
+        }
+        
+        protected Object resolveObject(Object obj) throws IOException {
+            if(obj instanceof OQName){
+                OQName q = (OQName)obj;
+                return new QName(q.uri, q.local, q.prefix);
+            }
+            return super.resolveObject(obj);
+        }
+
+        /**
+         * Override coverts old class names into new class names to preserve compatibility with
+         * pre-Apache namespaces.
+         */
+        @Override
+        protected ObjectStreamClass readClassDescriptor() throws IOException, ClassNotFoundException {
+            ObjectStreamClass read = super.readClassDescriptor();
+
+            if (read.getName().startsWith("org.apache.ode.bpel.o.Serializer")) {
+                return ObjectStreamClass.lookup(Class.forName(read.getName()
+                        .replace("org.apache.ode.bpel.o.Serializer", Serializer.class.getName())));
+            }
+            if (read.getName().startsWith("org.apache.ode.bpel.elang.xpath20.o.")) {
+                return ObjectStreamClass.lookup(Class.forName(read.getName()
+                        .replace("org.apache.ode.bpel.elang.xpath20.o.", "org.apache.ode.bpel.rtrep.v1.xpath20.")));
+            }
+            if (read.getName().startsWith("org.apache.ode.bpel.o.")) {
+                return ObjectStreamClass.lookup(Class.forName(read.getName()
+                        .replace("org.apache.ode.bpel.o.", "org.apache.ode.bpel.rtrep.v1.")));
+            }
+            return read;
+        }
+      
+    }
+  
+    static class OQName implements Serializable{
+       
+        private static final long serialVersionUID = 1L; 
+        
+        final String local;
+        final String uri;
+        final String prefix;
+        
+        OQName(String uri, String local, String prefix){
+            this.uri = uri;
+            this.local = local;
+            this.prefix = prefix;
+        }
+    }
 }

Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java Fri Sep 12 17:08:12 2008
@@ -38,7 +38,6 @@
 import org.apache.ode.bpel.compiler.bom.Process;
 import org.apache.ode.bpel.rapi.ProcessModel;
 import org.apache.ode.bpel.rapi.Serializer;
-import org.apache.ode.bpel.rtrep.Serializers;
 import org.apache.ode.utils.StreamUtils;
 import org.apache.ode.utils.msg.MessageBundle;
 import org.w3c.dom.Node;
@@ -288,7 +287,7 @@
             }
 
             try {
-                Serializer fileHeader = Serializers.getLatest();
+                Serializer fileHeader = new Serializer(System.currentTimeMillis());
                 fileHeader.writePModel(pmodel, _outputStream);
             } finally {
                 // close & mark myself invalid

Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompilerFactory.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompilerFactory.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompilerFactory.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompilerFactory.java Fri Sep 12 17:08:12 2008
@@ -1,49 +1,68 @@
 package org.apache.ode.bpel.compiler;
 
-import org.apache.ode.bpel.compiler.v2.BpelCompiler20;
-import org.apache.ode.bpel.compiler.v2.BpelCompiler20Draft;
-import org.apache.ode.bpel.compiler.v2.BpelCompiler11;
 import org.apache.ode.bpel.compiler.api.CompilationMessage;
 import org.apache.ode.bpel.compiler.api.CompilationException;
 import org.apache.ode.utils.msg.MessageBundle;
 
-import java.net.URI;
-
 public class BpelCompilerFactory {
 
     private static final CommonCompilationMessages __cmsgs =
             MessageBundle.getMessages(CommonCompilationMessages.class);
 
+    // Ugly hack to facilitate testing (at least for now)
+    public static int forceVersion = -1;
+
     /**
      * Creates a new compiler for the latest version of the internal BPEL model and the provided version
      * of the BPEL specification.
      */
-    public static BpelCompiler latestCompiler(BpelCompiler.Version bpelVersion) {
-        BpelCompiler compiler;
-        switch (bpelVersion) {
-            case BPEL20:
-                compiler = new BpelCompiler20();
-                break;
-            case BPEL20_DRAFT:
-                compiler = new BpelCompiler20Draft();
-                break;
-            case BPEL11:
-                compiler = new BpelCompiler11();
-                break;
-            default:
-                CompilationMessage cmsg = __cmsgs.errUnrecognizedBpelVersion();
-                throw new CompilationException(cmsg);
-        }
-
-        return compiler;
+    public static BpelCompiler latestCompiler(BpelCompiler.Version bpelVersion) throws Exception {
+        if (forceVersion > 0) return versionCompiler(bpelVersion, forceVersion);
+        else return versionCompiler(bpelVersion, 2);
     }
 
     /**
      * Creates a new compiler for the provided version of the internal BPEL model and the provided version
      * of the BPEL specification.
      */
-    public static BpelCompiler versionCompiler(BpelCompiler.Version bpelVersion, int version) {
-        // TODO switch on the version when we'll have more than one
-        return latestCompiler(bpelVersion);
+    public static BpelCompiler versionCompiler(BpelCompiler.Version bpelVersion, int version) throws Exception {
+        BpelCompiler compiler = null;
+        switch (version) {
+            case 1:
+                switch (bpelVersion) {
+                    case BPEL20:
+                        compiler = new org.apache.ode.bpel.compiler.v1.BpelCompiler20();
+                        break;
+                    case BPEL20_DRAFT:
+                        compiler = new org.apache.ode.bpel.compiler.v1.BpelCompiler20Draft();
+                        break;
+                    case BPEL11:
+                        compiler = new org.apache.ode.bpel.compiler.v1.BpelCompiler11();
+                        break;
+                    default:
+                        CompilationMessage cmsg = __cmsgs.errUnrecognizedBpelVersion();
+                        throw new CompilationException(cmsg);
+                }
+                break;
+            case 2:
+                switch (bpelVersion) {
+                    case BPEL20:
+                        compiler = new org.apache.ode.bpel.compiler.v2.BpelCompiler20();
+                        break;
+                    case BPEL20_DRAFT:
+                        compiler = new org.apache.ode.bpel.compiler.v2.BpelCompiler20Draft();
+                        break;
+                    case BPEL11:
+                        compiler = new org.apache.ode.bpel.compiler.v2.BpelCompiler11();
+                        break;
+                    default:
+                        CompilationMessage cmsg = __cmsgs.errUnrecognizedBpelVersion();
+                        throw new CompilationException(cmsg);
+                }
+                break;
+            default:
+                throw new RuntimeException("Non existant version: " + version);
+        }
+        return compiler;
     }
 }

Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler.java Fri Sep 12 17:08:12 2008
@@ -53,6 +53,7 @@
 import org.apache.ode.bpel.compiler.bom.Process;
 import org.apache.ode.bpel.compiler.bom.CompensationHandler;
 import org.apache.ode.bpel.rtrep.v1.*;
+import org.apache.ode.bpel.extension.ExtensionValidator;
 import org.apache.ode.utils.GUID;
 import org.apache.ode.utils.NSContext;
 import org.apache.ode.utils.StreamUtils;
@@ -72,7 +73,7 @@
  * and XSD documents) into compiled representations suitable for execution by
  * the ODE BPEL Service Provider. TODO: Move process validation into this class.
  */
-abstract class BpelCompiler implements CompilerContext {
+abstract class BpelCompiler implements CompilerContext, org.apache.ode.bpel.compiler.BpelCompiler {
     /** Class-severity logger. */
     protected static final Log __log = LogFactory.getLog(BpelCompiler.class);
 
@@ -608,7 +609,7 @@
         _konstExprLang.debugInfo = createDebugInfo(_processDef, "Constant Value Expression Language");
         _konstExprLang.expressionLanguageUri = "uri:www.fivesight.com/konstExpression";
         _konstExprLang.properties.put("runtime-class",
-                "org.apache.ode.bpel.runtime.explang.konst.KonstExpressionLanguageRuntimeImpl");
+                "org.apache.ode.bpel.rtrep.v1.KonstExpressionLanguageRuntimeImpl");
         _oprocess.expressionLanguages.add(_konstExprLang);
 
         // Process the imports. Note, we expect all processes (Event BPEL 1.1)
@@ -1677,4 +1678,7 @@
             return rval.iterator();
         }
     }
+
+    public void setExtensionValidators(Map<QName, ExtensionValidator> validators) {
+    }
 }

Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler11.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler11.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler11.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler11.java Fri Sep 12 17:08:12 2008
@@ -21,6 +21,7 @@
 import org.apache.ode.bpel.compiler.bom.*;
 import org.apache.ode.bpel.compiler.wsdl.WSDLFactoryBPEL11;
 import org.apache.ode.bpel.compiler.wsdl.WSDLFactory4BPEL;
+import org.apache.ode.bpel.compiler.v1.xpath10.XPath10ExpressionCompilerBPEL11;
 
 /**
  * BPEL v1.1 compiler.
@@ -48,7 +49,7 @@
         registerActivityCompiler(WaitActivity.class, new WaitGenerator());
         registerActivityCompiler(TerminateActivity.class, new TerminateGenerator());
 
-        registerExpressionLanguage(EXPLANG_XPATH, "org.apache.ode.bpel.elang.xpath10.compiler.XPath10ExpressionCompilerBPEL11");
+        registerExpressionLanguage(EXPLANG_XPATH, new XPath10ExpressionCompilerBPEL11());
     }
 
 

Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler20.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler20.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler20.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler20.java Fri Sep 12 17:08:12 2008
@@ -22,6 +22,7 @@
 import org.apache.ode.bpel.compiler.wsdl.WSDLFactoryBPEL20;
 import org.apache.ode.bpel.compiler.wsdl.WSDLFactory4BPEL;
 import org.apache.ode.bpel.compiler.v1.xpath10.XPath10ExpressionCompilerBPEL20;
+import org.apache.ode.bpel.compiler.v1.xpath20.XPath20ExpressionCompilerBPEL20;
 
 /**
  * OASIS BPEL V2.0 Compiler
@@ -56,8 +57,7 @@
         registerExpressionLanguage(OASIS_EXPLANG_XPATH_1_0, new XPath10ExpressionCompilerBPEL20());
         
         try {
-            registerExpressionLanguage(OASIS_EXPLANG_XPATH_2_0,
-                    "org.apache.ode.bpel.elang.xpath20.compiler.XPath20ExpressionCompilerBPEL20");
+            registerExpressionLanguage(OASIS_EXPLANG_XPATH_2_0, new XPath20ExpressionCompilerBPEL20());
         } catch (Exception e) {
             __log.error("Error loading XPath 2.0 Expression Language: it will not be available.");
         }

Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler20Draft.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler20Draft.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler20Draft.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/BpelCompiler20Draft.java Fri Sep 12 17:08:12 2008
@@ -21,6 +21,7 @@
 
 import org.apache.ode.bpel.compiler.bom.*;
 import org.apache.ode.bpel.compiler.v1.xpath10.XPath10ExpressionCompilerBPEL20Draft;
+import org.apache.ode.bpel.compiler.v1.xpath20.XPath20ExpressionCompilerBPEL20Draft;
 import org.apache.ode.bpel.compiler.wsdl.WSDLFactoryBPEL20Draft;
 import org.apache.ode.bpel.compiler.wsdl.WSDLFactory4BPEL;
 
@@ -55,8 +56,7 @@
 
         registerExpressionLanguage(OASIS_EXPLANG_XPATH_1_0, new XPath10ExpressionCompilerBPEL20Draft());
         try {
-            registerExpressionLanguage(OASIS_EXPLANG_XPATH_2_0,
-                    "org.apache.ode.bpel.elang.xpath20.compiler.XPath20ExpressionCompilerBPEL20Draft");
+            registerExpressionLanguage(OASIS_EXPLANG_XPATH_2_0, new XPath20ExpressionCompilerBPEL20Draft());
         } catch (Exception e) {
             __log.error("Error loading XPath 2.0 Expression Language: it will not be available.");
         }

Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/xpath10/XPath10ExpressionCompilerImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/xpath10/XPath10ExpressionCompilerImpl.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/xpath10/XPath10ExpressionCompilerImpl.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/xpath10/XPath10ExpressionCompilerImpl.java Fri Sep 12 17:08:12 2008
@@ -71,7 +71,7 @@
         _qnFnGetVariableData = new QName(_bpelNsURI, "getVariableData");
         _qnFnGetVariableProperty = new QName(_bpelNsURI, "getVariableProperty");
         _qnFnGetLinkStatus = new QName(_bpelNsURI, "getLinkStatus");
-        _properties.put("runtime-class", "org.apache.ode.bpel.elang.xpath10.runtime.XPath10ExpressionRuntime");        
+        _properties.put("runtime-class", "org.apache.ode.bpel.rtrep.v1.xpath10.XPath10ExpressionRuntime");
     }
 
     /**

Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/xpath20/XPath20ExpressionCompilerImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/xpath20/XPath20ExpressionCompilerImpl.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/xpath20/XPath20ExpressionCompilerImpl.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v1/xpath20/XPath20ExpressionCompilerImpl.java Fri Sep 12 17:08:12 2008
@@ -72,7 +72,7 @@
         _qnVarData = new QName(_bpelNS, Constants.EXT_FUNCTION_GETVARIABLEDATA);
         _qnXslTransform = new QName(_bpelNS, Constants.EXT_FUNCTION_DOXSLTRANSFORM);
 
-        _properties.put("runtime-class", "org.apache.ode.bpel.elang.xpath20.runtime.XPath20ExpressionRuntime");
+        _properties.put("runtime-class", "org.apache.ode.bpel.rtrep.v1.xpath20.XPath20ExpressionRuntime");
         TransformerFactory trsf = new net.sf.saxon.TransformerFactoryImpl();
         XslTransformHandler.getInstance().setTransformerFactory(trsf);
     }

Added: ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/TestOModelVersions.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/TestOModelVersions.java?rev=694852&view=auto
==============================================================================
--- ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/TestOModelVersions.java (added)
+++ ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/TestOModelVersions.java Fri Sep 12 17:08:12 2008
@@ -0,0 +1,18 @@
+package org.apache.ode.bpel.compiler;
+
+import junit.framework.TestCase;
+import org.apache.ode.bpel.rapi.Serializer;
+import org.apache.ode.bpel.rapi.ProcessModel;
+
+public class TestOModelVersions extends TestCase {
+
+    public void testVersionReload() throws Exception {
+        Serializer ser = new Serializer(getClass().getClassLoader().getResourceAsStream("TestActivityFlow-v1.cbp"));
+        ProcessModel op = ser.readPModel();
+        assertEquals("org.apache.ode.bpel.rtrep.v1.OProcess", op.getClass().getName());
+
+        ser = new Serializer(getClass().getClassLoader().getResourceAsStream("TestActivityFlow-v2.cbp"));
+        op = ser.readPModel();
+        assertEquals("org.apache.ode.bpel.rtrep.v2.OProcess", op.getClass().getName());
+    }
+}

Added: ode/trunk/bpel-compiler/src/test/resources/TestActivityFlow-v1.cbp
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/TestActivityFlow-v1.cbp?rev=694852&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ode/trunk/bpel-compiler/src/test/resources/TestActivityFlow-v1.cbp
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ode/trunk/bpel-compiler/src/test/resources/TestActivityFlow-v2.cbp
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/resources/TestActivityFlow-v2.cbp?rev=694852&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ode/trunk/bpel-compiler/src/test/resources/TestActivityFlow-v2.cbp
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java Fri Sep 12 17:08:12 2008
@@ -32,7 +32,6 @@
 import org.apache.ode.bpel.dd.TDeployment.Process;
 import org.apache.ode.bpel.iapi.ContextException;
 import org.apache.ode.bpel.rapi.Serializer;
-import org.apache.ode.bpel.rtrep.Serializers;
 import org.apache.xmlbeans.XmlOptions;
 import org.w3c.dom.Node;
 
@@ -55,9 +54,6 @@
 
 /**
  * Container providing various functions on the deployment directory.
- *
- * @author mriou
- * @author Maciej Szefler <mszefler at gmail dot com>
  */
 class DeploymentUnitDir  {
 
@@ -177,7 +173,7 @@
         InputStream is = null;
         try {
             is = new FileInputStream(f);
-            Serializer ofh = Serializers.getLatest(is);
+            Serializer ofh = new Serializer(is);
             return new CBPInfo(ofh.getType(), ofh.getGuid(), f);
         } catch (Exception e) {
             throw new ContextException("Couldn't read compiled BPEL process " + f.getAbsolutePath(), e);

Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java Fri Sep 12 17:08:12 2008
@@ -189,10 +189,6 @@
         return _version;
     }
 
-    public int getRuntimeVersion() {
-        return 2;
-    }
-
     public InputStream getCBPInputStream() {
         CBPInfo cbpInfo = _du.getCBPInfo(getType());
         if (cbpInfo == null)
@@ -253,41 +249,6 @@
     	return _sharedServices.contains(serviceName);
     }
 
-    private void handleEndpoints() {
-        // for (TProvide provide : _pinfo.getProvideList()) {
-        // OPartnerLink pLink = _oprocess.getPartnerLink(provide.getPartnerLink());
-        // if (pLink == null) {
-        // String msg = __msgs.msgDDPartnerLinkNotFound(provide.getPartnerLink());
-        // __log.error(msg);
-        // throw new BpelEngineException(msg);
-        // }
-        // if (!pLink.hasMyRole()) {
-        // String msg = __msgs.msgDDMyRoleNotFound(provide.getPartnerLink());
-        // __log.error(msg);
-        // throw new BpelEngineException(msg);
-        // }
-        // }
-        // for (TInvoke invoke : _pinfo.getInvokeList()) {
-        // OPartnerLink pLink = _oprocess.getPartnerLink(invoke.getPartnerLink());
-        // if (pLink == null) {
-        // String msg = __msgs.msgDDPartnerLinkNotFound(invoke.getPartnerLink());
-        // __log.error(msg);
-        // throw new BpelEngineException(msg);
-        // }
-        // if (!pLink.hasPartnerRole()) {
-        // String msg = __msgs.msgDDPartnerRoleNotFound(invoke.getPartnerLink());
-        // __log.error(msg);
-        // throw new BpelEngineException(msg);
-        // }
-        // TODO Handle non initialize partner roles that just provide a binding
-        // if (!pLink.initializePartnerRole && _oprocess.version.equals(Namespaces.WS_BPEL_20_NS)) {
-        // String msg = ProcessDDInitializer.__msgs.msgDDNoInitiliazePartnerRole(invoke.getPartnerLink());
-        // ProcessDDInitializer.__log.error(msg);
-        // throw new BpelEngineException(msg);
-        // }
-        // }
-    }
-
     DeploymentUnitDir getDeploymentUnit() {
         return _du;
     }

Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java Fri Sep 12 17:08:12 2008
@@ -608,7 +608,8 @@
         File dudir = findDeployDir(dudao);
 
         if (dudir == null || !dudir.exists())
-            throw new ContextException("Deployed directory " + dudir + " no longer there!");
+            throw new ContextException("Deployed directory " +
+                    (dudir == null ? "(unknown)" : dudir) + " no longer there!");
         DeploymentUnitDir dud = new DeploymentUnitDir(dudir);
         dud.scan();
 

Modified: ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java (original)
+++ ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java Fri Sep 12 17:08:12 2008
@@ -342,7 +342,7 @@
 
             __log.debug("Registering process " + conf.getProcessId() + " with server.");
 
-            ODEProcess process = new ODEProcess(this, conf, null, buildRuntime(conf), _myRoleMexCache);
+            ODEProcess process = new ODEProcess(this, conf, null, _myRoleMexCache);
 
             for (Endpoint e : process.getServiceNames()) {
                 __log.debug("Register process: serviceId=" + e + ", process=" + process);
@@ -375,19 +375,6 @@
         }
     }
 
-    private OdeRuntime buildRuntime(ProcessConf conf) {
-        // Relying on package naming conventions to find our runtime
-        String qualifiedName = "org.apache.ode.bpel.rtrep.v" + conf.getRuntimeVersion() + ".RuntimeImpl";
-        try {
-            OdeRuntime runtime = (OdeRuntime) Class.forName(qualifiedName).newInstance();
-            runtime.setExtensionRegistry(_contexts.extensionRegistry);
-            return runtime;
-        } catch (Exception e) {
-            throw new RuntimeException("Couldn't instantiate ODE runtime version " + conf.getRuntimeVersion() +
-                    ", either your process definition version is outdated or we have a bug.");
-        }
-    }
-
     public void unregister(QName pid) throws BpelEngineException {
         if (__log.isTraceEnabled())
             __log.trace("unregister: " + pid);

Modified: ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java
URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java (original)
+++ ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java Fri Sep 12 17:08:12 2008
@@ -19,6 +19,8 @@
 package org.apache.ode.bpel.engine;
 
 import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -70,6 +72,7 @@
 import org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl;
 import org.apache.ode.bpel.memdao.ProcessInstanceDaoImpl;
 import org.apache.ode.bpel.rapi.*;
+import org.apache.ode.bpel.rapi.Serializer;
 import org.apache.ode.jacob.soup.ReplacementMap;
 import org.apache.ode.jacob.vpu.ExecutionQueueImpl;
 import org.apache.ode.utils.GUID;
@@ -144,9 +147,7 @@
     
     private ExternalVariableManager _evm;
     
-    ODEProcess(BpelServerImpl server, ProcessConf conf, BpelEventListener debugger,
-               OdeRuntime odeRuntime, MyRoleMessageExchangeCache mexCache) {
-        _runtime = odeRuntime;
+    ODEProcess(BpelServerImpl server, ProcessConf conf, BpelEventListener debugger, MyRoleMessageExchangeCache mexCache) {
         _server = server;
         _pid = conf.getProcessId();
         _pconf = conf;
@@ -1074,6 +1075,22 @@
         }
     }
 
+    /**
+     * Read an {@link org.apache.ode.bpel.rtrep.v2.OProcess} representation from a stream.
+     *
+     * @param is input stream
+     * @return deserialized process representation
+     * @throws java.io.IOException
+     * @throws ClassNotFoundException
+     */
+    private ProcessModel deserializeCompiledProcess(InputStream is) throws IOException, ClassNotFoundException {
+        ProcessModel compiledProcess;
+        Serializer ofh = new Serializer(is);
+        compiledProcess = (ProcessModel) ofh.readPModel();
+        return compiledProcess;
+    }
+
+
     class ProcessRunnable implements Runnable {
         Runnable _work;
 
@@ -1134,8 +1151,15 @@
 
         private void doHydrate() {
             markused();
-            _runtime.init(_pconf);
-            _processModel = _runtime.getModel();
+            try {
+                _processModel = deserializeCompiledProcess(_pconf.getCBPInputStream());
+            } catch (Exception e) {
+                String errmsg = "Error reloading compiled process " + _pconf.getProcessId() + "; the file appears to be corrupted.";
+                __log.error(errmsg);
+                throw new BpelEngineException(errmsg, e);
+            }
+            _runtime = buildRuntime(_processModel.getModelVersion());
+            _runtime.init(_pconf, _processModel);
 
             setRoles(_processModel);
     		initExternalVariables();
@@ -1304,6 +1328,19 @@
         target.invokeProcess(myRoleMex);
     }
 
+    private OdeRuntime buildRuntime(int modelVersion) {
+        // Relying on package naming conventions to find our runtime
+        String qualifiedName = "org.apache.ode.bpel.rtrep.v" + modelVersion + ".RuntimeImpl";
+        try {
+            OdeRuntime runtime = (OdeRuntime) Class.forName(qualifiedName).newInstance();
+            runtime.setExtensionRegistry(_contexts.extensionRegistry);
+            return runtime;
+        } catch (Exception e) {
+            throw new RuntimeException("Couldn't instantiate ODE runtime version " + modelVersion +
+                    ", either your process definition version is outdated or we have a bug.");
+        }
+    }
+
     void setStatefulEPRs(MessageExchangeDAO partnerRoleMex) {
         setStatefulEPRs(partnerRoleMex, null);
     }

Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java Fri Sep 12 17:08:12 2008
@@ -726,7 +726,19 @@
                 String clsName = readUTF();
                 ObjectStreamClass cached = _classDescriptors.get(clsName);
                 if (cached == null) {
-                    cached = ObjectStreamClass.lookup(Class.forName(clsName, true, _classLoader));
+                    String newClsName = clsName;
+                    if (newClsName.startsWith("org.apache.ode.bpel.runtime."))
+                        newClsName = clsName.replace("org.apache.ode.bpel.runtime.", "org.apache.ode.bpel.rtrep.v1.");
+                    if (newClsName.startsWith("org.apache.ode.bpel.o.Serializer"))
+                        newClsName = clsName.replace("org.apache.ode.bpel.o.Serializer", "org.apache.ode.bpel.rapi.Serializer");
+                    if (newClsName.startsWith("org.apache.ode.bpel.elang.xpath20.o."))
+                        newClsName = clsName.replace("org.apache.ode.bpel.elang.xpath20.o.", "org.apache.ode.bpel.rtrep.v1.xpath20.");
+                    if (newClsName.startsWith("org.apache.ode.bpel.o."))
+                        newClsName = clsName.replace("org.apache.ode.bpel.o.", "org.apache.ode.bpel.rtrep.v1.");
+                    if (newClsName.startsWith("org.apache.ode.bpel.engine."))
+                        newClsName = clsName.replace("org.apache.ode.bpel.engine.", "org.apache.ode.bpel.rtrep.v1.");
+
+                    cached = ObjectStreamClass.lookup(Class.forName(newClsName, true, _classLoader));
                     _classDescriptors.put(clsName, cached);
                 }
                 return cached;

Modified: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java (original)
+++ ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java Fri Sep 12 17:08:12 2008
@@ -46,10 +46,9 @@
 import org.apache.ode.bpel.iapi.Scheduler;
 import org.apache.ode.bpel.pmapi.InstanceManagement;
 import org.apache.ode.bpel.pmapi.ProcessManagement;
-import org.apache.ode.bpel.rapi.Serializer;
 import org.apache.ode.bpel.rapi.ProcessModel;
 import org.apache.ode.bpel.rapi.PartnerLinkModel;
-import org.apache.ode.bpel.rtrep.Serializers;
+import org.apache.ode.bpel.rapi.Serializer;
 import org.apache.ode.jbi.msgmap.Mapper;
 import org.apache.ode.jbi.util.WSDLFlattener;
 import org.apache.ode.store.ProcessStoreImpl;
@@ -179,7 +178,7 @@
         OdeService service = new OdeService(this, endpoint);
         try {
             ProcessConf pc = _store.getProcessConfiguration(pid);
-            Serializer ofh = Serializers.getLatest(pc.getCBPInputStream());
+            Serializer ofh = new Serializer(pc.getCBPInputStream());
             ProcessModel compiledProcess = ofh.readPModel();
             QName portType = null;
             for (Map.Entry<String, Endpoint> provide : pc.getProvideEndpoints().entrySet()) {

Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OProcess.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OProcess.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OProcess.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OProcess.java Fri Sep 12 17:08:12 2008
@@ -18,11 +18,10 @@
  */
 package org.apache.ode.bpel.rtrep.v1;
 
-import org.apache.ode.utils.stl.CollectionsX;
-import org.apache.ode.utils.stl.MemberOfFunction;
 import org.apache.ode.bpel.rapi.ProcessModel;
 import org.apache.ode.bpel.rapi.ActivityModel;
 import org.apache.ode.bpel.rapi.PartnerLinkModel;
+import org.apache.ode.bpel.rapi.PropertyAliasModel;
 
 import javax.wsdl.Operation;
 import javax.xml.namespace.QName;
@@ -160,7 +159,7 @@
         }
     }
 
-    public static class OPropertyAlias extends OBase {
+    public static class OPropertyAlias extends OBase implements PropertyAliasModel {
 
         static final long serialVersionUID = -1L  ;
 
@@ -213,4 +212,8 @@
     public String getGuid() {
         return guid;
     }
+
+    public int getModelVersion() {
+        return 1;
+    }
 }

Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OScope.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OScope.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OScope.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OScope.java Fri Sep 12 17:08:12 2008
@@ -19,6 +19,10 @@
 
 package org.apache.ode.bpel.rtrep.v1;
 
+import org.apache.ode.bpel.rapi.CorrelationSetModel;
+import org.apache.ode.bpel.rapi.PropertyAliasModel;
+
+import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -147,7 +151,7 @@
         return "{OScope '" + name + "' id=" + getId() + "}";
     }
 
-    public static final class CorrelationSet extends OBase {
+    public static final class CorrelationSet extends OBase implements CorrelationSetModel {
       
         static final long serialVersionUID = -1L  ;
         public String name;
@@ -162,6 +166,21 @@
         public String toString() {
             return "{CSet " + name + " " + properties + "}";
         }
+
+        public List<PropertyAliasModel> getAliases(QName messageName) {
+            List<PropertyAliasModel> aliases = new ArrayList<PropertyAliasModel>();
+            OVarType messageType = getOwner().messageTypes.get(messageName);
+            for (Object prop : properties) {
+                OProcess.OProperty property = (OProcess.OProperty) prop;
+                OProcess.OPropertyAlias alias = property.getAlias(messageType);
+                if (alias == null)
+                    throw new IllegalArgumentException("No alias found for property " + property.name +
+                            " and message " + messageName + ", should have been caught at compilation.");
+                aliases.add(alias);
+            }
+            return aliases;
+        }
+
     }
 
     public static final class Variable extends OBase {

Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/RuntimeImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/RuntimeImpl.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/RuntimeImpl.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/RuntimeImpl.java Fri Sep 12 17:08:12 2008
@@ -41,15 +41,9 @@
     /**
      * Initialize according to process configuration.
      */
-    public void init(ProcessConf pconf) {
+    public void init(ProcessConf pconf, ProcessModel pmodel) {
         _pconf = pconf;
-        try {
-            _oprocess = deserializeCompiledProcess(_pconf.getCBPInputStream());
-        } catch (Exception e) {
-            String errmsg = "Error reloading compiled process " + _pconf.getProcessId() + "; the file appears to be corrupted.";
-            __log.error(errmsg);
-            throw new BpelEngineException(errmsg, e);
-        }
+        _oprocess = (OProcess) pmodel;
 
         _replacementMap = new ReplacementMapImpl(_oprocess);
 
@@ -143,19 +137,4 @@
         _extensionRegistry = extensionRegistry;
     }
 
-    /**
-     * Read an {@link org.apache.ode.bpel.rtrep.v1.OProcess} representation from a stream.
-     * @param is input stream
-     * @return deserialized process representation
-     * @throws java.io.IOException
-     * @throws ClassNotFoundException
-     */
-    private OProcess deserializeCompiledProcess(InputStream is) throws IOException, ClassNotFoundException {
-        OProcess compiledProcess;
-        Serializer ofh = new Serializer(is);
-        compiledProcess = ofh.readOProcess();
-        return compiledProcess;
-    }
-
-
 }
\ No newline at end of file

Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ASSIGN.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ASSIGN.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ASSIGN.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ASSIGN.java Fri Sep 12 17:08:12 2008
@@ -438,6 +438,10 @@
  
 
     private void replaceEndpointRefence(PartnerLinkInstance plval, Node rvalue) throws FaultException {
+        if (rvalue.getNodeType() == Node.ATTRIBUTE_NODE)
+            throw new FaultException(getOAsssign().getOwner().constants.qnMismatchedAssignmentFailure,
+                    "Can't assign an attribute to an endpoint, you probably want to select the attribute text.");
+
         // Eventually wrapping with service-ref element if we've been directly assigned some
         // value that isn't wrapped.
         if (rvalue.getNodeType() == Node.TEXT_NODE ||

Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OProcess.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OProcess.java?rev=694852&r1=694851&r2=694852&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OProcess.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OProcess.java Fri Sep 12 17:08:12 2008
@@ -229,4 +229,8 @@
         in.defaultReadObject();
         instanceCount++;
     }
+
+    public int getModelVersion() {
+        return 2;
+    }
 }



Mime
View raw message