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

. Big and juicy application/WCM model refactoring

Browse Source 
- WARNING: this change requires a new DB as the WCM model has changed significantly, yes I have probably broken a few WCM things :)

Previously the following statements were true:
 - Most of the model constants were defined in the ContentModel class - including web-client Application specific model items
 - WCMModel class was a mix of WCM repository and WCM application model constants
 - The applicationModel.xml definition file contained both web-client Application and WCM application model definitions
 - The wcmModel.xml definition file contained both WCM repository and WCM application model definitions

The following statements are now true:
 - All web-client application specific model constants have been moved from ContentModel to a new model constants class ApplicationModel
 - A new WCM application model has been defined with the prefix "wca" and URI: http://www.alfresco.org/model/wcmappmodel/1.0
 - All WCM application specific model constants have been renamed/moved from ContentModel/WCMModel to a new model constants class WCMAppModel
 - The mix of WCM application specific model definitions in contentModel.xml and applicationModel.xml has been moved to a new definition file wcmAppModel.xml
 - A patch is not required for standard Alfresco as only WCM definitions have actually changed

. Fix to issue created during workflow id/name refactor
. Fix to allow forms in the Available Content Forms panel to have correct sandbox/username context for action dialog

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4448 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-11-27 15:03:12 +00:00
parent ef669bec2a
commit 4003f0e36f
26 changed files with 599 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/repo/configuration/ConfigurableServiceImpl.java
View File

@@ -18,7 +18,7 @@ package org.alfresco.repo.configuration;
import java.util.List;
import org.alfresco.model.ContentModel;
import org.alfresco.model.ApplicationModel;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
@@ -38,7 +38,7 @@ public class ConfigurableServiceImpl implements ConfigurableService
public boolean isConfigurable(NodeRef nodeRef)
{
return this.nodeService.hasAspect(nodeRef, ContentModel.ASPECT_CONFIGURABLE);
return this.nodeService.hasAspect(nodeRef, ApplicationModel.ASPECT_CONFIGURABLE);
}
public void makeConfigurable(NodeRef nodeRef)
@@ -46,14 +46,14 @@ public class ConfigurableServiceImpl implements ConfigurableService
if (isConfigurable(nodeRef) == false)
{
// First apply the aspect
this.nodeService.addAspect(nodeRef, ContentModel.ASPECT_CONFIGURABLE, null);
this.nodeService.addAspect(nodeRef, ApplicationModel.ASPECT_CONFIGURABLE, null);
// Next create and add the configurations folder
this.nodeService.createNode(
nodeRef,
ContentModel.ASSOC_CONFIGURATIONS,
ContentModel.ASSOC_CONFIGURATIONS,
ContentModel.TYPE_CONFIGURATIONS);
ApplicationModel.ASSOC_CONFIGURATIONS,
ApplicationModel.ASSOC_CONFIGURATIONS,
ApplicationModel.TYPE_CONFIGURATIONS);
}
}
@@ -65,7 +65,7 @@ public class ConfigurableServiceImpl implements ConfigurableService
List<ChildAssociationRef> assocs = this.nodeService.getChildAssocs(
nodeRef,
RegexQNamePattern.MATCH_ALL,
ContentModel.ASSOC_CONFIGURATIONS);
ApplicationModel.ASSOC_CONFIGURATIONS);
if (assocs.size() != 0)
{
ChildAssociationRef assoc = assocs.get(0);

5
source/java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java
View File

@@ -18,6 +18,7 @@ package org.alfresco.repo.configuration;
import java.util.List;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -79,11 +80,11 @@ public class ConfigurableServiceImplTest extends BaseSpringTest
public void testMakeConfigurable()
{
this.configurableService.makeConfigurable(this.nodeRef);
assertTrue(this.nodeService.hasAspect(this.nodeRef, ContentModel.ASPECT_CONFIGURABLE));
assertTrue(this.nodeService.hasAspect(this.nodeRef, ApplicationModel.ASPECT_CONFIGURABLE));
List<ChildAssociationRef> assocs = this.nodeService.getChildAssocs(
this.nodeRef,
RegexQNamePattern.MATCH_ALL,
ContentModel.ASSOC_CONFIGURATIONS);
ApplicationModel.ASSOC_CONFIGURATIONS);
assertNotNull(assocs);
assertEquals(1, assocs.size());
}