From 363de81b4bbee303a28927779b197057b61c11e8 Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Sun, 9 Dec 2007 14:27:10 +0000
Subject: [PATCH] Fix up app-context and namespace issues with blog integration

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7610 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/application-context.xml             | 1 +
 config/alfresco/templates/collaboration_project.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/alfresco/application-context.xml b/config/alfresco/application-context.xml
index 43219eff75..6e85c01412 100644
--- a/config/alfresco/application-context.xml
+++ b/config/alfresco/application-context.xml
@@ -39,6 +39,7 @@
     <import resource="classpath:alfresco/remote-services-context.xml"/>
     <import resource="classpath:alfresco/office-addin-context.xml"/>
     <import resource="classpath:alfresco/projects-context.xml"/>
+    <import resource="classpath:alfresco/blog-context.xml"/>
     <import resource="classpath*:alfresco/patch/*-context.xml" />
     <import resource="classpath*:alfresco/domain/*-context.xml" />
 
diff --git a/config/alfresco/templates/collaboration_project.xml b/config/alfresco/templates/collaboration_project.xml
index c23e2b2992..3792a6ce40 100644
--- a/config/alfresco/templates/collaboration_project.xml
+++ b/config/alfresco/templates/collaboration_project.xml
@@ -6,7 +6,7 @@
     <view:exporterVersion>2.9.0 (dev r7521)</view:exporterVersion>
     <view:exportOf>/app:company_home/app:projects</view:exportOf>
   </view:metadata>
-  <app:projectfolder xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:wcmwf="http://www.alfresco.org/model/wcmworkflow/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:alf="http://www.alfresco.org" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:ia="com.infoaxon.alfresco.calendar" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:custom="custom.model" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns="" view:childName="cm:New Project">
+  <app:projectfolder xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:wcmwf="http://www.alfresco.org/model/wcmworkflow/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:alf="http://www.alfresco.org" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:ia="com.infoaxon.alfresco.calendar" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:custom="custom.model" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns="" view:childName="cm:New Project">
     <view:aspects>
       <cm:auditable></cm:auditable>
       <sys:referenceable></sys:referenceable>