details: /erp/devel/main/rev/f26df97fe120
changeset: 8385:f26df97fe120
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Sep 13 12:54:01 2010 +0200
summary: fixed bug 14501
License restrictions file is copied to design directory so eclipse
does not delete it when rebuilding.
details: /erp/devel/main/rev/21a760272789
changeset: 8386:21a760272789
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Mon Sep 13 16:48:43 2010 +0530
summary: Fixes issue 14475: There is a '-1' in the field Default Value in
C_BP_bankaccount--> AD_User_ID
Default value -1 has been removed from C_BP_bankaccount--> AD_User_ID.
No impacts
details: /erp/devel/main/rev/f49fef579783
changeset: 8387:f49fef579783
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Mon Sep 13 20:27:46 2010 +0000
summary: CI: promote changesets from pi to main
diffstat:
src-db/database/sourcedata/AD_COLUMN.xml | 1 -
src-db/database/sourcedata/AD_MODULE.xml | 2 +-
src/build.xml | 2 +-
src/org/openbravo/erpCommon/obps/ActivationKey.java | 10 +++++-----
4 files changed, 7 insertions(+), 8 deletions(-)
diffs (69 lines):
diff -r 08a682423cca -r f49fef579783 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Sep 13 09:59:12 2010 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Sep 13 20:27:46 2010 +0000
@@ -86131,7 +86131,6 @@
<!--5224--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
<!--5224--> <AD_VAL_RULE_ID><![CDATA[123]]></AD_VAL_RULE_ID>
<!--5224--> <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
-<!--5224--> <DEFAULTVALUE><![CDATA[-1]]></DEFAULTVALUE>
<!--5224--> <ISKEY><![CDATA[N]]></ISKEY>
<!--5224--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--5224--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
diff -r 08a682423cca -r f49fef579783 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Mon Sep 13 09:59:12 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml Mon Sep 13 20:27:46 2010 +0000
@@ -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.18350]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.18386]]></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>
diff -r 08a682423cca -r f49fef579783 src/build.xml
--- a/src/build.xml Mon Sep 13 09:59:12 2010 +0200
+++ b/src/build.xml Mon Sep 13 20:27:46 2010 +0000
@@ -502,7 +502,7 @@
<copy todir="${build}">
<fileset file="${base.config}/quartz.properties" />
</copy>
- <copy todir="${build}/org/openbravo/erpCommon/obps"
file="${basedir}/org/openbravo/erpCommon/obps/licenseRestrictions"/>
+ <copy todir="${base.design}/design/org/openbravo/erpCommon/obps"
file="${basedir}/org/openbravo/erpCommon/obps/licenseRestrictions"/>
<antcall target="build.local.context" inheritAll="true" inheritrefs="true"
/>
</target>
diff -r 08a682423cca -r f49fef579783
src/org/openbravo/erpCommon/obps/ActivationKey.java
--- a/src/org/openbravo/erpCommon/obps/ActivationKey.java Mon Sep 13
09:59:12 2010 +0200
+++ b/src/org/openbravo/erpCommon/obps/ActivationKey.java Mon Sep 13
20:27:46 2010 +0000
@@ -26,7 +26,6 @@
import java.io.InputStreamReader;
import java.io.ObjectInputStream;
import java.math.BigInteger;
-import java.net.URL;
import java.security.KeyFactory;
import java.security.PublicKey;
import java.security.Signature;
@@ -52,6 +51,7 @@
import org.hibernate.criterion.Order;
import org.openbravo.base.exception.OBException;
import org.openbravo.base.session.OBPropertiesProvider;
+import org.openbravo.dal.core.DalContextListener;
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBCriteria;
import org.openbravo.dal.service.OBDal;
@@ -369,10 +369,10 @@
}
try {
- // read restriction file from this package's directory
- URL url = this.getClass().getResource(getClass().getSimpleName() +
".class");
- File classDir = new File(url.getPath());
- File restrictionsFile = new File(classDir.getParent(),
"licenseRestrictions");
+ // read restriction file from context directory
+ String restrictionsFilePath =
DalContextListener.getServletContext().getRealPath(
+ "src-loc/design/org/openbravo/erpCommon/obps/licenseRestrictions");
+ File restrictionsFile = new File(restrictionsFilePath);
log4j.debug("Restrictions file: " + restrictionsFile.getAbsolutePath());
FileInputStream fis = new FileInputStream(restrictionsFile);
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
