details: https://code.openbravo.com/erp/devel/pi/rev/dae6fd3d154a
changeset: 17782:dae6fd3d154a
user: Naiara Martinez <naiara.martinez <at> openbravo.com>
date: Fri Aug 24 10:21:30 2012 +0200
summary: fixed bug 21334 Initial Client Setup:Improve error message when no
source.path is defined
diffstat:
src-db/database/sourcedata/AD_MESSAGE.xml | 11
++++++++++
src/org/openbravo/erpCommon/businessUtility/InitialClientSetup.java | 4 +++
src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 4 +++
3 files changed, 19 insertions(+), 0 deletions(-)
diffs (63 lines):
diff -r 2971a8c0024c -r dae6fd3d154a src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Tue Aug 28 10:50:23 2012 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Fri Aug 24 10:21:30 2012 +0200
@@ -20217,6 +20217,17 @@
<!--D6F0D703B42242109E932570B7C61765-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--D6F0D703B42242109E932570B7C61765--></AD_MESSAGE>
+<!--D708B222B042402398CD850C87B8E453--><AD_MESSAGE>
+<!--D708B222B042402398CD850C87B8E453-->
<AD_MESSAGE_ID><![CDATA[D708B222B042402398CD850C87B8E453]]></AD_MESSAGE_ID>
+<!--D708B222B042402398CD850C87B8E453-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D708B222B042402398CD850C87B8E453--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D708B222B042402398CD850C87B8E453--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D708B222B042402398CD850C87B8E453-->
<VALUE><![CDATA[NoSourcePath]]></VALUE>
+<!--D708B222B042402398CD850C87B8E453--> <MSGTEXT><![CDATA[Source path not
defined in Openbravo.properties]]></MSGTEXT>
+<!--D708B222B042402398CD850C87B8E453--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--D708B222B042402398CD850C87B8E453-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D708B222B042402398CD850C87B8E453--></AD_MESSAGE>
+
<!--D72FBA25557F4E0D851E1002D9DA61A9--><AD_MESSAGE>
<!--D72FBA25557F4E0D851E1002D9DA61A9-->
<AD_MESSAGE_ID><![CDATA[D72FBA25557F4E0D851E1002D9DA61A9]]></AD_MESSAGE_ID>
<!--D72FBA25557F4E0D851E1002D9DA61A9-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 2971a8c0024c -r dae6fd3d154a
src/org/openbravo/erpCommon/businessUtility/InitialClientSetup.java
--- a/src/org/openbravo/erpCommon/businessUtility/InitialClientSetup.java
Tue Aug 28 10:50:23 2012 +0200
+++ b/src/org/openbravo/erpCommon/businessUtility/InitialClientSetup.java
Fri Aug 24 10:21:30 2012 +0200
@@ -27,6 +27,7 @@
import org.apache.commons.fileupload.FileItem;
import org.apache.log4j.Logger;
+import org.openbravo.base.exception.OBException;
import org.openbravo.base.secureApp.VariablesSecureApp;
import org.openbravo.base.structure.BaseOBObject;
import org.openbravo.dal.service.OBDal;
@@ -664,6 +665,9 @@
ImportResult iResult;
try {
iResult = InitialSetupUtility.insertReferenceData(dataSet, client,
null);
+ } catch (OBException e) {
+ return logErrorAndRollback(e.getMessage(),
+ "Exception ocurred while getting source.path from
Openbravo.properties", e);
} catch (Exception e) {
return logErrorAndRollback("@CreateReferenceDataFailed@",
"insertReferenceDataModules() - Exception ocurred while
obtaining datasets for module "
diff -r 2971a8c0024c -r dae6fd3d154a
src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java
--- a/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java
Tue Aug 28 10:50:23 2012 +0200
+++ b/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java
Fri Aug 24 10:21:30 2012 +0200
@@ -29,6 +29,7 @@
import org.apache.log4j.Logger;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
+import org.openbravo.base.exception.OBException;
import org.openbravo.base.provider.OBProvider;
import org.openbravo.base.session.OBPropertiesProvider;
import org.openbravo.dal.core.OBContext;
@@ -1491,6 +1492,9 @@
ImportResult myResult = null;
String strSourcePath =
OBPropertiesProvider.getInstance().getOpenbravoProperties()
.getProperty("source.path");
+ if (strSourcePath == null || strSourcePath.equals("")) {
+ throw new OBException("@NoSourcePath@");
+ }
String strPath = "";
File datasetFile;
OBContext.setAdminMode();
------------------------------------------------------------------------------
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
