details: https://code.openbravo.com/erp/devel/pi/rev/e277145178ff changeset: 33234:e277145178ff user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Dec 19 19:31:16 2017 +0100 summary: [ha] AD Infrastructure
details: https://code.openbravo.com/erp/devel/pi/rev/2edb7ef396b8 changeset: 33235:2edb7ef396b8 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Dec 20 09:28:00 2017 +0100 summary: [ha] Add missing AD_Element details: https://code.openbravo.com/erp/devel/pi/rev/346ecd1aba6c changeset: 33236:346ecd1aba6c user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Dec 20 09:52:18 2017 +0100 summary: [ha] Add the Cluster Service Manager details: https://code.openbravo.com/erp/devel/pi/rev/7e065bfdbb87 changeset: 33237:7e065bfdbb87 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Dec 20 16:14:35 2017 +0100 summary: [ha] Several improvements in ClusterServiceManager - New private methods invoked by the register logic - Renamed the register method to registerOrUpdateService - Improved the way of discovering whether the node in charge of a service is down - Init the node name on ClusterServiceManager startup - Added log info details: https://code.openbravo.com/erp/devel/pi/rev/ed3ab602f340 changeset: 33238:ed3ab602f340 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Dec 20 18:41:58 2017 +0100 summary: [ha] For the moment, the threshold is not configurable details: https://code.openbravo.com/erp/devel/pi/rev/1c50e5db279e changeset: 33239:1c50e5db279e user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Dec 20 18:43:11 2017 +0100 summary: [ha] Added comment details: https://code.openbravo.com/erp/devel/pi/rev/b7cc8d27d0fb changeset: 33240:b7cc8d27d0fb user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Dec 20 19:18:57 2017 +0100 summary: [ha] Specify the timeout in the AD in seconds details: https://code.openbravo.com/erp/devel/pi/rev/a7f446c8575a changeset: 33241:a7f446c8575a user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Dec 21 09:03:08 2017 +0100 summary: [ha] When not in cluster, service should be executed details: https://code.openbravo.com/erp/devel/pi/rev/de4c8492fee2 changeset: 33242:de4c8492fee2 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Dec 21 09:50:57 2017 +0100 summary: [ha] Add ClusterServiceManager into the Import Entry Framework details: https://code.openbravo.com/erp/devel/pi/rev/e9025059886a changeset: 33243:e9025059886a user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Dec 21 09:53:08 2017 +0100 summary: [ha] merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/197e44755b77 changeset: 33244:197e44755b77 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Dec 21 13:50:39 2017 +0100 summary: [ha] Ensure that ClusterServiceThread closes the DB transaction that it uses details: https://code.openbravo.com/erp/devel/pi/rev/3ec747609b41 changeset: 33245:3ec747609b41 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Dec 22 10:27:57 2017 +0100 summary: [ha] Improve some parameter names details: https://code.openbravo.com/erp/devel/pi/rev/037d7dc2ad48 changeset: 33246:037d7dc2ad48 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Dec 22 18:07:42 2017 +0100 summary: [ha] Define the ClusterServiceManager as a JMX MBean details: https://code.openbravo.com/erp/devel/pi/rev/e28bf3a59dc7 changeset: 33247:e28bf3a59dc7 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Dec 22 18:28:53 2017 +0100 summary: [ha] Define the minimum threshold needed if all nodes start at the same time details: https://code.openbravo.com/erp/devel/pi/rev/08cc178e08b8 changeset: 33248:08cc178e08b8 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Jan 08 08:54:50 2018 +0100 summary: [ha] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/d0a22c2f53aa changeset: 33249:d0a22c2f53aa user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Jan 08 10:10:35 2018 +0100 summary: [ha] Prevent connection leaks when there is not any registered cluster service details: https://code.openbravo.com/erp/devel/pi/rev/f7a6acbf96a9 changeset: 33250:f7a6acbf96a9 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Jan 08 16:56:57 2018 +0100 summary: [ha] Remove unneeded annotation details: https://code.openbravo.com/erp/devel/pi/rev/3b85cc34ed7d changeset: 33251:3b85cc34ed7d user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Jan 08 19:13:47 2018 +0100 summary: [ha] Allow to override the getName() method details: https://code.openbravo.com/erp/devel/pi/rev/79f6c7ba5376 changeset: 33252:79f6c7ba5376 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Jan 09 08:48:38 2018 +0100 summary: [ha] Improve log info when forcing a node to be in charge of a service details: https://code.openbravo.com/erp/devel/pi/rev/d0f51c1439dc changeset: 33253:d0f51c1439dc user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Jan 09 11:16:25 2018 +0100 summary: [ha] Allow to close the connection automatically when using isHandlingService If the isHandlingService is invoked from a request which is outside of the DalRequestFilter, the connection used to retrieve cluster service information must be closed manually. Otherwise, threads like ImportEntryManagerThread or ImportEntryArchiveManager could retrieved outdated information (from the Hibernate session cache) and also could be a risk of leaving connection leaks. details: https://code.openbravo.com/erp/devel/pi/rev/bf9499028611 changeset: 33254:bf9499028611 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Jan 09 11:49:47 2018 +0100 summary: [ha] Add the javadoc of the ClusterServiceManager API details: https://code.openbravo.com/erp/devel/pi/rev/f13029228fd6 changeset: 33255:f13029228fd6 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Jan 09 18:59:57 2018 +0100 summary: [ha] The Date of the last ping performed by a node can be consulted through JMX details: https://code.openbravo.com/erp/devel/pi/rev/c491a47f473e changeset: 33256:c491a47f473e user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Jan 17 10:46:25 2018 +0100 summary: Refresh current time on each iteration This is done to avoid missing to refresh the leadership in case the ping round took so much time details: https://code.openbravo.com/erp/devel/pi/rev/4bc71c63e762 changeset: 33257:4bc71c63e762 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Jan 17 10:48:25 2018 +0100 summary: [ha] Revert undesired changeset details: https://code.openbravo.com/erp/devel/pi/rev/9cc74a19eff2 changeset: 33258:9cc74a19eff2 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Jan 17 10:59:41 2018 +0100 summary: [ha] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/1bc5b65b865d changeset: 33259:1bc5b65b865d user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Jan 17 12:48:10 2018 +0100 summary: [ha] Use a different connection to get the node in charge of a service details: https://code.openbravo.com/erp/devel/pi/rev/ebf9191c7a67 changeset: 33260:ebf9191c7a67 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Jan 17 18:11:35 2018 +0100 summary: [ha] Add additional where clause when replacing the node in charge of a service Adding node = <formerNodeInCharge> into the where clause when replacing the node in charge of a service. This is done in order to prevent two succesfull leader registrations in case two nodes tries to promote themselves as leaders at the same time. details: https://code.openbravo.com/erp/devel/pi/rev/c94cbb4ba63e changeset: 33261:c94cbb4ba63e user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Jan 17 18:12:10 2018 +0100 summary: [ha] Remove extra blank spaces details: https://code.openbravo.com/erp/devel/pi/rev/6ac098416758 changeset: 33262:6ac098416758 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 18 12:40:28 2018 +0100 summary: [ha] Specify the current node when updating the last ping details: https://code.openbravo.com/erp/devel/pi/rev/2cc7303db4d6 changeset: 33263:2cc7303db4d6 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 18 13:55:07 2018 +0100 summary: [ha] Fix log message details: https://code.openbravo.com/erp/devel/pi/rev/2a5ae2b7ef71 changeset: 33264:2a5ae2b7ef71 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 18 20:43:12 2018 +0100 summary: [ha] Define the threshold as a % of the timeout The threshold will be the 10% of the timeout unless it is lower than 1 second or higher than 5 seconds, in these cases the threshold will be 1 second and 5 seconds respectively. Taking into account that the ping round should be completed in milliseconds, those values are more than enough details: https://code.openbravo.com/erp/devel/pi/rev/6e9505874979 changeset: 33265:6e9505874979 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 18 20:47:11 2018 +0100 summary: [ha] Reduce vertical separation details: https://code.openbravo.com/erp/devel/pi/rev/1eabbafa607b changeset: 33266:1eabbafa607b user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 18 20:53:26 2018 +0100 summary: [ha] Early return if there are not available cluster services details: https://code.openbravo.com/erp/devel/pi/rev/a4edabb23161 changeset: 33267:a4edabb23161 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Jan 19 12:10:48 2018 +0100 summary: [ha] Check if current node should handle the import entry before processing it details: https://code.openbravo.com/erp/devel/pi/rev/538927374840 changeset: 33268:538927374840 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Jan 19 13:15:17 2018 +0100 summary: [ha] Now the ping service detects if cluster services are alive details: https://code.openbravo.com/erp/devel/pi/rev/f43d2c8d55d1 changeset: 33269:f43d2c8d55d1 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Jan 24 13:40:37 2018 +0100 summary: [ha] Refactor to support the new definion of the ClusterService abstract class details: https://code.openbravo.com/erp/devel/pi/rev/a2ea118158b6 changeset: 33270:a2ea118158b6 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Jan 24 14:11:38 2018 +0100 summary: [ha] ClusterService instance should know if they're running in cluster details: https://code.openbravo.com/erp/devel/pi/rev/fc6b6ab254d8 changeset: 33271:fc6b6ab254d8 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Jan 24 16:37:21 2018 +0100 summary: [ha] Some minor code improvements - Allow to invoke the ClusterServiceManager.isCluster() method from ClusterService to avoid code duplication - Use better method name: renamed method 'isHandlingService' as 'isServiceHandledInCurrentNode' details: https://code.openbravo.com/erp/devel/pi/rev/fd86caec9f62 changeset: 33272:fd86caec9f62 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Jan 24 19:11:20 2018 +0100 summary: [ha] use initialized variable details: https://code.openbravo.com/erp/devel/pi/rev/922987ec5b28 changeset: 33273:922987ec5b28 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Jan 24 20:06:36 2018 +0100 summary: [ha] Add missing help/description for the new AD elements details: https://code.openbravo.com/erp/devel/pi/rev/f83b37a75a2b changeset: 33274:f83b37a75a2b user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 25 09:45:51 2018 +0100 summary: [ha] start/shutdown ClusterServiceManager in the ImportProcessContextListener details: https://code.openbravo.com/erp/devel/pi/rev/63b57f71eeae changeset: 33275:63b57f71eeae user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 25 10:30:45 2018 +0100 summary: [ha] Use own ThreadFactory to create the ClusterServiceThread Use own DaemonThreadFactory to set the ClusterServiceThread as a daemon thread. details: https://code.openbravo.com/erp/devel/pi/rev/9a9bd975a8c5 changeset: 33276:9a9bd975a8c5 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 25 10:34:05 2018 +0100 summary: [ha] Start the ImportEntryManager on application startup details: https://code.openbravo.com/erp/devel/pi/rev/f9dce07eda9b changeset: 33277:f9dce07eda9b user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 25 16:12:11 2018 +0100 summary: [ha] Use Long.parseLong(String) instead of new Long(String) new Long(String) is deprecated in JDK9, using Long.parseLong(String) instead details: https://code.openbravo.com/erp/devel/pi/rev/817fd6751fca changeset: 33278:817fd6751fca user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 25 16:16:07 2018 +0100 summary: [ha] getClusterServiceTimeout() returns the timeout in ms details: https://code.openbravo.com/erp/devel/pi/rev/7055c9fbee05 changeset: 33279:7055c9fbee05 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 25 16:20:36 2018 +0100 summary: [ha] No need to check if connection is not null No need to check if connection is not null null because this is also handled in dcp.releaseCommitConnection(connection); details: https://code.openbravo.com/erp/devel/pi/rev/155e3319ad33 changeset: 33280:155e3319ad33 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 25 16:56:45 2018 +0100 summary: [ha] Centralize code used to retrieve the machine (node) name details: https://code.openbravo.com/erp/devel/pi/rev/7a3efdddaed5 changeset: 33281:7a3efdddaed5 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 25 17:57:46 2018 +0100 summary: [ha] When shutting down a leader node, deregister it as leader When shutting down a leader node, deregister it so next node doesn't need to wait until timeout is expired to be promoted. details: https://code.openbravo.com/erp/devel/pi/rev/01239fe46c5d changeset: 33282:01239fe46c5d user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 25 18:00:22 2018 +0100 summary: [ha] Do not check client/org when using registerCurrentNodeForService method details: https://code.openbravo.com/erp/devel/pi/rev/a9375db3d4fd changeset: 33283:a9375db3d4fd user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 25 18:30:34 2018 +0100 summary: [ha] reduce vertical separation details: https://code.openbravo.com/erp/devel/pi/rev/ba56c4b8f3af changeset: 33284:ba56c4b8f3af user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 25 18:53:50 2018 +0100 summary: [ha] Improved the API exposed through JMX details: https://code.openbravo.com/erp/devel/pi/rev/703fb48a84cd changeset: 33285:703fb48a84cd user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 25 19:09:55 2018 +0100 summary: [ha] Retrieve the settings from memory details: https://code.openbravo.com/erp/devel/pi/rev/1933a568b8bd changeset: 33286:1933a568b8bd user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 25 19:12:06 2018 +0100 summary: [ha] Timeout must accept just positive values details: https://code.openbravo.com/erp/devel/pi/rev/915e85d44177 changeset: 33287:915e85d44177 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jan 25 19:28:43 2018 +0100 summary: [ha] AD changes/improvements - Hide the active field in the cluster information/settings windows. - Add missing window and tab descriptions. details: https://code.openbravo.com/erp/devel/pi/rev/13cc3d071fbf changeset: 33288:13cc3d071fbf user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Jan 26 07:55:05 2018 +0100 summary: [ha] Improve name of methods that return the node and service names details: https://code.openbravo.com/erp/devel/pi/rev/ddeba1dae69e changeset: 33289:ddeba1dae69e user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Jan 26 08:06:32 2018 +0100 summary: [ha] Use an anonymous class to create the ThreadFactory of the ExecutorService details: https://code.openbravo.com/erp/devel/pi/rev/fbed9de82f4d changeset: 33290:fbed9de82f4d user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Jan 26 09:07:25 2018 +0100 summary: [ha] Add more missing AD information details: https://code.openbravo.com/erp/devel/pi/rev/62b72fe10bbb changeset: 33291:62b72fe10bbb user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Jan 26 09:19:00 2018 +0100 summary: [ha] Renamed the field showing the leader of a service as "Master Node" details: https://code.openbravo.com/erp/devel/pi/rev/aa5b89d03072 changeset: 33292:aa5b89d03072 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Jan 26 09:53:17 2018 +0100 summary: [ha] On startup log if current node is leading a service (and if not who) details: https://code.openbravo.com/erp/devel/pi/rev/0bcefc650258 changeset: 33293:0bcefc650258 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Jan 26 09:55:38 2018 +0100 summary: [ha] Update comment details: https://code.openbravo.com/erp/devel/pi/rev/c1068550e5ee changeset: 33294:c1068550e5ee user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Jan 26 09:56:17 2018 +0100 summary: [ha] Fix typo details: https://code.openbravo.com/erp/devel/pi/rev/10b528bfb4e5 changeset: 33295:10b528bfb4e5 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Jan 26 14:44:02 2018 +0100 summary: [ha] Allow to enable/disable the ping service through JMX details: https://code.openbravo.com/erp/devel/pi/rev/55df9508c9e7 changeset: 33296:55df9508c9e7 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Jan 26 15:26:55 2018 +0100 summary: [ha] Do not force changes in class hierarchy to declare services details: https://code.openbravo.com/erp/devel/pi/rev/a6f1526686c8 changeset: 33297:a6f1526686c8 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Jan 29 11:18:59 2018 +0100 summary: [ha] Use a UUID to uniquely identify each cluster node This avoids problems in case of of machine name missconfiguration details: https://code.openbravo.com/erp/devel/pi/rev/49ec1d8d16cf changeset: 33298:49ec1d8d16cf user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Jan 29 11:31:38 2018 +0100 summary: [ha] Add additional checks in enable/disable ping methods details: https://code.openbravo.com/erp/devel/pi/rev/b4b401a782a1 changeset: 33299:b4b401a782a1 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Jan 29 12:04:34 2018 +0100 summary: [ha] Some minor improvements - Include the leader name in the information provided through JMX - Improved log message when registering the service for the first time details: https://code.openbravo.com/erp/devel/pi/rev/20d3aab0ef07 changeset: 33300:20d3aab0ef07 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Jan 29 12:36:55 2018 +0100 summary: [ha] Use new ImportEntryClusterService in ImportEntryArchiveManager also - Use new ImportEntryClusterService to check if we are in the cluster node handling the import entries. In that case, it should also archive them. - Added also the check before archiving each import entry details: https://code.openbravo.com/erp/devel/pi/rev/d45a6c76b1d3 changeset: 33301:d45a6c76b1d3 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Jan 29 12:40:57 2018 +0100 summary: [ha] Minor change in javadoc details: https://code.openbravo.com/erp/devel/pi/rev/554a8fe290dd changeset: 33302:554a8fe290dd user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Jan 29 13:29:45 2018 +0100 summary: [ha] Decouple the ClusterService JMX MBean from the ClusterServiceManager details: https://code.openbravo.com/erp/devel/pi/rev/42bab90d5a2e changeset: 33303:42bab90d5a2e user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Jan 29 16:45:15 2018 +0100 summary: [ha] Log the error instead of ignoring it details: https://code.openbravo.com/erp/devel/pi/rev/2b9ca0b7b965 changeset: 33304:2b9ca0b7b965 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Jan 29 19:17:06 2018 +0100 summary: [ha] Avoid connection leaks when threads should wait details: https://code.openbravo.com/erp/devel/pi/rev/bb2ad6d07c7f changeset: 33305:bb2ad6d07c7f user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Jan 29 19:19:26 2018 +0100 summary: [ha] Avoid connection leak when ping thread does not even start details: https://code.openbravo.com/erp/devel/pi/rev/1dcf6ec03917 changeset: 33306:1dcf6ec03917 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jan 30 08:31:59 2018 +0100 summary: [ha] typo details: https://code.openbravo.com/erp/devel/pi/rev/e06f608f12fc changeset: 33307:e06f608f12fc user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jan 30 09:01:13 2018 +0100 summary: [ha] added @Override to ImportProcessContextListener methods details: https://code.openbravo.com/erp/devel/pi/rev/3b6ac1607e93 changeset: 33308:3b6ac1607e93 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jan 30 09:04:42 2018 +0100 summary: [ha] typo details: https://code.openbravo.com/erp/devel/pi/rev/02cb79321dc8 changeset: 33309:02cb79321dc8 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Jan 30 10:18:59 2018 +0100 summary: [ha] DB/AD adjustments - Define timeout as a mandatory setting - Increase node name colum size to 255 - Show the node ID field - Updated node ID and node name field names details: https://code.openbravo.com/erp/devel/pi/rev/e1de125e4a5a changeset: 33310:e1de125e4a5a user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Jan 30 10:26:42 2018 +0100 summary: [ha] Improve constants definition - DEFAULT_TIMEOUT can be private - Use _ as thousand separator in all constants details: https://code.openbravo.com/erp/devel/pi/rev/52a647f98f63 changeset: 33311:52a647f98f63 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Jan 30 10:30:21 2018 +0100 summary: [ha] Class javadoc details: https://code.openbravo.com/erp/devel/pi/rev/bb320014f901 changeset: 33312:bb320014f901 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Jan 30 10:44:15 2018 +0100 summary: [ha] Implement methods used only in JMX in the JmxClusterServiceManager details: https://code.openbravo.com/erp/devel/pi/rev/cb30d35a7127 changeset: 33313:cb30d35a7127 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Jan 30 10:50:42 2018 +0100 summary: [ha] Define getters used only in JMX as package private details: https://code.openbravo.com/erp/devel/pi/rev/51b6f62a9c17 changeset: 33314:51b6f62a9c17 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Jan 30 11:00:30 2018 +0100 summary: [ha] Methods visibility is as restrictive as possible details: https://code.openbravo.com/erp/devel/pi/rev/21956ffebb7c changeset: 33315:21956ffebb7c user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Jan 30 11:50:11 2018 +0100 summary: [ha] Improved log info details: https://code.openbravo.com/erp/devel/pi/rev/2acf149a483c changeset: 33316:2acf149a483c user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Jan 30 13:35:50 2018 +0100 summary: [ha] Restore methods that require to be at least protected due to CDI injection details: https://code.openbravo.com/erp/devel/pi/rev/4538253252d3 changeset: 33317:4538253252d3 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Jan 30 13:37:14 2018 +0100 summary: [ha] Remove unneeded isDebugEnabled() check details: https://code.openbravo.com/erp/devel/pi/rev/faa0abab3871 changeset: 33318:faa0abab3871 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Jan 30 14:06:23 2018 +0100 summary: [ha] Include leader name information in ClusterService details: https://code.openbravo.com/erp/devel/pi/rev/888d5b9251d3 changeset: 33319:888d5b9251d3 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Jan 30 17:41:49 2018 +0100 summary: [ha] Use the proper alternative for StringUtils details: https://code.openbravo.com/erp/devel/pi/rev/a62c74e6424a changeset: 33320:a62c74e6424a user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Jan 31 10:37:42 2018 +0100 summary: fixes issue 37734: High Availability in Import Entries diffstat: .hgsigs | 2 + .hgtags | 2 + modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml | 6 - modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml | 6 - modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js | 9 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java | 15 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java | 12 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js | 28 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js | 12 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 20 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java | 2 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/LinkUIDefinition.java | 2 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/StringUIDefinition.java | 2 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 24 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped_data.xsql | 40 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/BaseDataSourceService.java | 8 - modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceJavaScriptCreator.java | 236 - modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java | 2 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java | 6 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java | 2 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java | 17 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js | 22 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 22 +- referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml | 1282 +- referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml | 62 +- referencedata/sampledata/F_B_International_Group/AD_USER.xml | 48 +- referencedata/sampledata/F_B_International_Group/A_AMORTIZATION.xml | 22 +- referencedata/sampledata/F_B_International_Group/A_ASSET.xml | 20 +- referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml | 74 +- referencedata/sampledata/F_B_International_Group/C_CONVERSION_RATE.xml | 36 + referencedata/sampledata/F_B_International_Group/C_INVOICE.xml | 3856 +- referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml | 8902 + referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml | 4356 + referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml | 1020 + referencedata/sampledata/F_B_International_Group/C_ORDER.xml | 2286 + referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml | 10221 ++ referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml | 3706 + referencedata/sampledata/F_B_International_Group/C_ORDERTAX.xml | 576 + referencedata/sampledata/F_B_International_Group/C_ORDER_DISCOUNT.xml | 180 + referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml | 47075 +++++++++- referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml | 44 + referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml | 1260 + referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml | 1794 + referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml | 8 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml | 2046 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml | 928 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml | 174 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml | 600 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml | 2330 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml | 1312 +- referencedata/sampledata/F_B_International_Group/FIN_RECONCILIATION.xml | 58 + referencedata/sampledata/F_B_International_Group/GL_JOURNAL.xml | 108 + referencedata/sampledata/F_B_International_Group/GL_JOURNALBATCH.xml | 82 +- referencedata/sampledata/F_B_International_Group/GL_JOURNALLINE.xml | 1260 + referencedata/sampledata/F_B_International_Group/M_ATTRIBUTESETINSTANCE.xml | 90 + referencedata/sampledata/F_B_International_Group/M_COSTING.xml | 2054 +- referencedata/sampledata/F_B_International_Group/M_INOUT.xml | 1566 + referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml | 4738 + referencedata/sampledata/F_B_International_Group/M_MATCHINV.xml | 1482 + referencedata/sampledata/F_B_International_Group/M_MATCHPO.xml | 2964 + referencedata/sampledata/F_B_International_Group/M_STORAGE_DETAIL.xml | 233 +- referencedata/sampledata/F_B_International_Group/M_STORAGE_PENDING.xml | 52 +- referencedata/sampledata/F_B_International_Group/M_TRANSACTION.xml | 6180 + referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml | 3502 + referencedata/sampledata/QA_Testing/AD_PROCESS_ACCESS.xml | 42 - src-core/src/org/openbravo/base/ConfigParameters.java | 25 +- src-core/src/org/openbravo/base/MultipartRequest.java | 4 +- src-core/src/org/openbravo/database/ConnectionProviderImpl.java | 6 +- src-db/database/model/functions/AD_SYNCHRONIZE.xml | 6 +- src-db/database/model/functions/AD_UPDATE_TABLE_IDENTIFIER.xml | 1 - src-db/database/model/functions/A_ASSET_CREATE.xml | 2 - src-db/database/model/functions/A_ASSET_POST.xml | 26 +- src-db/database/model/functions/C_CHANGEPROJECTSTATUS.xml | 2 - src-db/database/model/functions/C_DEBT_PAYMENT_BALANCING_REP.xml | 7 +- src-db/database/model/functions/C_DP_MANAGEMENT_POST.xml | 3 - src-db/database/model/functions/C_INVOICELINE_TAX.xml | 7 +- src-db/database/model/functions/C_INVOICE_CANCEL.xml | 2 - src-db/database/model/functions/C_INVOICE_CREATE.xml | 9 +- src-db/database/model/functions/C_INVOICE_POST.xml | 13 +- src-db/database/model/functions/C_ORDER_POST1.xml | 51 +- src-db/database/model/functions/C_SETTLEMENT_POST.xml | 13 +- src-db/database/model/functions/C_TAXPAYMENT_POST.xml | 5 +- src-db/database/model/functions/C_VALIDCOMBINATION_CLONE.xml | 6 - src-db/database/model/functions/FACT_ACCT_RESET.xml | 12 - src-db/database/model/functions/GL_JOURNAL_POST.xml | 5 +- src-db/database/model/functions/MA_PRODUCTION_COST.xml | 10 +- src-db/database/model/functions/MA_STANDARD_COST_SEQUENCE.xml | 5 +- src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml | 27 +- src-db/database/model/functions/MA_WORKREQUIREMENT_CLOSE.xml | 2 - src-db/database/model/functions/MA_WORKREQUIREMENT_PROCESS.xml | 7 +- src-db/database/model/functions/MA_WRPHASE_CLOSE.xml | 2 - src-db/database/model/functions/M_DISCOUNTSCHEMA_RESEQ.xml | 2 - src-db/database/model/functions/M_FREIGHT_CALCULATE.xml | 4 - src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml | 2 - src-db/database/model/functions/M_GENERATE_STANDARD_COSTS.xml | 2 - src-db/database/model/functions/M_GET_STOCK_PARAM.xml | 2 +- src-db/database/model/functions/M_INOUTEXPLODEBOMNOTSTOCK.xml | 6 +- src-db/database/model/functions/M_INOUT_CREATE.xml | 2 - src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml | 5 +- src-db/database/model/functions/M_INOUT_UPDATEQUANTITYES.xml | 8 - src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml | 9 +- src-db/database/model/functions/M_PROMOTION_CALCULATE.xml | 3 +- src-db/database/model/functions/M_REQUISITION_CREATEPO.xml | 3 +- src-db/database/model/functions/M_UNIQUELOCATOR_RULE_PARAM.xml | 2 - src-db/database/model/tables/AD_CLUSTER_SERVICE.xml | 59 + src-db/database/model/tables/AD_CLUSTER_SERVICE_SETTINGS.xml | 56 + src-db/database/model/tables/C_INVOICELINE.xml | 3 + src-db/database/model/tables/C_ORDERLINE.xml | 1 + src-db/database/model/triggers/A_ASSET_TRG.xml | 2 - src-db/database/model/triggers/C_ATTACHMENT_METHOD_MOD_TRG.xml | 3 - src-db/database/model/triggers/C_BPARTNER_TRG.xml | 4 - src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml | 2 +- src-db/database/model/triggers/C_INVOICELINETAX_TRG.xml | 14 +- src-db/database/model/triggers/C_INVOICELINE_TRG.xml | 4 - src-db/database/model/triggers/C_INVOICELINE_TRG2.xml | 5 +- src-db/database/model/triggers/C_ORDERLINE2_TRG.xml | 9 +- src-db/database/model/triggers/C_ORDERLINETAX_TRG.xml | 14 +- src-db/database/model/triggers/C_ORDERLINE_TRG.xml | 8 +- src-db/database/model/triggers/C_ORDERLINE_TRG2.xml | 6 +- src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml | 4 +- src-db/database/model/triggers/C_PROJECTLINE_TRG.xml | 7 +- src-db/database/model/triggers/C_PROJECT_TRG3.xml | 7 +- src-db/database/model/triggers/MA_GLOBALUSE_TRG.xml | 4 +- src-db/database/model/triggers/M_COSTADJUSTMENTLINE_CHK_TRG.xml | 3 +- src-db/database/model/triggers/M_INTERNAL_CONSUMPTIONLINE_TRG.xml | 4 +- src-db/database/model/triggers/M_INVENTORYLINE2_TRG.xml | 4 +- src-db/database/model/triggers/M_IOLINE_CHK_RESTRICTIONS_TRG.xml | 4 +- src-db/database/model/triggers/M_MOVEMENTLINE_TRG.xml | 4 +- src-db/database/model/triggers/M_OFFER_TYPE_MOD_TRG.xml | 3 - src-db/database/model/triggers/M_PRODUCTIONLINE_TRG.xml | 4 +- src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml | 4 +- src-db/database/model/triggers/M_RESERVATION_TRG.xml | 4 +- src-db/database/model/triggers/M_STORAGE_DETAIL_TRG.xml | 4 +- src-db/database/model/triggers/M_TRANSACTION_TRG2.xml | 4 +- src-db/database/model/triggers/S_TIMEEXPENSELINE_TRG.xml | 4 +- src-db/database/model/views/M_RM_RECEIPT_PICK_EDIT.xml | 2 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 46 + src-db/database/sourcedata/AD_CALLOUT.xml | 10 + src-db/database/sourcedata/AD_COLUMN.xml | 861 +- src-db/database/sourcedata/AD_ELEMENT.xml | 86 + src-db/database/sourcedata/AD_EXTENSION_POINTS.xml | 10 + src-db/database/sourcedata/AD_FIELD.xml | 395 +- src-db/database/sourcedata/AD_MENU.xml | 54 +- src-db/database/sourcedata/AD_MESSAGE.xml | 2 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 41 +- src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 40 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_PROCESS.xml | 24 - src-db/database/sourcedata/AD_REFERENCE.xml | 14 + src-db/database/sourcedata/AD_REF_LIST.xml | 11 + src-db/database/sourcedata/AD_TAB.xml | 69 +- src-db/database/sourcedata/AD_TABLE.xml | 46 +- src-db/database/sourcedata/AD_TABLE_NAVIGATION.xml | 13 + src-db/database/sourcedata/AD_TABLE_TREE.xml | 20 + src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 121 +- src-db/database/sourcedata/AD_TREENODE.xml | 48 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 11 + src-db/database/sourcedata/AD_WINDOW.xml | 34 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 4 +- src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 112 +- src-test/src/org/openbravo/test/costing/TestCosting.java | 14312 +--- src-test/src/org/openbravo/test/costing/TestCostingBase.java | 204 + src-test/src/org/openbravo/test/costing/TestCostingLandedCost.java | 3981 + src-test/src/org/openbravo/test/costing/TestCostingNoSourceAdjustments.java | 1753 + src-test/src/org/openbravo/test/costing/TestCostingSourceAdjustments.java | 3056 + src-test/src/org/openbravo/test/costing/TestCostingUtils.java | 90 - src-test/src/org/openbravo/test/costing/TestIssue37033.java | 335 + src-test/src/org/openbravo/test/costing/TestIssue37279.java | 372 + src-test/src/org/openbravo/test/costing/assertclass/CostAdjustmentAssert.java | 133 + src-test/src/org/openbravo/test/costing/assertclass/DocumentPostAssert.java | 65 + src-test/src/org/openbravo/test/costing/assertclass/LandedCostCostMatchedAssert.java | 35 + src-test/src/org/openbravo/test/costing/assertclass/LandedCostReceiptLineAmountAssert.java | 52 + src-test/src/org/openbravo/test/costing/assertclass/MatchedInvoicesAssert.java | 43 + src-test/src/org/openbravo/test/costing/assertclass/OrderToReceiptResult.java | 42 + src-test/src/org/openbravo/test/costing/assertclass/PhysicalInventoryAssert.java | 57 + src-test/src/org/openbravo/test/costing/assertclass/ProductCostingAssert.java | 112 + src-test/src/org/openbravo/test/costing/assertclass/ProductTransactionAssert.java | 193 + src-test/src/org/openbravo/test/costing/utils/TestCostingConstants.java | 119 + src-test/src/org/openbravo/test/costing/utils/TestCostingUtils.java | 5399 + src-test/src/org/openbravo/test/dal/DalStoredProcedureTest.java | 4 +- src-test/src/org/openbravo/test/dal/ValidationTest.java | 4 +- src-test/src/org/openbravo/test/role/inheritance/AccessPropagation.java | 2 +- src-test/src/org/openbravo/test/role/inheritance/AccessPropagationNotInherited.java | 2 +- src-test/src/org/openbravo/test/role/inheritance/DeletedAccessPropagation.java | 6 +- src-test/src/org/openbravo/test/role/inheritance/HorizontalInheritance.java | 6 +- src-test/src/org/openbravo/test/role/inheritance/RecalculatePermissions.java | 6 +- src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceRestrictions.java | 34 +- src-test/src/org/openbravo/test/role/inheritance/VerticalInheritance.java | 4 +- src-test/src/org/openbravo/test/xml/EntityXMLImportTestBusinessObject.java | 11 +- src-test/src/org/openbravo/test/xml/EntityXMLImportTestSingle.java | 1 - src-test/src/org/openbravo/test/xml/UniqueConstraintImportTest.java | 1 - src-test/src/org/openbravo/test/xml/XMLBaseTest.java | 2 - src-wad/src/org/openbravo/wad/WadConnection.java | 6 +- src/org/openbravo/base/ServerVersionChecker.java | 2 +- src/org/openbravo/base/expression/Evaluator.java | 19 +- src/org/openbravo/base/expression/OBScriptEngine.java | 66 + src/org/openbravo/base/model/Column.java | 2 +- src/org/openbravo/base/model/Property.java | 2 +- src/org/openbravo/base/model/domaintype/BooleanDomainType.java | 2 +- src/org/openbravo/base/model/domaintype/ButtonDomainType.java | 2 +- src/org/openbravo/base/model/domaintype/LongDomainType.java | 2 +- src/org/openbravo/base/secureApp/Attribute_data.xsql | 11 +- src/org/openbravo/base/secureApp/LoginHandler.java | 28 +- src/org/openbravo/base/secureApp/LoginUtils.java | 7 + src/org/openbravo/base/session/SessionFactoryController.java | 36 +- src/org/openbravo/cluster/ClusterService.java | 198 + src/org/openbravo/cluster/ClusterServiceManager.java | 395 + src/org/openbravo/cluster/ClusterService_data.xsql | 48 + src/org/openbravo/cluster/JmxClusterServiceManager.java | 162 + src/org/openbravo/cluster/JmxClusterServiceManagerMBean.java | 72 + src/org/openbravo/common/datasource/CostingTransactionsHQLTransformer.java | 94 +- src/org/openbravo/costing/AverageCostAdjustment.java | 55 + src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java | 4 +- src/org/openbravo/dal/core/DalUUIDHexGenerator.java | 57 - src/org/openbravo/dal/core/OBContext.java | 33 +- src/org/openbravo/dal/core/OBInterceptor.java | 2 +- src/org/openbravo/dal/xml/EntityXMLConverter.java | 43 - src/org/openbravo/dal/xml/ModelXMLConverter.java | 7 - src/org/openbravo/dal/xml/XMLConstants.java | 16 - src/org/openbravo/dal/xml/XMLTypeConverter.java | 8 +- src/org/openbravo/erpCommon/ad_callouts/SE_Expense_BP_Project.java | 8 +- src/org/openbravo/erpCommon/ad_callouts/SE_InOut_Organization.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java | 10 +- src/org/openbravo/erpCommon/ad_callouts/SE_Order_Organization.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SE_Project_BPartner.java | 8 +- src/org/openbravo/erpCommon/ad_callouts/SE_Trxtype_Transaction.java | 8 +- src/org/openbravo/erpCommon/ad_callouts/SL_GlobalUse_Product.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java | 21 +- src/org/openbravo/erpCommon/ad_callouts/SL_InOut_BPartner.java | 8 +- src/org/openbravo/erpCommon/ad_callouts/SL_Internal_Consumption_Conversion.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Internal_Consumption_Product.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_InvAmtUpd_ProductRefDate.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Product.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_DocType.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Journal_MultiAcctSchema.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_LandedCost_Cost_Type.java | 35 + src/org/openbravo/erpCommon/ad_callouts/SL_Movement_Product.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Order_DocType.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java | 10 +- src/org/openbravo/erpCommon/ad_callouts/SL_Production_Product.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_RefreshSequenceAndLength.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Product.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_SequenceProduct_Product.java | 2 +- src/org/openbravo/erpCommon/ad_forms/About.html | 7 +- src/org/openbravo/erpCommon/ad_forms/About.java | 3 +- src/org/openbravo/erpCommon/ad_forms/About.xml | 3 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 6 +- src/org/openbravo/erpCommon/ad_forms/TranslationManager.java | 2 +- src/org/openbravo/erpCommon/ad_process/ApplyModulesCallServlet.java | 2 +- src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java | 491 +- src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java | 5 +- src/org/openbravo/erpCommon/ad_reports/ReportCashFlow.html | 412 - src/org/openbravo/erpCommon/ad_reports/ReportCashFlow.java | 435 - src/org/openbravo/erpCommon/ad_reports/ReportCashFlow.xml | 58 - src/org/openbravo/erpCommon/ad_reports/ReportCashFlowPopUp.html | 51 - src/org/openbravo/erpCommon/ad_reports/ReportCashFlowPopUp.xml | 40 - src/org/openbravo/erpCommon/ad_reports/ReportCashFlowReload.html | 47 - src/org/openbravo/erpCommon/ad_reports/ReportCashFlowReload.xml | 28 - src/org/openbravo/erpCommon/ad_reports/ReportCashFlow_data.xsql | 279 - src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 42 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql | 27 +- src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoiceJR.java | 5 +- src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoice_data.xsql | 212 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalancePDF.jrxml | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStockExcel.jrxml | 7 +- src/org/openbravo/erpCommon/businessUtility/PriceAdjustment.java | 3 +- src/org/openbravo/erpCommon/businessUtility/WindowTabs.java | 2 +- src/org/openbravo/erpCommon/modules/ImportModule.java | 6 +- src/org/openbravo/erpCommon/modules/ModuleReferenceDataClientTree.java | 2 +- src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree.java | 2 +- src/org/openbravo/erpCommon/modules/ModuleTree.java | 4 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 10 +- src/org/openbravo/erpCommon/obps/CheckCleanCache.java | 2 +- src/org/openbravo/erpCommon/security/Login.html | 2 +- src/org/openbravo/erpCommon/utility/CalculateCoreRevision.java | 61 - src/org/openbravo/erpCommon/utility/GenericTree.java | 2 +- src/org/openbravo/erpCommon/utility/GenericTreeServlet.java | 2 +- src/org/openbravo/erpCommon/utility/JRFieldProviderDataSource.java | 8 +- src/org/openbravo/erpCommon/utility/OBVersion.java | 10 +- src/org/openbravo/erpCommon/utility/OpenPentaho.java | 2 +- src/org/openbravo/erpCommon/utility/ReferencedLink.java | 4 +- src/org/openbravo/erpCommon/utility/SystemInfo.java | 10 +- src/org/openbravo/erpCommon/utility/ToolBar.java | 11 +- src/org/openbravo/erpCommon/utility/Utility.java | 96 +- src/org/openbravo/erpCommon/utility/WindowTree.java | 6 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 10 +- src/org/openbravo/jmx/MBeanRegistry.java | 5 +- src/org/openbravo/materialmgmt/ManageVariantsDS.java | 121 +- src/org/openbravo/service/db/DataExportService.java | 2 - src/org/openbravo/service/importprocess/ImportEntryArchiveManager.java | 55 +- src/org/openbravo/service/importprocess/ImportEntryClusterService.java | 50 + src/org/openbravo/service/importprocess/ImportEntryManager.java | 40 +- src/org/openbravo/service/importprocess/ImportProcessContextListener.java | 13 +- src/org/openbravo/service/importprocess/ImportProcessUtils.java | 4 +- 343 files changed, 137663 insertions(+), 18946 deletions(-) diffs (truncated from 195933 to 300 lines): diff -r 09d1efdbd476 -r a62c74e6424a .hgsigs --- a/.hgsigs Thu Dec 14 16:23:30 2017 +0100 +++ b/.hgsigs Wed Jan 31 10:37:42 2018 +0100 @@ -221,3 +221,5 @@ 391e9626024899e664de6a55c88ee72e3e2d9710 0 iEYEABECAAYFAln77A4ACgkQCX/oGf+2qkOfGACgyr/EcAt6vsNW/zbB1YQ01t3UVtEAoNJJf5xPqkNN1SbNHwLySptoRaDN ff7be0e0ba8762069ad86523828a57139b396d39 0 iEYEABECAAYFAlm/UPkACgkQCX/oGf+2qkM8UQCdGDxGviT6mh8nKnu2HP1qzZzX0cYAoJaBd9WSUNj2Dlh2yjJT+7zYxKcC 54cdd8284122f787eac4b4ab67b4ab4584ddcccb 0 iEYEABECAAYFAln8YP0ACgkQCX/oGf+2qkNbKACgxFsQqRE0goPX4VewSccTQcGZRVEAnitoyHAuUroUJpFUFLztc6pzkUL2 +bbeae307872835b1e84136c537adec44b7a0b3c1 0 iEYEABECAAYFAlpDLAIACgkQCX/oGf+2qkNiugCgj1TTu2BeYoAqAqD08Gci3lHJvogAnAvmNL987nIAckknQ1CosIUDmA+K +43d95f7cb67084eb978752359847ab28b9aa14f6 0 iEYEABECAAYFAlpEpSMACgkQCX/oGf+2qkNdMACdGNGo6rpHht3lNH3FmwtsNcIe65sAn1sM9rBx/Sm3ytwcL2C5irUyD05J diff -r 09d1efdbd476 -r a62c74e6424a .hgtags --- a/.hgtags Thu Dec 14 16:23:30 2017 +0100 +++ b/.hgtags Wed Jan 31 10:37:42 2018 +0100 @@ -232,3 +232,5 @@ 688697b19d3692d75972558eaf9fc5eccd145a61 3.0PR17Q2.4 a8925ad2d61f4625aa62c1ee31babecaa73b787f 3.0PR17Q3 452e6c576f1db52e686cf3138099790e242e7927 3.0PR17Q3.1 +f500d43a59bb69265a7aa704a9fd20bffd68c8a9 3.0PR17Q3.2 +a8b6912d30a34e4a7d0873fc0fe53df228417b49 3.0PR17Q4 diff -r 09d1efdbd476 -r a62c74e6424a modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Thu Dec 14 16:23:30 2017 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Wed Jan 31 10:37:42 2018 +0100 @@ -21,11 +21,9 @@ * Contributor(s): ______________________________________. ************************************************************************/ -p_message VARCHAR(2000); p_record_id VARCHAR(60); p_docAction VARCHAR(60); p_user VARCHAR(60); -p_result NUMBER; v_ResultStr VARCHAR2(2000):=''; v_GrandTotal NUMBER:=0; @@ -57,10 +55,6 @@ p_record_id := cur_params.p_string; ELSIF (cur_params.parametername LIKE 'User') THEN p_user := cur_params.p_string; - ELSIF (cur_params.parametername LIKE 'Message') THEN - p_message := cur_params.p_text; - ELSIF (cur_params.parametername LIKE 'Result') THEN - p_result := cur_params.p_number; END IF; END LOOP; diff -r 09d1efdbd476 -r a62c74e6424a modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml Thu Dec 14 16:23:30 2017 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml Wed Jan 31 10:37:42 2018 +0100 @@ -26,8 +26,6 @@ p_GLItem VARCHAR2(32); p_Amount NUMBER; p_IsReceipt CHAR(1); -p_message VARCHAR(2000); -p_result NUMBER; v_TaxPaymentName VARCHAR2(60); v_FinancialAccountName VARCHAR2(60); @@ -77,10 +75,6 @@ p_amount := cur_params.p_number; ELSIF (cur_params.parametername LIKE 'IsReceipt') THEN p_isReceipt := cur_params.p_string; - ELSIF (cur_params.parametername LIKE 'Message') THEN - p_message := cur_params.p_text; - ELSIF (cur_params.parametername LIKE 'Result') THEN - p_result := cur_params.p_number; END IF; END LOOP; diff -r 09d1efdbd476 -r a62c74e6424a modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Dec 14 16:23:30 2017 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Jan 31 10:37:42 2018 +0100 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.32838]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.33164]]></VERSION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements. If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP> diff -r 09d1efdbd476 -r a62c74e6424a modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Dec 14 16:23:30 2017 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jan 31 10:37:42 2018 +0100 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.32838]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.33164]]></STARTVERSION> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B97FC854C6DD41E692161585645A900F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B97FC854C6DD41E692161585645A900F--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.32838]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.33164]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 09d1efdbd476 -r a62c74e6424a modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js --- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js Thu Dec 14 16:23:30 2017 +0100 +++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js Wed Jan 31 10:37:42 2018 +0100 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2014-2016 Openbravo SLU + * All portions are Copyright (C) 2014-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -1024,6 +1024,13 @@ thisform = form; thisview = view; params.context = form.paramWindow.getContextInfo(); + // Before sending the context, the grids with the information about orders and invoices, + // gl items and credit used are removed from it. + // This data is not used for calculating the display or read only logic of the rest of the parameters + // and sending the grid can have an impact in the performance of this process. + delete params.context.order_invoice; + delete params.context.credit_to_use; + delete params.context.glitem; if (form.paramWindow.parentWindow && form.paramWindow.parentWindow.windowId) { params.context.inpwindowId = form.paramWindow.parentWindow.windowId; } diff -r 09d1efdbd476 -r a62c74e6424a modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Thu Dec 14 16:23:30 2017 +0100 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Wed Jan 31 10:37:42 2018 +0100 @@ -6,7 +6,7 @@ <!--8A098711BB324335A19833286BDB093D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--8A098711BB324335A19833286BDB093D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8A098711BB324335A19833286BDB093D--> <NAME><![CDATA[Apache External Connection Pool]]></NAME> -<!--8A098711BB324335A19833286BDB093D--> <VERSION><![CDATA[1.0.32838]]></VERSION> +<!--8A098711BB324335A19833286BDB093D--> <VERSION><![CDATA[1.0.33164]]></VERSION> <!--8A098711BB324335A19833286BDB093D--> <DESCRIPTION><![CDATA[Apache External Connection Pool]]></DESCRIPTION> <!--8A098711BB324335A19833286BDB093D--> <HELP><![CDATA[This module implements the Apache JDBC Connection Pool (http://wiki.openbravo.com/wiki/Modules:Apache_JDBC_Connection_Pool).]]></HELP> <!--8A098711BB324335A19833286BDB093D--> <TYPE><![CDATA[M]]></TYPE> diff -r 09d1efdbd476 -r a62c74e6424a modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Dec 14 16:23:30 2017 +0100 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jan 31 10:37:42 2018 +0100 @@ -7,7 +7,7 @@ <!--1467C397BC5F4999A5606F39CD6FF8A4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <AD_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_MODULE_ID> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID> -<!--1467C397BC5F4999A5606F39CD6FF8A4--> <STARTVERSION><![CDATA[2.1.32838]]></STARTVERSION> +<!--1467C397BC5F4999A5606F39CD6FF8A4--> <STARTVERSION><![CDATA[2.1.33164]]></STARTVERSION> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 09d1efdbd476 -r a62c74e6424a modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Thu Dec 14 16:23:30 2017 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Wed Jan 31 10:37:42 2018 +0100 @@ -6,7 +6,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.32838]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.33164]]></VERSION> <!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION> <!--C70732EA90A14EC0916078B85CC33D2D--> <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP> <!--C70732EA90A14EC0916078B85CC33D2D--> <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL> diff -r 09d1efdbd476 -r a62c74e6424a modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Dec 14 16:23:30 2017 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jan 31 10:37:42 2018 +0100 @@ -7,7 +7,7 @@ <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.32838]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.33164]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 09d1efdbd476 -r a62c74e6424a modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Thu Dec 14 16:23:30 2017 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Wed Jan 31 10:37:42 2018 +0100 @@ -6,7 +6,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface Application]]></NAME> -<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.32838]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.33164]]></VERSION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL> diff -r 09d1efdbd476 -r a62c74e6424a modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Dec 14 16:23:30 2017 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jan 31 10:37:42 2018 +0100 @@ -7,7 +7,7 @@ <!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID> -<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.32838]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.33164]]></STARTVERSION> <!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--60A170212F36499D83B8AD38D01F46B3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID> -<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.32838]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.33164]]></STARTVERSION> <!--60A170212F36499D83B8AD38D01F46B3--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -35,7 +35,7 @@ <!--824D60CB352E4099B1D8C903CA139DAE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.32838]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.33164]]></STARTVERSION> <!--824D60CB352E4099B1D8C903CA139DAE--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -49,7 +49,7 @@ <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID> -<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.32838]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.33164]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 09d1efdbd476 -r a62c74e6424a modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java Thu Dec 14 16:23:30 2017 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java Wed Jan 31 10:37:42 2018 +0100 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2010-2015 Openbravo SLU + * All portions are Copyright (C) 2010-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -24,8 +24,6 @@ import java.util.HashMap; import java.util.Map; -import javax.script.ScriptEngine; -import javax.script.ScriptEngineManager; import javax.script.ScriptException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; @@ -34,6 +32,7 @@ import org.apache.log4j.Logger; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; +import org.openbravo.base.expression.OBScriptEngine; import org.openbravo.base.model.Entity; import org.openbravo.base.model.ModelProvider; import org.openbravo.base.model.domaintype.BasePrimitiveDomainType; @@ -59,6 +58,7 @@ * @author iperdomo */ public class ParameterUtils { + private static Logger log = Logger.getLogger(ParameterUtils.class); public static void setParameterValue(ParameterValue parameterValue, JSONObject requestValue) { @@ -269,16 +269,15 @@ @SuppressWarnings("rawtypes") public static Object getJSExpressionResult(Map<String, String> parameters, HttpSession session, String expression) throws ScriptException { - final ScriptEngineManager manager = new ScriptEngineManager(); - final ScriptEngine engine = manager.getEngineByName("js"); + Map<String, Object> bindings = new HashMap<>(); if (session != null) { - engine.put("OB", new OBBindings(OBContext.getOBContext(), parameters, session)); + bindings.put("OB", new OBBindings(OBContext.getOBContext(), parameters, session)); } else { - engine.put("OB", new OBBindings(OBContext.getOBContext(), parameters)); + bindings.put("OB", new OBBindings(OBContext.getOBContext(), parameters)); } - Object result = engine.eval(expression); + Object result = OBScriptEngine.getInstance().eval(expression, bindings); if (result instanceof Map) { // complex js object, convert it into a JSON result = new JSONObject((Map) result); diff -r 09d1efdbd476 -r a62c74e6424a modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java Thu Dec 14 16:23:30 2017 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java Wed Jan 31 10:37:42 2018 +0100 @@ -112,8 +112,8 @@ */ public static final String PDF_JAVASCRIPT = "PDF Javascript"; - private static final double TEXT_CHAR_HEIGHT = 10; - private static final double TEXT_CHAR_WIDTH = 10; + private static final float TEXT_CHAR_HEIGHT = 10; + private static final float TEXT_CHAR_WIDTH = 10; private static final Logger log = LoggerFactory.getLogger(ReportingUtils.class); /** @@ -752,8 +752,8 @@ textExporter.setConfiguration(textExporterConfiguration); // Default item text configuration that can be overridden in the .jrxml template itself ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
