details: /erp/devel/main/rev/06ae83c94835
changeset: 8224:06ae83c94835
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Aug 17 15:52:31 2010 +0200
summary: related to issue 13886: Added missing isInternetAvailable for
activating instance
details: /erp/devel/main/rev/8c5d6ea5b127
changeset: 8225:8c5d6ea5b127
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Aug 18 05:35:59 2010 +0200
summary: CI: promote changesets from pi to main
details: /erp/devel/main/rev/b3c35300e02d
changeset: 8226:b3c35300e02d
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Aug 18 05:36:00 2010 +0200
summary: CI: update AD_MODULE - Core version and label
diffstat:
src-db/database/sourcedata/AD_MODULE.xml | 4 ++--
src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java | 5 +++++
src/org/openbravo/erpCommon/utility/HttpsUtils.java | 1 -
3 files changed, 7 insertions(+), 3 deletions(-)
diffs (47 lines):
diff -r e1e3c5b69de3 -r b3c35300e02d src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Tue Aug 17 14:49:38 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml Wed Aug 18 05:36:00 2010 +0200
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.17989]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.18225]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
@@ -22,7 +22,7 @@
<!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
<!--0--> <REFERENCEDATAINFO><![CDATA[Standard document types for orders,
invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0--></AD_MODULE>
diff -r e1e3c5b69de3 -r b3c35300e02d
src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java
--- a/src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java Tue Aug
17 14:49:38 2010 +0200
+++ b/src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java Wed Aug
18 05:36:00 2010 +0200
@@ -48,6 +48,11 @@
bundle.setResult(msg);
+ if (!HttpsUtils.isInternetAvailable()) {
+ msg.setType("Error");
+ msg.setMessage("@WSError@");
+ }
+
String[] result = send(publicKey, purpose, instanceNo, activate);
if (result.length == 2 && result[0] != null && result[1] != null
diff -r e1e3c5b69de3 -r b3c35300e02d
src/org/openbravo/erpCommon/utility/HttpsUtils.java
--- a/src/org/openbravo/erpCommon/utility/HttpsUtils.java Tue Aug 17
14:49:38 2010 +0200
+++ b/src/org/openbravo/erpCommon/utility/HttpsUtils.java Wed Aug 18
05:36:00 2010 +0200
@@ -399,7 +399,6 @@
host = proxyHost;
port = proxyPort;
}
- host = "localhost2";
System.getProperties().put("proxySet", "true");
System.getProperties().put("http.proxyHost", host);
System.getProperties().put("https.proxyHost", host);
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
