Author: jochen
Date: Mon Jul 26 10:05:50 2010
New Revision: 979219
URL: http://svn.apache.org/viewvc?rev=979219&view=rev
Log:
Bug fix: Slots haven't been saved when inserting a registry object.
Modified:
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/schema/schema-update.1.sql
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/sql/AbstractDbDriver.java
Modified:
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/schema/schema-update.1.sql
URL:
http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/schema/schema-update.1.sql?rev=979219&r1=979218&r2=979219&view=diff
==============================================================================
---
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/schema/schema-update.1.sql
(original)
+++
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/schema/schema-update.1.sql
Mon Jul 26 10:05:50 2010
@@ -122,7 +122,7 @@ INSERT INTO Ids (name, nextValue) VALUES
&{Taxonomy, 0, '00000000000000000000000000000001', 'ObjectType', 'The taxonomy
of object types. Object types are categories below this taxonomy.'}
&{Taxonomy, 1, '00000000000000000000000000000002', 'AssociationType', 'The
taxonomy of association types. Association types are categories below this
taxonomy.'}
-&{Taxonomy, 2, '00000000000000000000000000000033', 'Model', 'The taxonomy of
concepts, which are used to store the registry model.'}
+&{Taxonomy, 2, '00000000000000000000000000000033', 'MetaModel', 'The taxonomy
of concepts, which are used to store the registries meta model.'}
&{macro, Concept,
'INSERT INTO RegistryObjects (roKey, roOwnerRestricting, pos, roType)
VALUES (\1, \2, \0, 10)',
@@ -162,7 +162,7 @@ INSERT INTO Ids (name, nextValue) VALUES
&{Concept, 10, '00000000000000000000000000000031',
'00000000000000000000000000000002', 'RelatedTo'}
&{Concept, 11, '00000000000000000000000000000032',
'00000000000000000000000000000002', 'Supersedes'}
-&{Concept, 0, '00000000000000000000000000000034',
'00000000000000000000000000000033', 'DataTypes'}
+&{Concept, 0, '00000000000000000000000000000034',
'00000000000000000000000000000033', 'AttributeTypes'}
&{Concept, 0, '00000000000000000000000000000035',
'00000000000000000000000000000034', 'string'}
&{Concept, 0, '00000000000000000000000000000036',
'00000000000000000000000000000034', 'bool'}
&{Concept, 0, '00000000000000000000000000000037',
'00000000000000000000000000000034', 'integer'}
Modified:
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/sql/AbstractDbDriver.java
URL:
http://svn.apache.org/viewvc/labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/sql/AbstractDbDriver.java?rev=979219&r1=979218&r2=979219&view=diff
==============================================================================
---
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/sql/AbstractDbDriver.java
(original)
+++
labs/jaxmas/trunk/JaxMas/src/main/java/org/apache/labs/jaxmas/registry/sql/AbstractDbDriver.java
Mon Jul 26 10:05:50 2010
@@ -58,12 +58,14 @@ import org.apache.labs.jaxmas.registry.i
import org.apache.labs.jaxmas.registry.infomodel.RegistryServiceImpl;
import org.apache.labs.jaxmas.registry.infomodel.SlotImpl;
import org.apache.labs.jaxmas.registry.util.Locales;
+import org.apache.log4j.Logger;
/**
* Default implementation of {...@link DbDriver}.
*/
public abstract class AbstractDbDriver implements DbDriver {
+ private static final Logger log = Logger.getLogger(AbstractDbDriver.class);
private final RegistryService registryService;
/**
@@ -144,6 +146,7 @@ public abstract class AbstractDbDriver i
stmt.setLong(2, id);
stmt.setString(3, slot.getName());
stmt.setString(4, slot.getSlotType());
+ log.debug(q + ", " + id + ", " + slot.getName() +
", " + slot.getSlotType()); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
stmt.executeUpdate();
for (Object v : slot.getValues()) {
if (stmt2 == null) {
@@ -151,6 +154,7 @@ public abstract class AbstractDbDriver i
}
stmt2.setLong(1, id);
stmt2.setString(2, v == null ? null :
v.toString());
+ log.debug(q2 + ", " + id + ", " + v);
//$NON-NLS-1$//$NON-NLS-2$
stmt2.executeUpdate();
}
}
@@ -290,7 +294,9 @@ public abstract class AbstractDbDriver i
final InternationalStringController description =
ro.getDescriptionController();
description.save();
- if (pObject instanceof RegistryEntry) {
+ saveSlots(pObject);
+
+ if (pObject instanceof RegistryEntry) {
RegistryEntryImpl<?> re = (RegistryEntryImpl<?>)
pObject;
run("INSERT INTO RegistryEntries (roKey, customType,
expiration, status, stability, majorVersion, minorVersion, userVersion) VALUES
(?, ?, ?, ?, ?, ?, ?, ?)", //$NON-NLS-1$
key, re.getCustomType(),
re.getExpiration(), new Integer(re.getStatus()),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
