details: http://code.openbravo.com/erp/devel/cr2/rev/b7cb90f69165
changeset: 4603:b7cb90f69165
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Aug 13 15:06:01 2009 +0200
summary: [cr2] proper message management
diffstat:
src-db/database/sourcedata/AD_MESSAGE.xml | 33 ++++++++++++++++
src/org/openbravo/erpCommon/modules/ImportModule.java | 12 ++++-
src/org/openbravo/erpCommon/modules/ModuleUtiltiy.java | 22 ++++++++--
3 files changed, 59 insertions(+), 8 deletions(-)
diffs (158 lines):
diff -r 0d12f5cbecd6 -r b7cb90f69165 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Tue Aug 11 15:55:32 2009 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Thu Aug 13 15:06:01 2009 +0200
@@ -63281,6 +63281,17 @@
<!--0EABAB89726A4A3C800199142CF8E17F-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--0EABAB89726A4A3C800199142CF8E17F--></AD_MESSAGE>
+<!--10E779E8F227496B86B3136A09EB6043--><AD_MESSAGE>
+<!--10E779E8F227496B86B3136A09EB6043-->
<AD_MESSAGE_ID><![CDATA[10E779E8F227496B86B3136A09EB6043]]></AD_MESSAGE_ID>
+<!--10E779E8F227496B86B3136A09EB6043-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--10E779E8F227496B86B3136A09EB6043--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--10E779E8F227496B86B3136A09EB6043--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--10E779E8F227496B86B3136A09EB6043-->
<VALUE><![CDATA[CR_OBXGetNotAuthorized]]></VALUE>
+<!--10E779E8F227496B86B3136A09EB6043--> <MSGTEXT><![CDATA[This instance has
not a license for this commercial module.]]></MSGTEXT>
+<!--10E779E8F227496B86B3136A09EB6043--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--10E779E8F227496B86B3136A09EB6043-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--10E779E8F227496B86B3136A09EB6043--></AD_MESSAGE>
+
<!--11314163807C4401B2964F93256597EA--><AD_MESSAGE>
<!--11314163807C4401B2964F93256597EA-->
<AD_MESSAGE_ID><![CDATA[11314163807C4401B2964F93256597EA]]></AD_MESSAGE_ID>
<!--11314163807C4401B2964F93256597EA-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -63525,6 +63536,17 @@
<!--2E175A7785AD4313B24D3E9034B05BAD-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--2E175A7785AD4313B24D3E9034B05BAD--></AD_MESSAGE>
+<!--2E658610941946F58CA77F17F6095E89--><AD_MESSAGE>
+<!--2E658610941946F58CA77F17F6095E89-->
<AD_MESSAGE_ID><![CDATA[2E658610941946F58CA77F17F6095E89]]></AD_MESSAGE_ID>
+<!--2E658610941946F58CA77F17F6095E89-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2E658610941946F58CA77F17F6095E89--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2E658610941946F58CA77F17F6095E89--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2E658610941946F58CA77F17F6095E89-->
<VALUE><![CDATA[ErrorDownloadingOBX]]></VALUE>
+<!--2E658610941946F58CA77F17F6095E89--> <MSGTEXT><![CDATA[An error occurred
when downloading the OBX file.]]></MSGTEXT>
+<!--2E658610941946F58CA77F17F6095E89--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--2E658610941946F58CA77F17F6095E89-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2E658610941946F58CA77F17F6095E89--></AD_MESSAGE>
+
<!--2EB6F2EE079E41C3A9E416768353105F--><AD_MESSAGE>
<!--2EB6F2EE079E41C3A9E416768353105F-->
<AD_MESSAGE_ID><![CDATA[2EB6F2EE079E41C3A9E416768353105F]]></AD_MESSAGE_ID>
<!--2EB6F2EE079E41C3A9E416768353105F-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -64532,6 +64554,17 @@
<!--BDBAEDC585EA4D06BACC9E2469003E4F-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--BDBAEDC585EA4D06BACC9E2469003E4F--></AD_MESSAGE>
+<!--BF73CD95240B43239E7C8F7BD83E03D5--><AD_MESSAGE>
+<!--BF73CD95240B43239E7C8F7BD83E03D5-->
<AD_MESSAGE_ID><![CDATA[BF73CD95240B43239E7C8F7BD83E03D5]]></AD_MESSAGE_ID>
+<!--BF73CD95240B43239E7C8F7BD83E03D5-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BF73CD95240B43239E7C8F7BD83E03D5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BF73CD95240B43239E7C8F7BD83E03D5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BF73CD95240B43239E7C8F7BD83E03D5-->
<VALUE><![CDATA[NotCommercialModulesAllowed]]></VALUE>
+<!--BF73CD95240B43239E7C8F7BD83E03D5--> <MSGTEXT><![CDATA[Commercial modules
installation is not allowed in a Community Edition Instance.]]></MSGTEXT>
+<!--BF73CD95240B43239E7C8F7BD83E03D5--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--BF73CD95240B43239E7C8F7BD83E03D5-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BF73CD95240B43239E7C8F7BD83E03D5--></AD_MESSAGE>
+
<!--BFB1B3D4C3994CD78DA498EF0DC1E00C--><AD_MESSAGE>
<!--BFB1B3D4C3994CD78DA498EF0DC1E00C-->
<AD_MESSAGE_ID><![CDATA[BFB1B3D4C3994CD78DA498EF0DC1E00C]]></AD_MESSAGE_ID>
<!--BFB1B3D4C3994CD78DA498EF0DC1E00C-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 0d12f5cbecd6 -r b7cb90f69165
src/org/openbravo/erpCommon/modules/ImportModule.java
--- a/src/org/openbravo/erpCommon/modules/ImportModule.java Tue Aug 11
15:55:32 2009 +0200
+++ b/src/org/openbravo/erpCommon/modules/ImportModule.java Thu Aug 13
15:06:01 2009 +0200
@@ -538,7 +538,7 @@
*/
public OBError getOBError(ConnectionProvider conn) {
if (log.length() != 0) {
- final String lang = vars.getLanguage();
+
final OBError rt = new OBError();
switch (logLevel) {
case MSG_ERROR:
@@ -551,9 +551,15 @@
rt.setType("Success");
break;
}
- rt.setMessage(Utility.parseTranslation(conn, vars, lang,
log.toString()));
- rt.setTitle(Utility.messageBD(conn, rt.getType(), lang));
+ if (vars != null) {
+ final String lang = vars.getLanguage();
+ rt.setMessage(Utility.parseTranslation(conn, vars, lang,
log.toString()));
+ rt.setTitle(Utility.messageBD(conn, rt.getType(), lang));
+ } else {
+ rt.setMessage(log.toString());
+ rt.setTitle(rt.getType());
+ }
return rt;
} else
return null;
diff -r 0d12f5cbecd6 -r b7cb90f69165
src/org/openbravo/erpCommon/modules/ModuleUtiltiy.java
--- a/src/org/openbravo/erpCommon/modules/ModuleUtiltiy.java Tue Aug 11
15:55:32 2009 +0200
+++ b/src/org/openbravo/erpCommon/modules/ModuleUtiltiy.java Thu Aug 13
15:06:01 2009 +0200
@@ -23,11 +23,13 @@
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
+import java.rmi.RemoteException;
import java.util.ArrayList;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
+import org.apache.axis.AxisFault;
import org.apache.log4j.Logger;
import org.openbravo.data.FieldProvider;
import org.openbravo.database.ConnectionProvider;
@@ -157,11 +159,10 @@
WebServiceImpl ws = null;
String strUrl = "";
boolean isCommercial;
+
try {
loc = new WebServiceImplServiceLocator();
ws = loc.getWebService();
- isCommercial = ws.isCommercial(moduleVersionID);
- strUrl = ws.getURLforDownload(moduleVersionID);
} catch (final Exception e) {
e.printStackTrace();
im.addLog("@CouldntConnectToWS@", ImportModule.MSG_ERROR);
@@ -174,6 +175,17 @@
return null;
}
+ try {
+ isCommercial = ws.isCommercial(moduleVersionID);
+ strUrl = ws.getURLforDownload(moduleVersionID);
+ } catch (AxisFault e1) {
+ im.addLog("@" + e1.getFaultCode() + "@", ImportModule.MSG_ERROR);
+ return null;
+ } catch (RemoteException e) {
+ im.addLog(e.getMessage(), ImportModule.MSG_ERROR);
+ return null;
+ }
+
if (isCommercial && !ActivationKey.isActiveInstance()) {
im.addLog("@NotCommercialModulesAllowed@", ImportModule.MSG_ERROR);
return null;
@@ -185,7 +197,7 @@
if (strUrl.startsWith("https://";)) {
ActivationKey ak = new ActivationKey();
- String instanceKey = "instanceKey=" +
URLEncoder.encode(ak.getPublicKey(), "utf-8");
+ String instanceKey = "obinstance=" +
URLEncoder.encode(ak.getPublicKey(), "utf-8");
conn = HttpsUtils.sendHttpsRequest(url, instanceKey, "localhost-1",
"changeit");
} else {
conn = (HttpURLConnection) url.openConnection();
@@ -204,11 +216,11 @@
}
// There is an error, let's check for a parseable message
- String msg = conn.getHeaderField("message");
+ String msg = conn.getHeaderField("OB-ErrMessage");
if (msg != null) {
im.addLog(msg, ImportModule.MSG_ERROR);
} else {
- im.addLog("@ErrorReadingOBX@ " + conn.getResponseCode(),
ImportModule.MSG_ERROR);
+ im.addLog("@ErrorDownloadingOBX@ " + conn.getResponseCode(),
ImportModule.MSG_ERROR);
}
} catch (Exception e) {
im.addLog("@ErrorDownloadingOBX@ " + e.getMessage(),
ImportModule.MSG_ERROR);
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
