details: https://code.openbravo.com/erp/devel/main/rev/8f4ddfda1b96 changeset: 16638:8f4ddfda1b96 user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri May 25 12:06:20 2012 +0200 summary: CI: merge back from main
details: https://code.openbravo.com/erp/devel/main/rev/36d2a9f0cdc0 changeset: 16639:36d2a9f0cdc0 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Fri May 25 13:40:50 2012 +0200 summary: Fixes issue 20599: Backout of changeset 95209e7e8c53. details: https://code.openbravo.com/erp/devel/main/rev/c6737d7dd119 changeset: 16640:c6737d7dd119 user: David Baz Fayos <david.baz <at> openbravo.com> date: Fri May 25 15:04:27 2012 +0200 summary: Fixed issue 20614: Removed hardcoded window title when tab switch details: https://code.openbravo.com/erp/devel/main/rev/886177e54298 changeset: 16641:886177e54298 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu May 17 10:12:41 2012 +0200 summary: [demand] Implemented ant task to allow admins to activate instance from console details: https://code.openbravo.com/erp/devel/main/rev/9f90a57bdd42 changeset: 16642:9f90a57bdd42 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu May 17 13:15:30 2012 +0200 summary: [demand] Reload AK if it was updated using ant details: https://code.openbravo.com/erp/devel/main/rev/d2b867c95baa changeset: 16643:d2b867c95baa user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri May 18 09:39:59 2012 +0200 summary: [demand] Implemented prevention of multiple sessions for same user details: https://code.openbravo.com/erp/devel/main/rev/77979f3f3dc3 changeset: 16644:77979f3f3dc3 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri May 18 11:35:36 2012 +0200 summary: [demand] Implemented on Demand License -On demand licenses cannot have concurrent session of same user -This can also be set for other licenses details: https://code.openbravo.com/erp/devel/main/rev/9a5071c3bbec changeset: 16645:9a5071c3bbec user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 21 08:34:23 2012 +0200 summary: [demand] Limit 2 concurrent users when off platform details: https://code.openbravo.com/erp/devel/main/rev/7e43dec1b3b2 changeset: 16646:7e43dec1b3b2 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 21 12:37:20 2012 +0200 summary: [demand] Managing off platform usage details: https://code.openbravo.com/erp/devel/main/rev/47f8485b5126 changeset: 16647:47f8485b5126 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 21 16:26:25 2012 +0200 summary: [demand] proper redirect on error details: https://code.openbravo.com/erp/devel/main/rev/d208a80ddea3 changeset: 16648:d208a80ddea3 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 21 16:28:10 2012 +0200 summary: [demand] Show messagin in login window if off platform details: https://code.openbravo.com/erp/devel/main/rev/18fe2549adfa changeset: 16649:18fe2549adfa user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 21 16:38:52 2012 +0200 summary: [demand] Updated year in licenses details: https://code.openbravo.com/erp/devel/main/rev/e695e7c45c43 changeset: 16650:e695e7c45c43 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue May 22 10:20:27 2012 +0200 summary: [demand] Proper check of concurrent users + named users details: https://code.openbravo.com/erp/devel/main/rev/c636040cf571 changeset: 16651:c636040cf571 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue May 22 15:02:58 2012 +0200 summary: [demand] Added missing val rule details: https://code.openbravo.com/erp/devel/main/rev/bf4e8307038b changeset: 16652:bf4e8307038b user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue May 22 15:03:47 2012 +0200 summary: [demand] Added missing messages details: https://code.openbravo.com/erp/devel/main/rev/971221eb3540 changeset: 16653:971221eb3540 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu May 24 08:54:18 2012 +0200 summary: [demand] Invalidate session on concurrent named users details: https://code.openbravo.com/erp/devel/main/rev/69cb97f93332 changeset: 16654:69cb97f93332 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu May 24 10:09:11 2012 +0200 summary: [demand] qry for onDemand server details: https://code.openbravo.com/erp/devel/main/rev/911b73b1283d changeset: 16655:911b73b1283d user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu May 24 10:10:14 2012 +0200 summary: [demand] Don't close twice details: https://code.openbravo.com/erp/devel/main/rev/ca5d4c6c84b5 changeset: 16656:ca5d4c6c84b5 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri May 25 10:51:13 2012 +0200 summary: [demand] Improved messages details: https://code.openbravo.com/erp/devel/main/rev/4b8e89dd6675 changeset: 16657:4b8e89dd6675 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri May 25 15:11:45 2012 +0200 summary: Merged new On Demand license type details: https://code.openbravo.com/erp/devel/main/rev/5c264d6210c1 changeset: 16658:5c264d6210c1 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri May 25 15:12:48 2012 +0200 summary: merge details: https://code.openbravo.com/erp/devel/main/rev/42288989cc35 changeset: 16659:42288989cc35 user: RM packaging bot <staff.rm <at> openbravo.com> date: Sat May 26 09:04:00 2012 +0200 summary: CI: update AD_MODULE to version 16658 diffstat: build.xml | 19 +- config/Openbravo.properties.template | 7 +- 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.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_MESSAGE.xml | 11 + 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/HeartBeatPopupActionHandler.java | 4 + modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl | 12 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js | 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/templates/application-js.ftl | 1 + 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.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.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 | 18 +- src-db/database/model/triggers/C_INVOICETAX_TRG2.xml | 4 - src-db/database/sourcedata/AD_MESSAGE.xml | 66 ++ src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_REF_LIST.xml | 24 + src-db/database/sourcedata/AD_VAL_RULE.xml | 11 + src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 5 +- src/org/openbravo/base/secureApp/LoginHandler.java | 36 +- src/org/openbravo/base/session/OBPropertiesProvider.java | 21 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java | 17 +- src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java | 6 +- src/org/openbravo/erpCommon/ad_forms/Role.java | 5 +- src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java | 8 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 321 ++++++++- src/org/openbravo/erpCommon/obps/ActivationTask.java | 150 ++++ src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java | 8 +- src/org/openbravo/erpCommon/obps/DisabledModules.java | 4 +- src/org/openbravo/erpCommon/security/Login.html | 23 +- 66 files changed, 766 insertions(+), 166 deletions(-) diffs (truncated from 2255 to 300 lines): diff -r 5401e185a8b0 -r 42288989cc35 build.xml --- a/build.xml Fri May 25 11:32:22 2012 +0200 +++ b/build.xml Sat May 26 09:04:00 2012 +0200 @@ -1140,6 +1140,23 @@ <ant dir="${base.src.core}" target="clean" inheritAll="true" inheritRefs="true" /> <ant dir="${base.src.trl}" target="clean" inheritAll="true" inheritRefs="true" /> <ant dir="${base.src.wad}" target="clean" inheritAll="true" inheritRefs="true" /> - </target> + </target> + + <target name="activate.instance" depends="init" + description="Activates the instance with the provided public key"> + <taskdef name="activateInstace" classname="org.openbravo.erpCommon.obps.ActivationTask"> + <classpath refid="project.class.path" /> + </taskdef> + <property name="purpose" value="" /> + <property name="publicKey" value="" /> + <property name="publicKeyFile" value="" /> + + <activateInstace purpose="${purpose}" + publicKey="${publicKey}" + publicKeyFile="${publicKeyFile}" + userId="0" + adminMode="true" + propertiesFile="${base.config}/Openbravo.properties"/> + </target> </project> diff -r 5401e185a8b0 -r 42288989cc35 config/Openbravo.properties.template --- a/config/Openbravo.properties.template Fri May 25 11:32:22 2012 +0200 +++ b/config/Openbravo.properties.template Sat May 26 09:04:00 2012 +0200 @@ -10,7 +10,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) 2007-2010 Openbravo SLU +# * All portions are Copyright (C) 2007-2012 Openbravo SLU # * All Rights Reserved. # * Contributor(s): ______________________________________. # ************************************************************************ @@ -184,6 +184,9 @@ login.trial.delay.max=0 login.trial.user.lock=0 +# Prevents concurrent sessions for same user. +login.limit.user.session=false + ########## # Others # ########## @@ -195,4 +198,4 @@ # Specifies if the current instance is used for automated tests. # Setting this to true will enable extra (hidden) functionality used # automated test scripts. -test.environment=false \ No newline at end of file +test.environment=false diff -r 5401e185a8b0 -r 42288989cc35 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri May 25 11:32:22 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Sat May 26 09:04:00 2012 +0200 @@ -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.16636]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.16658]]></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 5401e185a8b0 -r 42288989cc35 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 May 25 11:32:22 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat May 26 09:04:00 2012 +0200 @@ -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.16636]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.16658]]></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.16636]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.16658]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 5401e185a8b0 -r 42288989cc35 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 May 25 11:32:22 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Sat May 26 09:04:00 2012 +0200 @@ -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.16636]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.16658]]></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 5401e185a8b0 -r 42288989cc35 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 May 25 11:32:22 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat May 26 09:04:00 2012 +0200 @@ -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.16636]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.16658]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 5401e185a8b0 -r 42288989cc35 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Fri May 25 11:32:22 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Sat May 26 09:04:00 2012 +0200 @@ -619,6 +619,17 @@ <!--9EFEA3F8412B4F5C836DFB40034156EA--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--9EFEA3F8412B4F5C836DFB40034156EA--></AD_MESSAGE> +<!--A0B273389C804A118EF44AD4E8D97515--><AD_MESSAGE> +<!--A0B273389C804A118EF44AD4E8D97515--> <AD_MESSAGE_ID><![CDATA[A0B273389C804A118EF44AD4E8D97515]]></AD_MESSAGE_ID> +<!--A0B273389C804A118EF44AD4E8D97515--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A0B273389C804A118EF44AD4E8D97515--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A0B273389C804A118EF44AD4E8D97515--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A0B273389C804A118EF44AD4E8D97515--> <VALUE><![CDATA[OBUIAPP_InstanceActivation]]></VALUE> +<!--A0B273389C804A118EF44AD4E8D97515--> <MSGTEXT><![CDATA[Instance Activation]]></MSGTEXT> +<!--A0B273389C804A118EF44AD4E8D97515--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--A0B273389C804A118EF44AD4E8D97515--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--A0B273389C804A118EF44AD4E8D97515--></AD_MESSAGE> + <!--A57B3DD733264DB1BB3D6F84EA104931--><AD_MESSAGE> <!--A57B3DD733264DB1BB3D6F84EA104931--> <AD_MESSAGE_ID><![CDATA[A57B3DD733264DB1BB3D6F84EA104931]]></AD_MESSAGE_ID> <!--A57B3DD733264DB1BB3D6F84EA104931--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 5401e185a8b0 -r 42288989cc35 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 May 25 11:32:22 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Sat May 26 09:04:00 2012 +0200 @@ -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.16636]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.16658]]></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 5401e185a8b0 -r 42288989cc35 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 May 25 11:32:22 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat May 26 09:04:00 2012 +0200 @@ -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.16636]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.16658]]></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.16636]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.16658]]></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.16636]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.16658]]></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.16636]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.16658]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 5401e185a8b0 -r 42288989cc35 modules/org.openbravo.client.application/src/org/openbravo/client/application/HeartBeatPopupActionHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/HeartBeatPopupActionHandler.java Fri May 25 11:32:22 2012 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/HeartBeatPopupActionHandler.java Sat May 26 09:04:00 2012 +0200 @@ -119,6 +119,10 @@ result.put("showAPRM", isUpgrading && !usingAprm); result.put("showExportScripts", isUpgrading && exportConfigScript); result.put("showSuccessUpgrade", isUpgrading && usingAprm && !exportConfigScript); + result + .put( + "showOnDemandOffPlatform", + showHeartBeatOrRegistration == HeartbeatProcess.HeartBeatOrRegistration.OutOfDemandPlatform); result.put("showInstancePurpose", showHeartBeatOrRegistration == HeartbeatProcess.HeartBeatOrRegistration.InstancePurpose); result.put("showHeartbeat", diff -r 5401e185a8b0 -r 42288989cc35 modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java Fri May 25 11:32:22 2012 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java Sat May 26 09:04:00 2012 +0200 @@ -291,7 +291,8 @@ || limitation == LicenseRestriction.NUMBER_OF_CONCURRENT_USERS_REACHED || limitation == LicenseRestriction.MODULE_EXPIRED || limitation == LicenseRestriction.NOT_MATCHED_INSTANCE - || limitation == LicenseRestriction.HB_NOT_ACTIVE) { + || limitation == LicenseRestriction.HB_NOT_ACTIVE + || limitation == LicenseRestriction.ON_DEMAND_OFF_PLATFORM) { return Collections.singletonList(OBDal.getInstance().get(Role.class, "0")); } } diff -r 5401e185a8b0 -r 42288989cc35 modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl Fri May 25 11:32:22 2012 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl Sat May 26 09:04:00 2012 +0200 @@ -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-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -158,6 +158,16 @@ OB.Layout.ClassicOBCompatibility.Popup.openConfigScriptPopup(data.oldConfigScripts); } else if (data.showSuccessUpgrade) { OB.Layout.ClassicOBCompatibility.Popup.openSuccessUpgradePopup(); + } else if (data.showOnDemandOffPlatform) { + OB.Layout.ViewManager.openView('OBClassicWindow', { + command: "DEFAULT", + formId: "8D6282279F464B1696B0EE3E23023B65", + icon: "Form", + id: "/ad_forms/InstanceManagement.html", + obManualURL: "/ad_forms/InstanceManagement.html", + tabTitle: OB.I18N.getLabel('OBUIAPP_InstanceActivation'), + viewId: "OBClassicWindow" + }); } else if (data.showInstancePurpose) { OB.Layout.ClassicOBCompatibility.Popup.openInstancePurpose(); } else if (data.showHeartbeat) { diff -r 5401e185a8b0 -r 42288989cc35 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Fri May 25 11:32:22 2012 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Sat May 26 09:04:00 2012 +0200 @@ -1319,7 +1319,7 @@ // added check on tab as initially it is not set if (this.isRootView && tab) { // update the document title - document.title = 'Openbravo - ' + tab.title; + document.title = OB.Constants.WINTITLE + ' - ' + tab.title; } }, diff -r 5401e185a8b0 -r 42288989cc35 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js Fri May 25 11:32:22 2012 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js Sat May 26 09:04:00 2012 +0200 @@ -71,7 +71,7 @@ } // update the document title - document.title = 'Openbravo - ' + tab.title; + document.title = OB.Constants.WINTITLE + ' - ' + tab.title; }, tabDeselected: function (tabNum, tabPane, ID, tab, newTab) { diff -r 5401e185a8b0 -r 42288989cc35 modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Fri May 25 11:32:22 2012 +0200 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Sat May 26 09:04:00 2012 +0200 @@ -6,7 +6,7 @@ <!--D393BE6F22BB44B7B728259B34FC795A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--D393BE6F22BB44B7B728259B34FC795A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--D393BE6F22BB44B7B728259B34FC795A--> <NAME><![CDATA[HTML Widget]]></NAME> -<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.16636]]></VERSION> +<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.16658]]></VERSION> <!--D393BE6F22BB44B7B728259B34FC795A--> <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION> <!--D393BE6F22BB44B7B728259B34FC795A--> <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP> <!--D393BE6F22BB44B7B728259B34FC795A--> <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL> diff -r 5401e185a8b0 -r 42288989cc35 modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri May 25 11:32:22 2012 +0200 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat May 26 09:04:00 2012 +0200 @@ -7,7 +7,7 @@ <!--DCE798FBC5B648F7A3C81A6941720A57--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--DCE798FBC5B648F7A3C81A6941720A57--> <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID> <!--DCE798FBC5B648F7A3C81A6941720A57--> <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID> -<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.16636]]></STARTVERSION> +<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.16658]]></STARTVERSION> <!--DCE798FBC5B648F7A3C81A6941720A57--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--DCE798FBC5B648F7A3C81A6941720A57--> <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME> <!--DCE798FBC5B648F7A3C81A6941720A57--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 5401e185a8b0 -r 42288989cc35 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml Fri May 25 11:32:22 2012 +0200 +++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml Sat May 26 09:04:00 2012 +0200 @@ -6,7 +6,7 @@ <!--4B828F4D03264080AA1D2057B13F613C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--4B828F4D03264080AA1D2057B13F613C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--4B828F4D03264080AA1D2057B13F613C--> <NAME><![CDATA[User Interface Client Kernel]]></NAME> -<!--4B828F4D03264080AA1D2057B13F613C--> <VERSION><![CDATA[2.1.16636]]></VERSION> +<!--4B828F4D03264080AA1D2057B13F613C--> <VERSION><![CDATA[2.1.16658]]></VERSION> <!--4B828F4D03264080AA1D2057B13F613C--> <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION> ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
