Merged V2.0 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5198 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5199 .
      - WCM Tutorial bootstrap removal
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5199 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5200 .
      - AWC-1141: Clipboard missing item


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-02-20 15:18:16 +00:00
parent e7c83d8731
commit 7643ba276c
3 changed files with 0 additions and 29 deletions

View File

@@ -152,10 +152,6 @@
<prop key="location">alfresco/bootstrap/tutorial.xml</prop> <prop key="location">alfresco/bootstrap/tutorial.xml</prop>
<prop key="messages">alfresco/messages/bootstrap-tutorial</prop> <prop key="messages">alfresco/messages/bootstrap-tutorial</prop>
</props> </props>
<props>
<prop key="path">/${spaces.company_home.childname}/${spaces.guest_home.childname}</prop>
<prop key="location">alfresco/bootstrap/wcmtutorial.xml</prop>
</props>
<props> <props>
<prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.childname}</prop> <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.childname}</prop>
<prop key="location">alfresco/templates/software_engineering_project.xml</prop> <prop key="location">alfresco/templates/software_engineering_project.xml</prop>

View File

@@ -1,25 +0,0 @@
<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0"
xmlns:cm="http://www.alfresco.org/model/content/1.0"
xmlns:app="http://www.alfresco.org/model/application/1.0">
<!--
<cm:folder>
<app:uifacets />
<cm:name>${tutorial.space.name}</cm:name>
<cm:description>${tutorial.space.description}</cm:description>
<app:icon>space-icon-doc</app:icon>
<cm:contains>
-->
<cm:content>
<app:uifacets />
<cm:name>WCM-Tutorial.pdf</cm:name>
<cm:title>WCM-Tutorial</cm:title>
<cm:description>Introduction to WCM capabilities.</cm:description>
<cm:content>contentUrl=classpath:alfresco/bootstrap/WCM-Tutorial.pdf|mimetype=application/pdf|size=|encoding=</cm:content>
</cm:content>
<!--
</cm:contains>
</cm:folder>
-->
</view:view>