details: https://code.openbravo.com/erp/devel/pi/rev/7191562c8ac0
changeset: 14051:7191562c8ac0
user: Martin Taal <martin.taal <at> openbravo.com>
date: Sat Oct 22 13:37:39 2011 +0200
summary: Fixes issue 17002: Warning about 'wrong' uuid generator usage shown
during export.database
Implemented different UUID generator
diffstat:
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/model/domaintype/DatasourceDefinition.hbm.xml
| 2 +-
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/model/domaintype/SelectorDefinition.hbm.xml
| 2 +-
src/org/openbravo/base/model/Column.hbm.xml
| 2 +-
src/org/openbravo/base/model/Module.hbm.xml
| 2 +-
src/org/openbravo/base/model/Package.hbm.xml
| 2 +-
src/org/openbravo/base/model/RefList.hbm.xml
| 2 +-
src/org/openbravo/base/model/RefSearch.hbm.xml
| 2 +-
src/org/openbravo/base/model/RefTable.hbm.xml
| 2 +-
src/org/openbravo/base/model/Reference.hbm.xml
| 2 +-
src/org/openbravo/base/model/Table.hbm.xml
| 2 +-
src/org/openbravo/dal/core/DalMappingGenerator.java
| 3 +-
src/org/openbravo/dal/core/DalUUIDHexGenerator.java
| 16 ++++++++-
12 files changed, 26 insertions(+), 13 deletions(-)
diffs (180 lines):
diff -r c2285f2bda0f -r 7191562c8ac0
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/model/domaintype/DatasourceDefinition.hbm.xml
---
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/model/domaintype/DatasourceDefinition.hbm.xml
Sat Oct 22 13:18:30 2011 +0200
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/model/domaintype/DatasourceDefinition.hbm.xml
Sat Oct 22 13:37:39 2011 +0200
@@ -23,7 +23,7 @@
<cache usage="read-write"/>
<id name="id" type="string" column="obserds_datasource_id">
- <generator class="uuid" />
+ <generator class="org.openbravo.base.session.DalUUIDGenerator" />
</id>
<many-to-one name="table" not-null="false"
class="org.openbravo.base.model.Table" column="ad_table_id"/>
diff -r c2285f2bda0f -r 7191562c8ac0
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/model/domaintype/SelectorDefinition.hbm.xml
---
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/model/domaintype/SelectorDefinition.hbm.xml
Sat Oct 22 13:18:30 2011 +0200
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/model/domaintype/SelectorDefinition.hbm.xml
Sat Oct 22 13:37:39 2011 +0200
@@ -23,7 +23,7 @@
<cache usage="read-write"/>
<id name="id" type="string" column="obuisel_selector_id">
- <generator class="uuid" />
+ <generator class="org.openbravo.base.session.DalUUIDGenerator" />
</id>
<many-to-one name="table" not-null="false"
class="org.openbravo.base.model.Table" column="ad_table_id"/>
diff -r c2285f2bda0f -r 7191562c8ac0 src/org/openbravo/base/model/Column.hbm.xml
--- a/src/org/openbravo/base/model/Column.hbm.xml Sat Oct 22 13:18:30
2011 +0200
+++ b/src/org/openbravo/base/model/Column.hbm.xml Sat Oct 22 13:37:39
2011 +0200
@@ -23,7 +23,7 @@
<cache usage="read-write"/>
<id name="id" type="string" column="ad_column_id">
- <generator class="uuid" />
+ <generator
class="org.openbravo.base.session.DalUUIDGenerator" />
</id>
<property name="active"
type="org.openbravo.base.session.OBYesNoType" not-null="true"
column="isactive"/>
diff -r c2285f2bda0f -r 7191562c8ac0 src/org/openbravo/base/model/Module.hbm.xml
--- a/src/org/openbravo/base/model/Module.hbm.xml Sat Oct 22 13:18:30
2011 +0200
+++ b/src/org/openbravo/base/model/Module.hbm.xml Sat Oct 22 13:37:39
2011 +0200
@@ -23,7 +23,7 @@
<cache usage="read-write"/>
<id name="id" type="string" column="ad_module_id">
- <generator class="uuid" />
+ <generator class="org.openbravo.base.session.DalUUIDGenerator" />
</id>
<property name="active"
type="org.openbravo.base.session.OBYesNoType" not-null="true"
column="isactive"/>
diff -r c2285f2bda0f -r 7191562c8ac0
src/org/openbravo/base/model/Package.hbm.xml
--- a/src/org/openbravo/base/model/Package.hbm.xml Sat Oct 22 13:18:30
2011 +0200
+++ b/src/org/openbravo/base/model/Package.hbm.xml Sat Oct 22 13:37:39
2011 +0200
@@ -23,7 +23,7 @@
<cache usage="read-write"/>
<id name="id" type="string" column="ad_package_id">
- <generator class="uuid" />
+ <generator class="org.openbravo.base.session.DalUUIDGenerator" />
</id>
<property name="active"
type="org.openbravo.base.session.OBYesNoType" not-null="true"
column="isactive"/>
diff -r c2285f2bda0f -r 7191562c8ac0
src/org/openbravo/base/model/RefList.hbm.xml
--- a/src/org/openbravo/base/model/RefList.hbm.xml Sat Oct 22 13:18:30
2011 +0200
+++ b/src/org/openbravo/base/model/RefList.hbm.xml Sat Oct 22 13:37:39
2011 +0200
@@ -23,7 +23,7 @@
<cache usage="read-write"/>
<id name="id" type="string" column="ad_ref_list_id">
- <generator class="uuid" />
+ <generator class="org.openbravo.base.session.DalUUIDGenerator" />
</id>
<property name="value" type="string" column="value" />
diff -r c2285f2bda0f -r 7191562c8ac0
src/org/openbravo/base/model/RefSearch.hbm.xml
--- a/src/org/openbravo/base/model/RefSearch.hbm.xml Sat Oct 22 13:18:30
2011 +0200
+++ b/src/org/openbravo/base/model/RefSearch.hbm.xml Sat Oct 22 13:37:39
2011 +0200
@@ -23,7 +23,7 @@
<cache usage="read-write"/>
<id name="id" type="string" column="ad_ref_search_id">
- <generator class="uuid" />
+ <generator class="org.openbravo.base.session.DalUUIDGenerator" />
</id>
<property name="active"
type="org.openbravo.base.session.OBYesNoType" not-null="true"
column="isactive"/>
diff -r c2285f2bda0f -r 7191562c8ac0
src/org/openbravo/base/model/RefTable.hbm.xml
--- a/src/org/openbravo/base/model/RefTable.hbm.xml Sat Oct 22 13:18:30
2011 +0200
+++ b/src/org/openbravo/base/model/RefTable.hbm.xml Sat Oct 22 13:37:39
2011 +0200
@@ -23,7 +23,7 @@
<cache usage="read-write"/>
<id name="id" type="string" column="ad_reference_id">
- <generator class="uuid" />
+ <generator class="org.openbravo.base.session.DalUUIDGenerator" />
</id>
<property name="active"
type="org.openbravo.base.session.OBYesNoType" not-null="true"
column="isactive"/>
diff -r c2285f2bda0f -r 7191562c8ac0
src/org/openbravo/base/model/Reference.hbm.xml
--- a/src/org/openbravo/base/model/Reference.hbm.xml Sat Oct 22 13:18:30
2011 +0200
+++ b/src/org/openbravo/base/model/Reference.hbm.xml Sat Oct 22 13:37:39
2011 +0200
@@ -23,7 +23,7 @@
<cache usage="read-write"/>
<id name="id" type="string" column="ad_reference_id">
- <generator class="uuid" />
+ <generator class="org.openbravo.base.session.DalUUIDGenerator" />
</id>
<property name="active"
type="org.openbravo.base.session.OBYesNoType" not-null="true"
column="isactive"/>
diff -r c2285f2bda0f -r 7191562c8ac0 src/org/openbravo/base/model/Table.hbm.xml
--- a/src/org/openbravo/base/model/Table.hbm.xml Sat Oct 22 13:18:30
2011 +0200
+++ b/src/org/openbravo/base/model/Table.hbm.xml Sat Oct 22 13:37:39
2011 +0200
@@ -23,7 +23,7 @@
<cache usage="read-write"/>
<id name="id" type="string" column="ad_table_id">
- <generator class="uuid" />
+ <generator class="org.openbravo.base.session.DalUUIDGenerator" />
</id>
<property name="active"
type="org.openbravo.base.session.OBYesNoType" not-null="true"
column="isactive"/>
diff -r c2285f2bda0f -r 7191562c8ac0
src/org/openbravo/dal/core/DalMappingGenerator.java
--- a/src/org/openbravo/dal/core/DalMappingGenerator.java Sat Oct 22
13:18:30 2011 +0200
+++ b/src/org/openbravo/dal/core/DalMappingGenerator.java Sat Oct 22
13:37:39 2011 +0200
@@ -33,6 +33,7 @@
import org.openbravo.base.model.Property;
import org.openbravo.base.provider.OBProvider;
import org.openbravo.base.provider.OBSingleton;
+import org.openbravo.base.session.DalUUIDGenerator;
import org.openbravo.base.session.OBPropertiesProvider;
import org.openbravo.base.util.Check;
@@ -317,7 +318,7 @@
+ "</param>" + NL);
sb.append(TAB3 + "</generator>" + NL);
} else if (p.isUuid()) {
- sb.append(TAB3 + "<generator class=\"" +
DalUUIDHexGenerator.class.getName() + "\"/>" + NL);
+ sb.append(TAB3 + "<generator class=\"" +
DalUUIDGenerator.class.getName() + "\"/>" + NL);
}
sb.append(TAB2 + "</id>" + NL);
return sb.toString();
diff -r c2285f2bda0f -r 7191562c8ac0
src/org/openbravo/dal/core/DalUUIDHexGenerator.java
--- a/src/org/openbravo/dal/core/DalUUIDHexGenerator.java Sat Oct 22
13:18:30 2011 +0200
+++ b/src/org/openbravo/dal/core/DalUUIDHexGenerator.java Sat Oct 22
13:37:39 2011 +0200
@@ -20,22 +20,34 @@
package org.openbravo.dal.core;
import java.io.Serializable;
+import java.util.Properties;
+import org.hibernate.HibernateException;
+import org.hibernate.MappingException;
+import org.hibernate.dialect.Dialect;
import org.hibernate.engine.SessionImplementor;
import org.hibernate.id.UUIDHexGenerator;
+import org.hibernate.type.Type;
import org.openbravo.base.model.BaseOBObjectDef;
+import org.openbravo.base.session.DalUUIDGenerator;
/**
* Extends the standard Hibernate UUIDHexGenerator. This is needed because the
standard Hibernate
* UUIDHexGenerator will overwrite the id even if the object already has one.
The goal is to try to
* keep an id if it has been assigned to an object. This is important in case
of imports.
*
+ * @deprecated replaced by the {@link DalUUIDGenerator}.
+ *
* @author mtaal
*/
-
public class DalUUIDHexGenerator extends UUIDHexGenerator {
@Override
- public Serializable generate(SessionImplementor session, Object obj) {
+ public void configure(Type type, Properties params, Dialect d) throws
MappingException {
+ super.configure(type, params, d);
+ }
+
+ @Override
+ public Serializable generate(SessionImplementor session, Object obj) throws
HibernateException {
final BaseOBObjectDef bob = (BaseOBObjectDef) obj;
if (bob.getId() != null) {
return ((String) bob.getId()).toUpperCase();
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
