diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getassociationdef.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/association.get.desc.xml similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getassociationdef.get.desc.xml rename to config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/association.get.desc.xml diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getassociationdef.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/association.get.json.ftl similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getassociationdef.get.json.ftl rename to config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/association.get.json.ftl diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getassociationdefs.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/associations.get.desc.xml similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getassociationdefs.get.desc.xml rename to config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/associations.get.desc.xml diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getassociationdefs.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/associations.get.json.ftl similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getassociationdefs.get.json.ftl rename to config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/associations.get.json.ftl diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getclassdetails.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/class.get.desc.xml similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getclassdetails.get.desc.xml rename to config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/class.get.desc.xml diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getclassdetails.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/class.get.json.ftl similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getclassdetails.get.json.ftl rename to config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/class.get.json.ftl diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getclassdetail.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/classes.get.desc.xml similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getclassdetail.get.desc.xml rename to config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/classes.get.desc.xml diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getclassdetail.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/classes.get.json.ftl similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getclassdetail.get.json.ftl rename to config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/classes.get.json.ftl diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getchildassoc.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getchildassoc.get.desc.xml deleted file mode 100644 index 43d938ad67..0000000000 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getchildassoc.get.desc.xml +++ /dev/null @@ -1,8 +0,0 @@ - - Get Child Association Definitions - Get the collection of child association definitions - /api/classes/{classname}/childassociation/{assocname} - argument - user - required - \ No newline at end of file diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getchildassoc.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getchildassoc.get.json.ftl deleted file mode 100644 index c66856a5fb..0000000000 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getchildassoc.get.json.ftl +++ /dev/null @@ -1,3 +0,0 @@ -<#import "assocdefinition.lib.ftl" as assocDefLib/> - -<@assocDefLib.assocDefJSON assocdefs=assocdefs/> \ No newline at end of file diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getchildassocs.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getchildassocs.get.desc.xml deleted file mode 100644 index 58b4679a11..0000000000 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getchildassocs.get.desc.xml +++ /dev/null @@ -1,8 +0,0 @@ - - Get Child Assocation Definitions - Get the collection of child association definitions for a given classname - /api/classes/{classname}/childassociations - argument - user - required - \ No newline at end of file diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getchildassocs.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getchildassocs.get.json.ftl deleted file mode 100644 index ad4c012b03..0000000000 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getchildassocs.get.json.ftl +++ /dev/null @@ -1,9 +0,0 @@ -<#import "assocdefinition.lib.ftl" as assocDefLib/> -[ - <#list assocdefs as assocdefs> - <#if assocdefs.isChild() == true> - <@assocDefLib.assocDefJSON assocdefs=assocdefs/> - <#if assocdefs_has_next>, - - -] \ No newline at end of file diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getproperties.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/properties.get.desc.xml similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getproperties.get.desc.xml rename to config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/properties.get.desc.xml diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getproperties.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/properties.get.json.ftl similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getproperties.get.json.ftl rename to config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/properties.get.json.ftl diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getproperty.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/property.get.desc.xml similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getproperty.get.desc.xml rename to config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/property.get.desc.xml diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getproperty.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/property.get.json.ftl similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getproperty.get.json.ftl rename to config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/property.get.json.ftl diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getsubclassesdef.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/subclasses.get.desc.xml similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getsubclassesdef.get.desc.xml rename to config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/subclasses.get.desc.xml diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getsubclassesdef.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/subclasses.get.json.ftl similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/getsubclassesdef.get.json.ftl rename to config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/subclasses.get.json.ftl diff --git a/config/alfresco/web-scripts-application-context.xml b/config/alfresco/web-scripts-application-context.xml index 1f8fcc787c..4978cf2230 100644 --- a/config/alfresco/web-scripts-application-context.xml +++ b/config/alfresco/web-scripts-application-context.xml @@ -540,51 +540,22 @@ - - - + + + - - + - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/source/java/org/alfresco/repo/web/scripts/dictionary/GetAssociationDef.java b/source/java/org/alfresco/repo/web/scripts/dictionary/AssociationGet.java similarity index 98% rename from source/java/org/alfresco/repo/web/scripts/dictionary/GetAssociationDef.java rename to source/java/org/alfresco/repo/web/scripts/dictionary/AssociationGet.java index 76ea01ebca..6ec176ae26 100644 --- a/source/java/org/alfresco/repo/web/scripts/dictionary/GetAssociationDef.java +++ b/source/java/org/alfresco/repo/web/scripts/dictionary/AssociationGet.java @@ -40,7 +40,7 @@ import java.util.Map; * @author Saravanan Sellathurai */ -public class GetAssociationDef extends DeclarativeWebScript +public class AssociationGet extends DeclarativeWebScript { private DictionaryService dictionaryservice; private DictionaryHelper dictionaryhelper; diff --git a/source/java/org/alfresco/repo/web/scripts/dictionary/GetAssociationDefs.java b/source/java/org/alfresco/repo/web/scripts/dictionary/AssociationsGet.java similarity index 99% rename from source/java/org/alfresco/repo/web/scripts/dictionary/GetAssociationDefs.java rename to source/java/org/alfresco/repo/web/scripts/dictionary/AssociationsGet.java index dbcf73443d..a5418b4747 100644 --- a/source/java/org/alfresco/repo/web/scripts/dictionary/GetAssociationDefs.java +++ b/source/java/org/alfresco/repo/web/scripts/dictionary/AssociationsGet.java @@ -41,7 +41,7 @@ import java.util.Map; * @author Saravanan Sellathurai */ -public class GetAssociationDefs extends DeclarativeWebScript +public class AssociationsGet extends DeclarativeWebScript { private DictionaryService dictionaryservice; private DictionaryHelper dictionaryhelper; diff --git a/source/java/org/alfresco/repo/web/scripts/dictionary/GetClassDetails.java b/source/java/org/alfresco/repo/web/scripts/dictionary/ClassGet.java similarity index 98% rename from source/java/org/alfresco/repo/web/scripts/dictionary/GetClassDetails.java rename to source/java/org/alfresco/repo/web/scripts/dictionary/ClassGet.java index 626b266da2..872007f98a 100644 --- a/source/java/org/alfresco/repo/web/scripts/dictionary/GetClassDetails.java +++ b/source/java/org/alfresco/repo/web/scripts/dictionary/ClassGet.java @@ -43,7 +43,7 @@ import java.util.Map; * @author Saravanan Sellathurai */ -public class GetClassDetails extends DeclarativeWebScript +public class ClassGet extends DeclarativeWebScript { private DictionaryService dictionaryservice; diff --git a/source/java/org/alfresco/repo/web/scripts/dictionary/GetClassDetail.java b/source/java/org/alfresco/repo/web/scripts/dictionary/ClassesGet.java similarity index 99% rename from source/java/org/alfresco/repo/web/scripts/dictionary/GetClassDetail.java rename to source/java/org/alfresco/repo/web/scripts/dictionary/ClassesGet.java index 083a1688bf..270066a7e9 100644 --- a/source/java/org/alfresco/repo/web/scripts/dictionary/GetClassDetail.java +++ b/source/java/org/alfresco/repo/web/scripts/dictionary/ClassesGet.java @@ -45,7 +45,7 @@ import java.util.List; * @author Saravanan Sellathurai */ -public class GetClassDetail extends DeclarativeWebScript +public class ClassesGet extends DeclarativeWebScript { private DictionaryService dictionaryservice; private DictionaryHelper dictionaryhelper; diff --git a/source/java/org/alfresco/repo/web/scripts/dictionary/DictionaryServiceTest.java b/source/java/org/alfresco/repo/web/scripts/dictionary/DictionaryRestApiTest.java similarity index 99% rename from source/java/org/alfresco/repo/web/scripts/dictionary/DictionaryServiceTest.java rename to source/java/org/alfresco/repo/web/scripts/dictionary/DictionaryRestApiTest.java index 5be51e10ad..e2e497981b 100644 --- a/source/java/org/alfresco/repo/web/scripts/dictionary/DictionaryServiceTest.java +++ b/source/java/org/alfresco/repo/web/scripts/dictionary/DictionaryRestApiTest.java @@ -34,11 +34,11 @@ import org.json.JSONObject; import org.json.JSONArray; /** - * Unit Test for Dictionaryervice REST API + * Unit test for Dictionary REST API * @author Saravanan Sellathurai */ -public class DictionaryServiceTest extends BaseWebScriptTest +public class DictionaryRestApiTest extends BaseWebScriptTest { private static final String URL_SITES = "/api/classes"; diff --git a/source/java/org/alfresco/repo/web/scripts/dictionary/GetPropertyDefs.java b/source/java/org/alfresco/repo/web/scripts/dictionary/PropertiesGet.java similarity index 98% rename from source/java/org/alfresco/repo/web/scripts/dictionary/GetPropertyDefs.java rename to source/java/org/alfresco/repo/web/scripts/dictionary/PropertiesGet.java index 728811eefd..2cf6784a48 100644 --- a/source/java/org/alfresco/repo/web/scripts/dictionary/GetPropertyDefs.java +++ b/source/java/org/alfresco/repo/web/scripts/dictionary/PropertiesGet.java @@ -42,7 +42,7 @@ import java.util.Map; * @author Saravanan Sellathurai */ -public class GetPropertyDefs extends DeclarativeWebScript +public class PropertiesGet extends DeclarativeWebScript { private DictionaryService dictionaryservice; private DictionaryHelper dictionaryhelper; diff --git a/source/java/org/alfresco/repo/web/scripts/dictionary/GetPropertyDef.java b/source/java/org/alfresco/repo/web/scripts/dictionary/PropertyGet.java similarity index 98% rename from source/java/org/alfresco/repo/web/scripts/dictionary/GetPropertyDef.java rename to source/java/org/alfresco/repo/web/scripts/dictionary/PropertyGet.java index 75cfadfee4..86a8d4ccb5 100644 --- a/source/java/org/alfresco/repo/web/scripts/dictionary/GetPropertyDef.java +++ b/source/java/org/alfresco/repo/web/scripts/dictionary/PropertyGet.java @@ -41,7 +41,7 @@ import java.util.Map; * @author Saravanan Sellathurai */ -public class GetPropertyDef extends DeclarativeWebScript +public class PropertyGet extends DeclarativeWebScript { private DictionaryService dictionaryservice; private DictionaryHelper dictionaryhelper; diff --git a/source/java/org/alfresco/repo/web/scripts/dictionary/GetSubClassesDef.java b/source/java/org/alfresco/repo/web/scripts/dictionary/SubClassesGet.java similarity index 99% rename from source/java/org/alfresco/repo/web/scripts/dictionary/GetSubClassesDef.java rename to source/java/org/alfresco/repo/web/scripts/dictionary/SubClassesGet.java index 2ad67c3edd..65faa81114 100644 --- a/source/java/org/alfresco/repo/web/scripts/dictionary/GetSubClassesDef.java +++ b/source/java/org/alfresco/repo/web/scripts/dictionary/SubClassesGet.java @@ -39,12 +39,12 @@ import java.util.HashMap; import java.util.Map; /** - * * Webscript to get the Sub-Classdefinitions using classfilter , namespacePrefix and name + * * @author Saravanan Sellathurai */ -public class GetSubClassesDef extends DeclarativeWebScript +public class SubClassesGet extends DeclarativeWebScript { private DictionaryService dictionaryservice; private DictionaryHelper dictionaryhelper;