Merged V3.1 to HEAD

13265: Fix incorrect wiring of guest user name
   13266: Merged V2.1A to V3.1
      13252: Fix ADB-159: Generation of content model xml throws exception
   13267: Remove accidental addition of folders
   13280: IndexTransactionTracker logging changes
   13281: Added bean to push properties from repository properties into the VM properties
   13283: Added forgotten Hibernate diff file after JAWS-223 fix
   13291: Fix ETHREEOH-1340: Alfresco Repository Draft CMIS Implementation" link refers to localhost
   13297: Fix ETHREEOH-885: workflow mapAuthorityToName tests don't handle sub-classed objects correctly.
   13308: First part of JAWS-215 - permission migration from V2.1-A to V3.1
   13313: Build fix for 2.1-A to 3.1 ACL patch
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V2.1-A:r13252
      Merged /alfresco/BRANCHES/V3.1:r13265-13267,13277-13283,13286,13289,13291,13295,13297,13308-13313


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/dictionary/DictionaryDAOTest.java

@@ -24,6 +24,10 @@
  */
 package org.alfresco.repo.dictionary;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -33,6 +37,7 @@ import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
 
 import org.alfresco.i18n.I18NUtil;
+import org.alfresco.model.ContentModel;
 import org.alfresco.repo.cache.EhCacheAdapter;
 import org.alfresco.repo.dictionary.constraint.RegexConstraint;
 import org.alfresco.repo.dictionary.constraint.StringLengthConstraint;
@@ -44,10 +49,12 @@ import org.alfresco.service.cmr.dictionary.ClassDefinition;
 import org.alfresco.service.cmr.dictionary.Constraint;
 import org.alfresco.service.cmr.dictionary.ConstraintDefinition;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryException;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.dictionary.ModelDefinition;
 import org.alfresco.service.cmr.dictionary.PropertyDefinition;
 import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 
 
@@ -372,4 +379,82 @@ public class DictionaryDAOTest extends TestCase
         childAssocDef = (ChildAssociationDefinition) assocDef;
         assertTrue("Expected 'true' for timestamp propagation", childAssocDef.getPropagateTimestamps());
     }
+
+    public void testADB159() throws UnsupportedEncodingException
+    {
+        // source dictionary
+        TenantService tenantService = new SingleTServiceImpl();   
+        NamespaceDAOImpl namespaceDAO = new NamespaceDAOImpl();
+        namespaceDAO.setTenantService(tenantService);
+        initNamespaceCaches(namespaceDAO);
+        DictionaryDAOImpl dictionaryDAO = new DictionaryDAOImpl(namespaceDAO);
+        dictionaryDAO.setTenantService(tenantService);
+        initDictionaryCaches(dictionaryDAO);
+
+        // destination dictionary
+        NamespaceDAOImpl namespaceDAO2 = new NamespaceDAOImpl();
+        namespaceDAO2.setTenantService(tenantService);
+        initNamespaceCaches(namespaceDAO2);
+        DictionaryDAOImpl dictionaryDAO2 = new DictionaryDAOImpl(namespaceDAO2);
+        dictionaryDAO2.setTenantService(tenantService);
+        initDictionaryCaches(dictionaryDAO2);
+
+        List<String> models = new ArrayList<String>();
+        models.add("alfresco/model/dictionaryModel.xml");
+        models.add("alfresco/model/systemModel.xml");
+        models.add("alfresco/model/contentModel.xml");
+        models.add("alfresco/model/wcmModel.xml");
+        models.add("alfresco/model/applicationModel.xml");
+        models.add("org/alfresco/repo/security/authentication/userModel.xml");
+        models.add("org/alfresco/repo/action/actionModel.xml");
+        models.add("org/alfresco/repo/rule/ruleModel.xml");
+        models.add("org/alfresco/repo/version/version_model.xml");
+        
+        // round-trip default models
+        for (String bootstrapModel : models)
+        {
+            InputStream modelStream = getClass().getClassLoader().getResourceAsStream(bootstrapModel);
+            if (modelStream == null)
+            {
+                throw new DictionaryException("Could not find bootstrap model " + bootstrapModel);
+            }
+            try
+            {
+                // parse model from xml
+                M2Model model = M2Model.createModel(modelStream);
+                dictionaryDAO.putModel(model);
+                
+                // regenerate xml from model
+                ByteArrayOutputStream xml1 = new ByteArrayOutputStream();
+                model.toXML(xml1);
+                
+                // register regenerated xml with other dictionary
+                M2Model model2 = M2Model.createModel(new ByteArrayInputStream(xml1.toByteArray()));
+                dictionaryDAO2.putModel(model2);
+            }
+            catch(DictionaryException e)
+            {
+                throw new DictionaryException("Could not import bootstrap model " + bootstrapModel, e);
+            }
+        }
+        
+        // specific test case
+        M2Model model = M2Model.createModel("test:adb25");
+        model.createNamespace(TEST_URL, "test");
+        model.createImport(NamespaceService.DICTIONARY_MODEL_1_0_URI, NamespaceService.DICTIONARY_MODEL_PREFIX);
+        model.createImport(NamespaceService.SYSTEM_MODEL_1_0_URI, NamespaceService.SYSTEM_MODEL_PREFIX);
+        model.createImport(NamespaceService.CONTENT_MODEL_1_0_URI, NamespaceService.CONTENT_MODEL_PREFIX);
+
+        M2Type testType = model.createType("test:adb25" );
+        testType.setParentName("cm:" + ContentModel.TYPE_CONTENT.getLocalName());
+
+        M2Property prop1 = testType.createProperty("test:prop1");
+        prop1.setMandatory(false);
+        prop1.setType("d:" + DataTypeDefinition.TEXT.getLocalName());
+        prop1.setMultiValued(false);
+
+        ByteArrayOutputStream xml1 = new ByteArrayOutputStream();
+        model.toXML(xml1); 
+    }
+
 }

source/java/org/alfresco/repo/dictionary/M2ClassAssociation.java

@@ -171,6 +171,10 @@ public abstract class M2ClassAssociation
         this.targetRoleName = name;
     }
 
+    public Boolean getTargetMandatory()
+    {
+        return isTargetMandatory();
+    }
     
     public boolean isTargetMandatory()
     {
@@ -183,6 +187,10 @@ public abstract class M2ClassAssociation
         this.isTargetMandatory = isTargetMandatory;
     }
 
+    public Boolean getTargetMandatoryEnforced()
+    {
+        return isTargetMandatoryEnforced();
+    }
     
     public boolean isTargetMandatoryEnforced()
     {

source/java/org/alfresco/repo/dictionary/M2NamedValue.java

@@ -34,8 +34,8 @@ import java.util.List;
 public class M2NamedValue
 {
     private String name;
-    private String simpleValue;
-    private List<String> listValue;
+    private String simpleValue = null;
+    private List<String> listValue = null;
     
     /*package*/ M2NamedValue()
     {

source/java/org/alfresco/repo/dictionary/m2binding.xml

@@ -61,7 +61,6 @@
       <value name="description" field="description" usage="optional"/>
       <value name="parent" field="parentName" usage="optional"/>
       <value name="archive" field="archive" usage="optional"/>
-      
       <structure name="properties" usage="optional">
          <collection field="properties" item-type="org.alfresco.repo.dictionary.M2Property" factory="org.alfresco.repo.dictionary.M2Model.createList"/>
       </structure>
@@ -74,18 +73,18 @@
                <value style="attribute" name="name" field="name"/>
                <structure name="mandatory" usage="optional">
                   <value style="attribute" name="enforced" field="isMandatoryEnforced" usage="optional" />
-                  <value style="text" field="isMandatory" />
+                  <value style="text" field="isMandatory" usage="optional"/>
                </structure>
                <value name="default" field="defaultValue" usage="optional"/>
                <structure name="constraints" usage="optional">
-                  <collection field="constraints" item-type="org.alfresco.repo.dictionary.M2Constraint" factory="org.alfresco.repo.dictionary.M2Model.createList"/>
+                  <collection field="constraints" item-type="org.alfresco.repo.dictionary.M2Constraint" usage="optional" factory="org.alfresco.repo.dictionary.M2Model.createList"/>
                </structure>
             </structure>
          </collection>
       </structure>
       <structure name="mandatory-aspects" usage="optional">
          <collection field="mandatoryAspects" factory="org.alfresco.repo.dictionary.M2Model.createList">
-            <value name="aspect"/>
+            <value name="aspect" type="java.lang.String"/>
          </collection>
       </structure>
    </mapping>
@@ -94,7 +93,7 @@
       <structure map-as="org.alfresco.repo.dictionary.M2Class"/>      
    </mapping>
       
-   <mapping name="aspect" class="org.alfresco.repo.dictionary.M2Aspect"  extends="org.alfresco.repo.dictionary.M2Class">
+   <mapping name="aspect" class="org.alfresco.repo.dictionary.M2Aspect" extends="org.alfresco.repo.dictionary.M2Class">
       <structure map-as="org.alfresco.repo.dictionary.M2Class"/>
    </mapping>
 
@@ -117,20 +116,16 @@
          <value name="tokenised" field="indexTokenisationMode" usage="optional" serializer="org.alfresco.repo.dictionary.IndexTokenisationMode.serializer" deserializer="org.alfresco.repo.dictionary.IndexTokenisationMode.deserializer"/>
       </structure>
       <structure name="constraints" usage="optional">
-         <collection field="constraints" item-type="org.alfresco.repo.dictionary.M2Constraint" factory="org.alfresco.repo.dictionary.M2Model.createList"/>
+         <collection field="constraints" item-type="org.alfresco.repo.dictionary.M2Constraint" factory="org.alfresco.repo.dictionary.M2Model.createList" usage="optional"/>
       </structure>
    </mapping>
 
    <mapping abstract="true" class="org.alfresco.repo.dictionary.M2NamedValue">
       <value style="attribute" name="name" field="name" />
-      <structure name="value" usage="optional">
-          <value style="text" field="simpleValue" />
-      </structure>
+      <value name="value" field="simpleValue" usage="optional" />
       <structure name="list" usage="optional">
-          <collection field="listValue" factory="org.alfresco.repo.dictionary.M2Model.createList" usage="optional" >
-              <structure name="value" usage="optional" >
-                  <value style="text" />
-              </structure>
+          <collection field="listValue" factory="org.alfresco.repo.dictionary.M2Model.createList" usage="optional">
+             <value name="value" style="element" usage="optional" type="java.lang.String"/>
           </collection>
       </structure>
    </mapping>
@@ -158,8 +153,8 @@
          <value name="class" field="targetClassName"/>
          <value name="role" field="targetRoleName" usage="optional"/>
          <structure name="mandatory" usage="optional">
-           <value style="attribute" name="enforced" field="isTargetMandatoryEnforced" usage="optional"/>
-           <value style="text" field="isTargetMandatory" />
+           <value style="attribute" name="enforced" field="isTargetMandatoryEnforced" get-method="getTargetMandatoryEnforced" usage="optional"/>
+           <value style="text" field="isTargetMandatory" get-method="getTargetMandatory"/>
          </structure>
          <value name="many" field="isTargetMany" usage="optional"/>
       </structure>