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

Merged V1.4 to HEAD

Browse Source 
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3987 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4133 .
   Removed LicenseComponent reference from projects\repository\source\java\org\alfresco\repo\descriptor\DescriptorServiceImpl.java


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4135 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-10-17 22:42:59 +00:00
parent 4f1682e8d0
commit be167f60cf
106 changed files with 5379 additions and 2646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/java/org/alfresco/repo/dictionary/DictionaryDAOTest.java
View File

@@ -16,6 +16,7 @@
*/
package org.alfresco.repo.dictionary;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -272,5 +273,26 @@ public class DictionaryDAOTest extends TestCase
assertFalse(test5);
}
public void testPropertyOverride()
{
TypeDefinition type1 = service.getType(QName.createQName(TEST_URL, "overridetype1"));
Map<QName, PropertyDefinition> props1 = type1.getProperties();
PropertyDefinition prop1 = props1.get(QName.createQName(TEST_URL, "propoverride"));
String def1 = prop1.getDefaultValue();
assertEquals("one", def1);
TypeDefinition type2 = service.getType(QName.createQName(TEST_URL, "overridetype2"));
Map<QName, PropertyDefinition> props2 = type2.getProperties();
PropertyDefinition prop2 = props2.get(QName.createQName(TEST_URL, "propoverride"));
String def2 = prop2.getDefaultValue();
assertEquals("two", def2);
TypeDefinition type3 = service.getType(QName.createQName(TEST_URL, "overridetype3"));
Map<QName, PropertyDefinition> props3 = type3.getProperties();
PropertyDefinition prop3 = props3.get(QName.createQName(TEST_URL, "propoverride"));
String def3 = prop3.getDefaultValue();
assertEquals("three", def3);
}
}

2
source/java/org/alfresco/repo/dictionary/TestModel.java
View File

@@ -43,6 +43,8 @@ public class TestModel
bootstrapModels.add("alfresco/model/systemModel.xml");
bootstrapModels.add("alfresco/model/contentModel.xml");
bootstrapModels.add("alfresco/model/applicationModel.xml");
bootstrapModels.add("alfresco/model/bpmModel.xml");
bootstrapModels.add("alfresco/workflow/workflowModel.xml");
// include models specified on command line
for (String arg: args)

27
source/java/org/alfresco/repo/dictionary/dictionarydaotest_model.xml
View File

@@ -188,6 +188,33 @@
</properties>
</type>
<type name="test:overridetype1">
<properties>
<property name="test:propoverride">
<type>d:text</type>
<default>one</default>
</property>
</properties>
</type>
<type name="test:overridetype2">
<parent>test:overridetype1</parent>
<overrides>
<property name="test:propoverride">
<default>two</default>
</property>
</overrides>
</type>
<type name="test:overridetype3">
<parent>test:overridetype2</parent>
<overrides>
<property name="test:propoverride">
<default>three</default>
</property>
</overrides>
</type>
</types>
<aspects>