From a28b0141f33b3a34be521feaf5629e1983c7ddd1 Mon Sep 17 00:00:00 2001
From: Andrew Hind <andy.hind@alfresco.com>
Date: Thu, 1 Jun 2006 13:22:11 +0000
Subject: [PATCH] Fix type assoc type for top level groups

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3008 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/messages/patch-service.properties      |  5 +++++
 config/alfresco/patch/patch-services-context.xml       |  9 +++++++++
 config/alfresco/version.properties                     |  4 ++--
 .../repo/domain/hibernate/AppliedPatch.hbm.xml         |  2 +-
 .../alfresco/repo/node/integrity/IntegrityChecker.java | 10 ++--------
 .../repo/security/authority/AuthorityDAOImpl.java      |  4 ++--
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index 024b5f6ecf..64d5461e5c 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -67,3 +67,8 @@ patch.descriptorUpdate.result=Repository descriptor updated
 patch.scriptsFolder.description=Ensures the existence of the 'Scripts' folder.
 patch.scriptsFolder.result.exists=The scripts folder already exists: {0}
 patch.scriptsFolder.result.created=The scripts folder was successfully created: {0}
+
+patch.topLevelGroupParentChildAssociationTypePatch.description=Ensure top level groups have the correct child association type.
+patch.topLevelGroupParentChildAssociationTypePatch.=Fixed top level groups child association type.
+
+
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index 56998af2d4..2cca6f90f9 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -360,4 +360,13 @@
         </property>
     </bean>
     
+    
+    <bean id="patch.topLevelGroupParentChildAssociationTypePatch" class="org.alfresco.repo.admin.patch.impl.TopLevelGroupParentChildAssociationTypePatch" parent="basePatch">
+        <property name="id"><value>patch.topLevelGroupParentChildAssociationTypePatch</value></property>
+        <property name="description"><value>patch.topLevelGroupParentChildAssociationTypePatch.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>13</value></property>
+        <property name="targetSchema"><value>14</value></property>
+    </bean>
+    
 </beans>
diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index 2729591fe7..83d88a8a59 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -7,7 +7,7 @@
 version.major=1
 version.minor=3
 version.revision=0
-version.label=RC1
+version.label=RC2 (dev)
 
 # Edition label
 
@@ -15,4 +15,4 @@ version.edition=Community Network
 
 # Schema number
 
-version.schema=13
+version.schema=14
diff --git a/source/java/org/alfresco/repo/domain/hibernate/AppliedPatch.hbm.xml b/source/java/org/alfresco/repo/domain/hibernate/AppliedPatch.hbm.xml
index 4b2611990c..052088eb21 100644
--- a/source/java/org/alfresco/repo/domain/hibernate/AppliedPatch.hbm.xml
+++ b/source/java/org/alfresco/repo/domain/hibernate/AppliedPatch.hbm.xml
@@ -14,7 +14,7 @@
          dynamic-insert="false"
          select-before-update="false"
          optimistic-lock="version" >
-      <id column="id" length="32" name="id" type="string" />
+      <id column="id" length="64" name="id" type="string" />
       <property name="description" column="description" type="string" length="1024" />
       <property name="fixesFromSchema" column="fixes_from_schema" type="integer" />
       <property name="fixesToSchema" column="fixes_to_schema" type="integer" />
diff --git a/source/java/org/alfresco/repo/node/integrity/IntegrityChecker.java b/source/java/org/alfresco/repo/node/integrity/IntegrityChecker.java
index 95a9d20322..4cae7893f6 100644
--- a/source/java/org/alfresco/repo/node/integrity/IntegrityChecker.java
+++ b/source/java/org/alfresco/repo/node/integrity/IntegrityChecker.java
@@ -286,14 +286,8 @@ public class IntegrityChecker
                 childAssocRef.getChildRef());
         save(event);
         
-        // check target role
-        event = new AssocTargetRoleIntegrityEvent(
-                nodeService,
-                dictionaryService,
-                childAssocRef.getParentRef(),
-                childAssocRef.getTypeQName(),
-                childAssocRef.getQName());
-        save(event);
+        onCreateChildAssociation(childAssocRef);
+        
         
         // check for associations defined on the new node (child)
         NodeRef childRef = childAssocRef.getChildRef();
diff --git a/source/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java b/source/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java
index ed3c483556..c2dcb80584 100644
--- a/source/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java
+++ b/source/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java
@@ -47,7 +47,7 @@ import org.alfresco.util.ISO9075;
 
 public class AuthorityDAOImpl implements AuthorityDAO
 {
-    private static final StoreRef STOREREF_USERS = new StoreRef("user", "alfrescoUserStore");
+    public static final StoreRef STOREREF_USERS = new StoreRef("user", "alfrescoUserStore");
 
     private NodeService nodeService;
     private NamespacePrefixResolver namespacePrefixResolver;
@@ -152,7 +152,7 @@ public class AuthorityDAOImpl implements AuthorityDAO
             NodeRef authorityContainerRef = getAuthorityContainer();
             nodeService.createNode(
                     authorityContainerRef,
-                    ContentModel.ASSOC_MEMBER,
+                    ContentModel.ASSOC_CHILDREN,
                     QName.createQName("usr", name, namespacePrefixResolver),
                     ContentModel.TYPE_AUTHORITY_CONTAINER,
                     props);