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

Merge V1.4 to HEAD

Browse Source 
- Ignored Enterprise-specific changes
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3701 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3703 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3704 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3705 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3707 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3876 .
   svn revert root\projects\web-client\source\web\jsp\admin\admin-console.jsp


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-09-21 23:35:51 +00:00
parent 89f39cd176
commit d2bce74f0b
103 changed files with 3569 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,7 +81,7 @@ public class DictionaryComponent implements DictionaryService
Collection<QName> propertyTypes = new ArrayList<QName>();
for (QName model : getAllModels())
{
propertyTypes.addAll(getAspects(model));
propertyTypes.addAll(getDataTypes(model));
}
return propertyTypes;
}

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

@@ -202,7 +202,7 @@ public class M2Model
M2Type type = getType(name);
if (type != null)
{
types.remove(types);
types.remove(type);
}
}

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

@@ -16,7 +16,7 @@
<data-types>
<data-type name="test:datatype">
<analyser-class>org.apache.lucene.analysis.standard.StandardAnalyzer</analyser-class>
<analyser-class>org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser</analyser-class>
<java-class>java.lang.Object</java-class>
</data-type>