inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ALFCOM-3384 - unable to create WCM form-based content

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16706 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2009-10-06 10:18:29 +00:00
parent a63369dbb7
commit 174e22a9f2
5 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
config/alfresco/ibatis/org.hibernate.dialect.Dialect/avm-common-SqlMap.xml
View File

@@ -47,7 +47,7 @@
<result property="floatValue" column="float_value" jdbcType="FLOAT" javaType="java.lang.Float"/> <result property="floatValue" column="float_value" jdbcType="FLOAT" javaType="java.lang.Float"/>
<result property="doubleValue" column="double_value" jdbcType="DOUBLE" javaType="java.lang.Double"/> <result property="doubleValue" column="double_value" jdbcType="DOUBLE" javaType="java.lang.Double"/>
<result property="stringValue" column="string_value" jdbcType="TEXT" javaType="java.lang.String"/> <result property="stringValue" column="string_value" jdbcType="TEXT" javaType="java.lang.String"/>
<result property="serializable" column="serializable_value" jdbcType="BLOB"/> <result property="serializableValue" column="serializable_value" jdbcType="BLOB" javaType="java.io.Serializable"/>
</resultMap> </resultMap>
<resultMap id="result_AVMNode" class="AVMNode"> <resultMap id="result_AVMNode" class="AVMNode">
@@ -88,7 +88,7 @@
<result property="floatValue" column="float_value" jdbcType="FLOAT" javaType="java.lang.Float"/> <result property="floatValue" column="float_value" jdbcType="FLOAT" javaType="java.lang.Float"/>
<result property="doubleValue" column="double_value" jdbcType="DOUBLE" javaType="java.lang.Double"/> <result property="doubleValue" column="double_value" jdbcType="DOUBLE" javaType="java.lang.Double"/>
<result property="stringValue" column="string_value" jdbcType="TEXT" javaType="java.lang.String"/> <result property="stringValue" column="string_value" jdbcType="TEXT" javaType="java.lang.String"/>
<result property="serializable" column="serializable_value" jdbcType="BLOB"/> <result property="serializableValue" column="serializable_value" jdbcType="BLOB" javaType="java.io.Serializable"/>
</resultMap> </resultMap>
<resultMap id="result_AVMNodeAspect" class="AVMNodeAspect"> <resultMap id="result_AVMNodeAspect" class="AVMNodeAspect">
@@ -173,6 +173,34 @@
<parameter property="pattern" jdbcType="VARCHAR" javaType="java.lang.String"/> <parameter property="pattern" jdbcType="VARCHAR" javaType="java.lang.String"/>
</parameterMap> </parameterMap>
<parameterMap id="parameter_NodePropertyPatternMap" class="AVMNodeProperty">
<parameter property="nodeId" jdbcType="BIGINT" javaType="java.lang.Long"/>
<parameter property="qnameId" jdbcType="BIGINT" javaType="java.lang.Long"/>
<parameter property="actualType" jdbcType="INT" javaType="java.lang.Integer"/>
<parameter property="persistedType" jdbcType="INT" javaType="java.lang.Integer"/>
<parameter property="isMultiValued" jdbcType="BIT" javaType="java.lang.Boolean"/>
<parameter property="booleanValue" jdbcType="BIT" javaType="java.lang.Boolean"/>
<parameter property="longValue" jdbcType="BIGINT" javaType="java.lang.Long"/>
<parameter property="floatValue" jdbcType="FLOAT" javaType="java.lang.Float"/>
<parameter property="doubleValue" jdbcType="DOUBLE" javaType="java.lang.Double"/>
<parameter property="stringValue" jdbcType="TEXT" javaType="java.lang.String"/>
<parameter property="serializableValue" jdbcType="BLOB" javaType="java.io.Serializable"/>
</parameterMap>
<parameterMap id="parameter_StorePropertyPatternMap" class="AVMStoreProperty">
<parameter property="avmStoreId" jdbcType="BIGINT" javaType="java.lang.Long"/>
<parameter property="qnameId" jdbcType="BIGINT" javaType="java.lang.Long"/>
<parameter property="actualType" jdbcType="INT" javaType="java.lang.Integer"/>
<parameter property="persistedType" jdbcType="INT" javaType="java.lang.Integer"/>
<parameter property="isMultiValued" jdbcType="BIT" javaType="java.lang.Boolean"/>
<parameter property="booleanValue" jdbcType="BIT" javaType="java.lang.Boolean"/>
<parameter property="longValue" jdbcType="BIGINT" javaType="java.lang.Long"/>
<parameter property="floatValue" jdbcType="FLOAT" javaType="java.lang.Float"/>
<parameter property="doubleValue" jdbcType="DOUBLE" javaType="java.lang.Double"/>
<parameter property="stringValue" jdbcType="TEXT" javaType="java.lang.String"/>
<parameter property="serializableValue" jdbcType="BLOB" javaType="java.io.Serializable"/>
</parameterMap>
<!-- --> <!-- -->
<!-- SQL Snippets --> <!-- SQL Snippets -->
@@ -195,7 +223,7 @@
<sql id="insert_AVMStoreProperty_AutoIncrement"> <sql id="insert_AVMStoreProperty_AutoIncrement">
insert into avm_store_properties (avm_store_id, qname_id, actual_type_n, persisted_type_n, multi_valued, boolean_value, long_value, float_value, double_value, string_value, serializable_value) insert into avm_store_properties (avm_store_id, qname_id, actual_type_n, persisted_type_n, multi_valued, boolean_value, long_value, float_value, double_value, string_value, serializable_value)
values (#avmStoreId#, #qnameId#, #actualType#, #persistedType#, #isMultiValued#, #booleanValue#, #longValue#, #floatValue#, #doubleValue#, #stringValue#, #serializable#) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
</sql> </sql>
@@ -228,9 +256,9 @@
values (#versionRootId#, #md5sum#, #path#) values (#versionRootId#, #md5sum#, #path#)
</insert> </insert>
<insert id="insert_AVMNodeProperty"> <insert id="insert_AVMNodeProperty" parameterMap="parameter_NodePropertyPatternMap">
insert into avm_node_properties (node_id, qname_id, actual_type_n, persisted_type_n, multi_valued, boolean_value, long_value, float_value, double_value, string_value, serializable_value) insert into avm_node_properties (node_id, qname_id, actual_type_n, persisted_type_n, multi_valued, boolean_value, long_value, float_value, double_value, string_value, serializable_value)
values (#nodeId#, #qnameId#, #actualType#, #persistedType#, #isMultiValued#, #booleanValue#, #longValue#, #floatValue#, #doubleValue#, #stringValue#, #serializable#) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
</insert> </insert>
<!-- --> <!-- -->
@@ -360,7 +388,7 @@
float_value = #floatValue#, float_value = #floatValue#,
double_value = #doubleValue#, double_value = #doubleValue#,
string_value = #stringValue#, string_value = #stringValue#,
serializable_value = #serializable# serializable_value = #serializableValue#
where where
id = #id# id = #id#
</update> </update>
@@ -573,7 +601,7 @@
float_value = #floatValue#, float_value = #floatValue#,
double_value = #doubleValue#, double_value = #doubleValue#,
string_value = #stringValue#, string_value = #stringValue#,
serializable_value = #serializable# serializable_value = #serializableValue#
where where
node_id = #nodeId# and node_id = #nodeId# and
qname_id = #qnameId# qname_id = #qnameId#

2
config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/avm-insert-SqlMap.xml
View File

@@ -13,7 +13,7 @@
</selectKey> </selectKey>
</insert> </insert>
<insert id="insert_AVMStoreProperty" parameterClass="AVMStoreProperty"> <insert id="insert_AVMStoreProperty" parameterMap="parameter_StorePropertyPatternMap">
<include refid="insert_AVMStoreProperty_AutoIncrement"/> <include refid="insert_AVMStoreProperty_AutoIncrement"/>
<selectKey resultClass="long" keyProperty="id" type="post"> <selectKey resultClass="long" keyProperty="id" type="post">
KEY_COLUMN:GENERATED_KEY KEY_COLUMN:GENERATED_KEY

12
source/java/org/alfresco/repo/domain/avm/AVMNodePropertyEntity.java
View File

@@ -25,7 +25,6 @@
package org.alfresco.repo.domain.avm; package org.alfresco.repo.domain.avm;
import org.alfresco.repo.domain.PropertyValue; import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.util.EqualsHelper;
/** /**
* Entity bean for <b>avm_node_properties</b> table. * Entity bean for <b>avm_node_properties</b> table.
@@ -45,7 +44,6 @@ public class AVMNodePropertyEntity extends PropertyValue
{ {
} }
// TODO redo
public AVMNodePropertyEntity(long nodeId, Long qnameId, PropertyValue value) public AVMNodePropertyEntity(long nodeId, Long qnameId, PropertyValue value)
{ {
setNodeId(nodeId); setNodeId(nodeId);
@@ -80,16 +78,6 @@ public class AVMNodePropertyEntity extends PropertyValue
this.qnameId = qnameId; this.qnameId = qnameId;
} }
public void setSerializable(byte[] data)
{
setSerializableValue(data);
}
public byte[] getSerializable()
{
return (byte[])getSerializableValue();
}
@Override @Override
public int hashCode() public int hashCode()
{ {

11
source/java/org/alfresco/repo/domain/avm/AVMStorePropertyEntity.java
View File

@@ -47,7 +47,6 @@ public class AVMStorePropertyEntity extends PropertyValue
// default constructor // default constructor
} }
// TODO redo
public AVMStorePropertyEntity(long storeId, Long qnameId, PropertyValue value) public AVMStorePropertyEntity(long storeId, Long qnameId, PropertyValue value)
{ {
setAvmStoreId(storeId); setAvmStoreId(storeId);
@@ -90,16 +89,6 @@ public class AVMStorePropertyEntity extends PropertyValue
this.qnameId = qnameId; this.qnameId = qnameId;
} }
public void setSerializable(byte[] data)
{
setSerializableValue(data);
}
public byte[] getSerializable()
{
return (byte[])getSerializableValue();
}
@Override @Override
public int hashCode() public int hashCode()
{ {

2
source/java/org/alfresco/repo/domain/avm/AbstractAVMNodeDAOImpl.java
View File

@@ -449,7 +449,7 @@ public abstract class AbstractAVMNodeDAOImpl implements AVMNodeDAO
} }
// Get the persistent ID for the QName // Get the persistent ID for the QName
Pair<Long, QName> qnamePair = qnameDAO.getQName(qname); Pair<Long, QName> qnamePair = qnameDAO.getOrCreateQName(qname);
if (qnamePair != null) if (qnamePair != null)
{ {
Long qnameId = qnamePair.getFirst(); Long qnameId = qnamePair.getFirst();