details: /erp/devel/pi/rev/a1114c73bf8c
changeset: 6699:a1114c73bf8c
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Mar 12 19:07:36 2010 +0100
summary: Fixed issue 12541. Removed the specialized check for templates (the
general one should apply both to modules and templates). Replaced the error
with a warning (it should still be possible to package a module/template which
doesn't depend on Core)
details: /erp/devel/pi/rev/ab9028f35725
changeset: 6700:ab9028f35725
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Mar 12 19:10:16 2010 +0100
summary: Related to issue 12541. Changed type of the generated warning
diffstat:
src/org/openbravo/service/system/ModuleValidator.java | 18 +----------
src/org/openbravo/service/system/SystemValidationResult.java | 2 +-
2 files changed, 3 insertions(+), 17 deletions(-)
diffs (54 lines):
diff -r 0d511b2d743e -r ab9028f35725
src/org/openbravo/service/system/ModuleValidator.java
--- a/src/org/openbravo/service/system/ModuleValidator.java Fri Mar 12
17:22:00 2010 +0100
+++ b/src/org/openbravo/service/system/ModuleValidator.java Fri Mar 12
19:10:16 2010 +0100
@@ -114,20 +114,6 @@
+ " are not set, before exporting these " + "fields should be
set");
}
- // industry template
- if (module.getType().equals("T")) {
- boolean found = false;
- for (ModuleDependency md : module.getModuleDependencyList()) {
- if (md.getDependentModule().getId().equals("0") && !md.isIncluded()) {
- found = true;
- break;
- }
- }
- if (!found) {
- result.addError(SystemValidationType.MODULE_ERROR, "Module " +
module.getName()
- + " is an Industry Template must depend on Core");
- }
- }
}
private void checkJavaPath(Module module, File moduleDir, String javaPackage,
@@ -301,7 +287,7 @@
}
}
if (!coreModuleFound) {
- result.addError(SystemValidationType.MODULE_ERROR, "Module " +
module.getName()
+ result.addWarning(SystemValidationType.MODULE_ERROR, "Module " +
module.getName()
+ " or any of its ancestors " + "does not depend on the Core
module.");
}
@@ -330,7 +316,7 @@
for (org.openbravo.model.ad.module.DataPackage pckg :
module.getDataPackageList()) {
if (pckg.getJavaPackage() != null
&& !pckg.getJavaPackage().startsWith(module.getJavaPackage())) {
- result.addError(SystemValidationType.MODULE_ERROR, "Data package " +
pckg.getName()
+ result.addError(SystemValidationType.DEPENDENCY_PROBLEM, "Data package
" + pckg.getName()
+ " has a java package which is not within the java package of its
module "
+ module.getName());
}
diff -r 0d511b2d743e -r ab9028f35725
src/org/openbravo/service/system/SystemValidationResult.java
--- a/src/org/openbravo/service/system/SystemValidationResult.java Fri Mar
12 17:22:00 2010 +0100
+++ b/src/org/openbravo/service/system/SystemValidationResult.java Fri Mar
12 19:10:16 2010 +0100
@@ -32,7 +32,7 @@
public class SystemValidationResult {
public enum SystemValidationType {
- NAME_TOO_LONG, MODULE_ERROR, CUSTOMIZATION_ID, INCORRECT_DEFAULT_VALUE,
WRONG_NAME, WRONG_LENGTH, NO_PRIMARY_KEY_COLUMNS,
NOT_NULL_IN_DB_NOT_MANDATORY_IN_AD, MANDATORY_IN_AD_NULLABLE_IN_DB,
NOT_EXIST_IN_AD, NOT_EXIST_IN_DB, NOT_PART_OF_FOREIGN_KEY, WRONG_TYPE,
INCORRECT_CLIENT_ORG_PROPERTY_NAME, UNEQUAL_DEFAULTVALUE, INCORRECT_PK_NAME,
INCORRECT_FK_NAME, INCORRECT_CHECK_NAME, INCORRECT_UNIQUE_NAME,
INCORRECT_INDEX_NAME, INCORRECT_NAME_LENGTH, INCORRECT_DATASET_NAME;
+ NAME_TOO_LONG, MODULE_ERROR, CUSTOMIZATION_ID, INCORRECT_DEFAULT_VALUE,
WRONG_NAME, WRONG_LENGTH, NO_PRIMARY_KEY_COLUMNS,
NOT_NULL_IN_DB_NOT_MANDATORY_IN_AD, MANDATORY_IN_AD_NULLABLE_IN_DB,
NOT_EXIST_IN_AD, NOT_EXIST_IN_DB, NOT_PART_OF_FOREIGN_KEY, WRONG_TYPE,
INCORRECT_CLIENT_ORG_PROPERTY_NAME, UNEQUAL_DEFAULTVALUE, INCORRECT_PK_NAME,
INCORRECT_FK_NAME, INCORRECT_CHECK_NAME, INCORRECT_UNIQUE_NAME,
INCORRECT_INDEX_NAME, INCORRECT_NAME_LENGTH, INCORRECT_DATASET_NAME,
DEPENDENCY_PROBLEM;
public String getName() {
return this.getClass().getSimpleName();
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
