details: https://code.openbravo.com/erp/devel/main/rev/60a2a309d225 changeset: 33662:60a2a309d225 user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Fri Mar 09 08:56:45 2018 +0100 summary: Fixed issue 37942: Removed deprecated code and removing all dep-ann warnings
Instead of adding the @Deprecated annotation, removed since its deprecated for a long time and not used anywhere in the project. details: https://code.openbravo.com/erp/devel/main/rev/d3c8c0cf8e16 changeset: 33663:d3c8c0cf8e16 user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Fri Mar 09 08:57:30 2018 +0100 summary: Related to issue 37942: Removed deprecated code and removing dep-ann warnings Marking code that cannot be removed with the @Deprecated annotation. These methods are being used in modules in the Forge. details: https://code.openbravo.com/erp/devel/main/rev/024449fcae93 changeset: 33664:024449fcae93 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Fri Mar 09 02:23:55 2018 +0530 summary: Fixes Issue 38001: Tax Payment process is not filtering the GL Item account by General Ledger when creating the GL Journal ** Added General Ledger from Tax Payment in where condition to pick account element value id associated with the GL Item details: https://code.openbravo.com/erp/devel/main/rev/75ffdc8078c1 changeset: 33665:75ffdc8078c1 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Mar 09 13:53:24 2018 +0100 summary: related to issue 38041: added testing infrastructure details: https://code.openbravo.com/erp/devel/main/rev/2df79d974a3b changeset: 33666:2df79d974a3b user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Mar 09 14:19:37 2018 +0000 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/aa980425cd68 changeset: 33667:aa980425cd68 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Mar 12 12:42:12 2018 +0100 summary: related to issue 38066: fix typo details: https://code.openbravo.com/erp/devel/main/rev/b87b8a66ba6b changeset: 33668:b87b8a66ba6b user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Mar 12 12:55:00 2018 +0100 summary: related to issue 38066: javadoc improvements details: https://code.openbravo.com/erp/devel/main/rev/f8144ae28d38 changeset: 33669:f8144ae28d38 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Mar 12 14:00:10 2018 +0100 summary: related to issue 38061: add javadoc information details: https://code.openbravo.com/erp/devel/main/rev/447278fc8b1c changeset: 33670:447278fc8b1c user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Mar 12 14:08:21 2018 +0100 summary: related to bug 38061: don't get windowId|ISSOTRX attribute if windowId is null Micro-optimization: if the windowId is null, then do not try to retrieve the windowId|ISSOTRX attribute and return null immediately. details: https://code.openbravo.com/erp/devel/main/rev/ee9c18c5933d changeset: 33671:ee9c18c5933d user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Mar 12 19:16:54 2018 +0100 summary: related to issue 37942: additional cleanup details: https://code.openbravo.com/erp/devel/main/rev/226c41af46d2 changeset: 33672:226c41af46d2 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Mar 09 15:28:54 2018 +0100 summary: fixed bug 38097: DCP.getTransactionConnection in old pool doesn't set db config Connections obtained with DalConnectionProvider.getTransactionConnection in old pool didn't have executed the db config query. details: https://code.openbravo.com/erp/devel/main/rev/d526512e5e96 changeset: 33673:d526512e5e96 user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Fri Mar 09 14:18:48 2018 +0100 summary: Fixed issue 37943: Removed newInstance() deprecation warnings. Class.newInstance() is deprecated from JDK 9. It is replaced by Class.getDeclaredConstructor().newInstance(), but it has the drawback that this call throws an instance of ReflectiveOperationException that must be taken into account. details: https://code.openbravo.com/erp/devel/main/rev/1d3ccc92fab6 changeset: 33674:1d3ccc92fab6 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Mar 13 16:02:12 2018 +0000 summary: CI: update AD_MODULE to version 33673 diffstat: 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/src/org/openbravo/advpaymentmngt/ad_actionbutton/ImportBankFile.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java | 8 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_MatchingTransaction.java | 7 +- 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/MenuManager.java | 9 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java | 17 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java | 5 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java | 26 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 2 +- 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/KernelConstants.java | 11 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinitionController.java | 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.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/DataSourceProperty.java | 4 +- 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.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.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.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 +- src-core/src/org/openbravo/base/HttpBaseServlet.java | 4 +- src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java | 5 +- src-core/src/org/openbravo/database/ExternalConnectionPool.java | 13 +- src-core/src/org/openbravo/modulescript/ModuleScriptHandler.java | 4 +- src-db/database/model/functions/C_TAXPAYMENT_POST.xml | 3 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-test/src/org/openbravo/test/datasource/BaseDataSourceTestDal.java | 19 +- src-test/src/org/openbravo/test/security/UserInfoSessionDataTest.java | 42 +- src-test/src/org/openbravo/test/xml/ClientExportImportTest.java | 217 +--------- src-wad/src/org/openbravo/wad/WadUtility.java | 11 +- src/org/openbravo/authentication/AuthenticationManager.java | 2 +- src/org/openbravo/base/model/ModelProvider.java | 90 +---- src/org/openbravo/base/model/RefList.java | 8 +- src/org/openbravo/base/model/Reference.java | 77 +--- src/org/openbravo/base/provider/OBProvider.java | 4 +- src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 9 +- src/org/openbravo/costing/CostingServer.java | 4 +- src/org/openbravo/dal/core/DalSessionFactory.java | 35 +- src/org/openbravo/dal/core/SessionHandler.java | 12 +- src/org/openbravo/dal/xml/ModelXMLConverter.java | 16 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 11 +- src/org/openbravo/erpCommon/ad_forms/DocAmortization.java | 4 +- src/org/openbravo/erpCommon/ad_forms/DocBank.java | 5 +- src/org/openbravo/erpCommon/ad_forms/DocCash.java | 5 +- src/org/openbravo/erpCommon/ad_forms/DocCostAdjustment.java | 10 +- src/org/openbravo/erpCommon/ad_forms/DocDPManagement.java | 4 +- src/org/openbravo/erpCommon/ad_forms/DocDoubtfulDebt.java | 6 +- src/org/openbravo/erpCommon/ad_forms/DocFINBankStatement.java | 6 +- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 4 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 4 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 6 +- src/org/openbravo/erpCommon/ad_forms/DocGLJournal.java | 4 +- src/org/openbravo/erpCommon/ad_forms/DocInOut.java | 5 +- src/org/openbravo/erpCommon/ad_forms/DocInternalConsumption.java | 4 +- src/org/openbravo/erpCommon/ad_forms/DocInventory.java | 4 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 8 +- src/org/openbravo/erpCommon/ad_forms/DocLCCost.java | 8 +- src/org/openbravo/erpCommon/ad_forms/DocLandedCost.java | 8 +- src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java | 8 +- src/org/openbravo/erpCommon/ad_forms/DocMovement.java | 4 +- src/org/openbravo/erpCommon/ad_forms/DocOrder.java | 5 +- src/org/openbravo/erpCommon/ad_forms/DocPayment.java | 4 +- src/org/openbravo/erpCommon/ad_forms/DocProduction.java | 4 +- src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java | 9 - src/org/openbravo/erpCommon/modules/ImportModule.java | 50 +-- src/org/openbravo/erpCommon/modules/ImportModule_data.xsql | 37 +- src/org/openbravo/erpCommon/modules/VersionUtility.java | 33 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 10 +- src/org/openbravo/erpCommon/security/SessionLogin.java | 9 +- src/org/openbravo/erpCommon/utility/GenericTreeServlet.java | 8 +- src/org/openbravo/erpCommon/utility/HttpsUtils.java | 86 +--- src/org/openbravo/erpCommon/utility/OBMessageUtils.java | 12 +- src/org/openbravo/erpCommon/utility/SequenceIdData.java | 25 +- src/org/openbravo/scheduling/DefaultJob.java | 4 +- src/org/openbravo/scheduling/ProcessBundle.java | 3 +- src/org/openbravo/service/system/SystemService.java | 125 +----- 111 files changed, 329 insertions(+), 1064 deletions(-) diffs (truncated from 3621 to 300 lines): diff -r 3cb50b0b2a6b -r 1d3ccc92fab6 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Mar 09 08:37:05 2018 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Mar 13 16:02:12 2018 +0000 @@ -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.33657]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.33673]]></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 3cb50b0b2a6b -r 1d3ccc92fab6 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 Fri Mar 09 08:37:05 2018 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Mar 13 16:02:12 2018 +0000 @@ -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.33657]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.33673]]></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.33657]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.33673]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 3cb50b0b2a6b -r 1d3ccc92fab6 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ImportBankFile.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ImportBankFile.java Fri Mar 09 08:37:05 2018 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ImportBankFile.java Tue Mar 13 16:02:12 2018 +0000 @@ -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-2011 Openbravo SLU + * All portions are Copyright (C) 2010-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -67,7 +67,8 @@ BankFileFormat bff = OBDal.getInstance().get(BankFileFormat.class, strBankFileFormat); FIN_BankStatementImport bsi = null; try { - bsi = (FIN_BankStatementImport) Class.forName(bff.getJavaClassName()).newInstance(); + bsi = (FIN_BankStatementImport) Class.forName(bff.getJavaClassName()) + .getDeclaredConstructor().newInstance(); } catch (Exception e) { log4j.error("Error while creating new instance for FIN_BankStatementImport - " + e, e); } diff -r 3cb50b0b2a6b -r 1d3ccc92fab6 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java Fri Mar 09 08:37:05 2018 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java Tue Mar 13 16:02:12 2018 +0000 @@ -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-2017 Openbravo SLU + * All portions are Copyright (C) 2010-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -88,14 +88,16 @@ else if ("CONSTANT".equals(parameter.getParameterType())) dao.getNewPaymentRunParameter(paymentRun, parameter, parameter.getDefaultTextValue()); try { - this.paymentExecutionProcess = (FIN_PaymentExecutionProcess) Class.forName( - executionProcess.getJavaClassName()).newInstance(); + this.paymentExecutionProcess = (FIN_PaymentExecutionProcess) Class + .forName(executionProcess.getJavaClassName()).getDeclaredConstructor().newInstance(); } catch (InstantiationException e) { throw new NoExecutionProcessFoundException(e); } catch (IllegalAccessException e) { throw new NoExecutionProcessFoundException(e); } catch (ClassNotFoundException e) { throw new NoExecutionProcessFoundException(e); + } catch (ReflectiveOperationException e) { + throw new NoExecutionProcessFoundException(e); } } diff -r 3cb50b0b2a6b -r 1d3ccc92fab6 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_MatchingTransaction.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_MatchingTransaction.java Fri Mar 09 08:37:05 2018 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_MatchingTransaction.java Tue Mar 13 16:02:12 2018 +0000 @@ -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-2011 Openbravo SLU + * All portions are Copyright (C) 2010-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -33,7 +33,8 @@ public FIN_MatchingTransaction(String _algorithm) throws NoAlgorithmFoundException { try { if (_algorithm != null && !_algorithm.equals("")) - this.algorithm = (FIN_MatchingAlgorithm) Class.forName(_algorithm).newInstance(); + this.algorithm = (FIN_MatchingAlgorithm) Class.forName(_algorithm).getDeclaredConstructor() + .newInstance(); else throw new NoAlgorithmFoundException( "No algorithm has been defined to match bank statement lines"); @@ -43,6 +44,8 @@ throw new NoAlgorithmFoundException(e); } catch (ClassNotFoundException e) { throw new NoAlgorithmFoundException(e); + } catch (ReflectiveOperationException e) { + throw new NoAlgorithmFoundException(e); } } diff -r 3cb50b0b2a6b -r 1d3ccc92fab6 modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Fri Mar 09 08:37:05 2018 +0100 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Tue Mar 13 16:02:12 2018 +0000 @@ -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.33657]]></VERSION> +<!--8A098711BB324335A19833286BDB093D--> <VERSION><![CDATA[1.0.33673]]></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 3cb50b0b2a6b -r 1d3ccc92fab6 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 Fri Mar 09 08:37:05 2018 +0100 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Mar 13 16:02:12 2018 +0000 @@ -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.33657]]></STARTVERSION> +<!--1467C397BC5F4999A5606F39CD6FF8A4--> <STARTVERSION><![CDATA[2.1.33673]]></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 3cb50b0b2a6b -r 1d3ccc92fab6 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 Fri Mar 09 08:37:05 2018 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Tue Mar 13 16:02:12 2018 +0000 @@ -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.33657]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.33673]]></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 3cb50b0b2a6b -r 1d3ccc92fab6 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 Fri Mar 09 08:37:05 2018 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Mar 13 16:02:12 2018 +0000 @@ -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.33657]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.33673]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 3cb50b0b2a6b -r 1d3ccc92fab6 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 Fri Mar 09 08:37:05 2018 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Tue Mar 13 16:02:12 2018 +0000 @@ -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.33657]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.33673]]></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 3cb50b0b2a6b -r 1d3ccc92fab6 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 Fri Mar 09 08:37:05 2018 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Mar 13 16:02:12 2018 +0000 @@ -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.33657]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.33673]]></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.33657]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.33673]]></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.33657]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.33673]]></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.33657]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.33673]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 3cb50b0b2a6b -r 1d3ccc92fab6 modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java Fri Mar 09 08:37:05 2018 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java Tue Mar 13 16:02:12 2018 +0000 @@ -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-2017 Openbravo SLU + * All portions are Copyright (C) 2010-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -483,13 +483,6 @@ return menu; } - /** - * @deprecated Use instead setMenu(Menu menu, String userLanguageId) - */ - public void setMenu(Menu menu) { - setMenu(menu, OBContext.getOBContext().getLanguage().getId()); - } - public void setMenu(Menu menu, String userLanguageId) { this.menu = menu; for (MenuTrl menuTrl : menu.getADMenuTrlList()) { diff -r 3cb50b0b2a6b -r 1d3ccc92fab6 modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java Fri Mar 09 08:37:05 2018 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java Tue Mar 13 16:02:12 2018 +0000 @@ -109,8 +109,8 @@ /** * Checks if is a Sales Order transaction, based on the parameters of the HTTP request * - * @return null if there is no request parameters, or the inpissotrx request parameter is not - * available + * @return null if there is no request parameters, or if both the inpissotrx and inpwindowId + * request parameters are not available */ public Boolean isSalesTransaction() { if (requestMap == null) { @@ -132,16 +132,16 @@ return "Y".equalsIgnoreCase(value) || "true".equalsIgnoreCase(value); } - value = (String) httpSession.getAttribute(getWindowId() + "|ISSOTRX"); - if (value != null) { - return "Y".equalsIgnoreCase(value) || "true".equalsIgnoreCase(value); - } - String windowId = getWindowId(); if (windowId == null) { return null; } + value = (String) httpSession.getAttribute(windowId + "|ISSOTRX"); + if (value != null) { + return "Y".equalsIgnoreCase(value) || "true".equalsIgnoreCase(value); + } + ApplicationDictionaryCachedStructures adcs = WeldUtils .getInstanceFromStaticBeanManager(ApplicationDictionaryCachedStructures.class); @@ -286,7 +286,8 @@ .forName(className)); } catch (IllegalArgumentException e) { // try with OBClassLoader in case package is excluded by Weld - expr = (FilterExpression) OBClassLoader.getInstance().loadClass(className).newInstance(); + expr = (FilterExpression) OBClassLoader.getInstance().loadClass(className) + .getDeclaredConstructor().newInstance(); } return expr.getExpression(requestMap); } catch (Exception e) { diff -r 3cb50b0b2a6b -r 1d3ccc92fab6 modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java Fri Mar 09 08:37:05 2018 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java Tue Mar 13 16:02:12 2018 +0000 @@ -248,7 +248,6 @@ @Override public String getETag() { String etag = super.getETag(); - return etag + "_" + getViewVersionHash(); } @@ -306,14 +305,14 @@ ------------------------------------------------------------------------------ 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 [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
