Merge master into feature/RM-4012_UnitTests

This commit is contained in:
Silviu Dinuta
2016-10-31 14:04:14 +02:00
9 changed files with 258 additions and 258 deletions

View File

@@ -1,194 +1,194 @@
<?xml version="1.0" encoding="UTF-8"?>
<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0">
<cm:folder xmlns="" xmlns:twitter="http://www.alfresco.org/model/publishing/twitter/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:facebook="http://www.alfresco.org/model/publishing/facebook/1.0" xmlns:youtube="http://www.alfresco.org/model/publishing/youtube/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:alfcmis="http://www.alfresco.org/model/cmis/1.0/alfcmis" xmlns:pub="http://www.alfresco.org/model/publishing/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:suwf="http://www.alfresco.org/model/workflow/signup/selfsignup/1.0" xmlns:flickr="http://www.alfresco.org/model/publishing/flickr/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:cmisext="http://www.alfresco.org/model/cmis/1.0/cs01ext" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:webdav="http://www.alfresco.org/model/webdav/1.0" xmlns:pubwf="http://www.alfresco.org/model/publishingworkflow/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:linkedin="http://www.alfresco.org/model/publishing/linkedin/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:cloud="http://www.alfresco.org/model/cloud/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" view:childName="cm:surf-config">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>surf-config</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
<view:associations>
<cm:contains>
<cm:folder view:childName="cm:components">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>components</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
<view:associations>
<cm:contains>
<cm:content view:childName="cm:page.title.site~${siteId}~dashboard.xml">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>page.title.site~${siteId}~dashboard.xml</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<cm:content>contentUrl=surf-config/content0.bin|mimetype=application/octet-stream|size=260|encoding=UTF-8|locale=en_US_</cm:content>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
</cm:content>
<cm:content view:childName="cm:page.navigation.site~${siteId}~dashboard.xml">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>page.navigation.site~${siteId}~dashboard.xml</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<cm:content>contentUrl=surf-config/content1.bin|mimetype=application/octet-stream|size=280|encoding=UTF-8|locale=en_US_</cm:content>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
</cm:content>
<cm:content view:childName="cm:page.component-1-1.site~${siteId}~dashboard.xml">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>page.component-1-1.site~${siteId}~dashboard.xml</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<cm:content>contentUrl=surf-config/content2.bin|mimetype=application/octet-stream|size=326|encoding=UTF-8|locale=en_US_</cm:content>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
</cm:content>
<cm:content view:childName="cm:page.component-2-1.site~${siteId}~dashboard.xml">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>page.component-2-1.site~${siteId}~dashboard.xml</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<cm:content>contentUrl=surf-config/content3.bin|mimetype=application/octet-stream|size=270|encoding=UTF-8|locale=en_US_</cm:content>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
</cm:content>
<cm:content view:childName="cm:page.component-2-2.site~${siteId}~dashboard.xml">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>page.component-2-2.site~${siteId}~dashboard.xml</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<cm:content>contentUrl=surf-config/content4.bin|mimetype=application/octet-stream|size=272|encoding=UTF-8|locale=en_US_</cm:content>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
</cm:content>
</cm:contains>
</view:associations>
</cm:folder>
<cm:folder view:childName="cm:pages">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>pages</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
<view:associations>
<cm:contains>
<cm:folder view:childName="cm:site">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>site</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
<view:associations>
<cm:contains>
<cm:folder view:childName="cm:${siteId}">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>${siteId}</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
<view:associations>
<cm:contains>
<cm:content view:childName="cm:dashboard.xml">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>dashboard.xml</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<cm:content>contentUrl=surf-config/content5.bin|mimetype=application/octet-stream|size=481|encoding=UTF-8|locale=en_US_</cm:content>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
</cm:content>
</cm:contains>
</view:associations>
</cm:folder>
</cm:contains>
</view:associations>
</cm:folder>
</cm:contains>
</view:associations>
</cm:folder>
</cm:contains>
</view:associations>
</cm:folder>
</view:view>
<?xml version="1.0" encoding="UTF-8"?>
<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0">
<cm:folder xmlns="" xmlns:twitter="http://www.alfresco.org/model/publishing/twitter/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:facebook="http://www.alfresco.org/model/publishing/facebook/1.0" xmlns:youtube="http://www.alfresco.org/model/publishing/youtube/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:alfcmis="http://www.alfresco.org/model/cmis/1.0/alfcmis" xmlns:pub="http://www.alfresco.org/model/publishing/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:suwf="http://www.alfresco.org/model/workflow/signup/selfsignup/1.0" xmlns:flickr="http://www.alfresco.org/model/publishing/flickr/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:cmisext="http://www.alfresco.org/model/cmis/1.0/cs01ext" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:webdav="http://www.alfresco.org/model/webdav/1.0" xmlns:pubwf="http://www.alfresco.org/model/publishingworkflow/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:linkedin="http://www.alfresco.org/model/publishing/linkedin/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:cloud="http://www.alfresco.org/model/cloud/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" view:childName="cm:surf-config">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>surf-config</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
<view:associations>
<cm:contains>
<cm:folder view:childName="cm:components">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>components</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
<view:associations>
<cm:contains>
<cm:content view:childName="cm:page.title.site~${siteId}~dashboard.xml">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>page.title.site~${siteId}~dashboard.xml</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<cm:content>contentUrl=surf-config/content0.bin|mimetype=application/octet-stream|size=260|encoding=UTF-8|locale=en_US_</cm:content>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
</cm:content>
<cm:content view:childName="cm:page.navigation.site~${siteId}~dashboard.xml">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>page.navigation.site~${siteId}~dashboard.xml</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<cm:content>contentUrl=surf-config/content1.bin|mimetype=application/octet-stream|size=280|encoding=UTF-8|locale=en_US_</cm:content>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
</cm:content>
<cm:content view:childName="cm:page.component-1-1.site~${siteId}~dashboard.xml">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>page.component-1-1.site~${siteId}~dashboard.xml</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<cm:content>contentUrl=surf-config/content2.bin|mimetype=application/octet-stream|size=326|encoding=UTF-8|locale=en_US_</cm:content>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
</cm:content>
<cm:content view:childName="cm:page.component-2-1.site~${siteId}~dashboard.xml">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>page.component-2-1.site~${siteId}~dashboard.xml</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<cm:content>contentUrl=surf-config/content3.bin|mimetype=application/octet-stream|size=270|encoding=UTF-8|locale=en_US_</cm:content>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
</cm:content>
<cm:content view:childName="cm:page.component-2-2.site~${siteId}~dashboard.xml">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>page.component-2-2.site~${siteId}~dashboard.xml</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<cm:content>contentUrl=surf-config/content4.bin|mimetype=application/octet-stream|size=272|encoding=UTF-8|locale=en_US_</cm:content>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
</cm:content>
</cm:contains>
</view:associations>
</cm:folder>
<cm:folder view:childName="cm:pages">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>pages</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
<view:associations>
<cm:contains>
<cm:folder view:childName="cm:site">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>site</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
<view:associations>
<cm:contains>
<cm:folder view:childName="cm:${siteId}">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>${siteId}</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
<view:associations>
<cm:contains>
<cm:content view:childName="cm:dashboard.xml">
<view:aspects>
<sys:localized></sys:localized>
<sys:referenceable></sys:referenceable>
<cm:auditable></cm:auditable>
</view:aspects>
<view:acl></view:acl>
<view:properties>
<cm:name>dashboard.xml</cm:name>
<sys:store-identifier>SpacesStore</sys:store-identifier>
<sys:locale>en_US_</sys:locale>
<cm:content>contentUrl=surf-config/content5.bin|mimetype=application/octet-stream|size=481|encoding=UTF-8|locale=en_US_</cm:content>
<sys:store-protocol>workspace</sys:store-protocol>
<cm:isIndexed>false</cm:isIndexed>
</view:properties>
</cm:content>
</cm:contains>
</view:associations>
</cm:folder>
</cm:contains>
</view:associations>
</cm:folder>
</cm:contains>
</view:associations>
</cm:folder>
</cm:contains>
</view:associations>
</cm:folder>
</view:view>

View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<component>
<guid>page.title.site~${siteId}~dashboard</guid>
<scope>page</scope>
<region-id>title</region-id>
<source-id>site/${siteId}/dashboard</source-id>
<url>/components/title/collaboration-title</url>
</component>
<?xml version="1.0" encoding="UTF-8"?>
<component>
<guid>page.title.site~${siteId}~dashboard</guid>
<scope>page</scope>
<region-id>title</region-id>
<source-id>site/${siteId}/dashboard</source-id>
<url>/components/title/collaboration-title</url>
</component>

View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<component>
<guid>page.navigation.site~${siteId}~dashboard</guid>
<scope>page</scope>
<region-id>navigation</region-id>
<source-id>site/${siteId}/dashboard</source-id>
<url>/components/navigation/collaboration-navigation</url>
</component>
<?xml version="1.0" encoding="UTF-8"?>
<component>
<guid>page.navigation.site~${siteId}~dashboard</guid>
<scope>page</scope>
<region-id>navigation</region-id>
<source-id>site/${siteId}/dashboard</source-id>
<url>/components/navigation/collaboration-navigation</url>
</component>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<component>
<guid>page.component-1-1.site~${siteId}~dashboard</guid>
<scope>page</scope>
<region-id>component-1-1</region-id>
<source-id>site/${siteId}/dashboard</source-id>
<url>/components/dashlets/colleagues</url>
<properties>
<height>504</height>
</properties>
</component>
<?xml version="1.0" encoding="UTF-8"?>
<component>
<guid>page.component-1-1.site~${siteId}~dashboard</guid>
<scope>page</scope>
<region-id>component-1-1</region-id>
<source-id>site/${siteId}/dashboard</source-id>
<url>/components/dashlets/colleagues</url>
<properties>
<height>504</height>
</properties>
</component>

View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<component>
<guid>page.component-2-1.site~${siteId}~dashboard</guid>
<scope>page</scope>
<region-id>component-2-1</region-id>
<source-id>site/${siteId}/dashboard</source-id>
<url>/components/dashlets/docsummary</url>
</component>
<?xml version="1.0" encoding="UTF-8"?>
<component>
<guid>page.component-2-1.site~${siteId}~dashboard</guid>
<scope>page</scope>
<region-id>component-2-1</region-id>
<source-id>site/${siteId}/dashboard</source-id>
<url>/components/dashlets/docsummary</url>
</component>

View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<component>
<guid>page.component-2-2.site~${siteId}~dashboard</guid>
<scope>page</scope>
<region-id>component-2-2</region-id>
<source-id>site/${siteId}/dashboard</source-id>
<url>/components/dashlets/activityfeed</url>
</component>
<?xml version="1.0" encoding="UTF-8"?>
<component>
<guid>page.component-2-2.site~${siteId}~dashboard</guid>
<scope>page</scope>
<region-id>component-2-2</region-id>
<source-id>site/${siteId}/dashboard</source-id>
<url>/components/dashlets/activityfeed</url>
</component>

View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<page>
<title>Records Management Site Dashboard</title>
<title-id>page.rmSiteDashboard.title</title-id>
<description>Records Management site's dashboard page</description>
<description-id>page.rmSiteDashboard.description</description-id>
<template-instance>dashboard-2-columns-wide-right</template-instance>
<authentication>user</authentication>
<properties>
<sitePages>[{"pageId":"documentlibrary"}, {"pageId":"rm-search"}]</sitePages>
<pageMetadata>{"documentlibrary":{"titleId":"page.rmDocumentLibrary.title", "descriptionId":"page.rmDocumentLibrary.description", "type":"dod5015"}}</pageMetadata>
</properties>
</page>
<?xml version="1.0" encoding="UTF-8"?>
<page>
<title>Records Management Site Dashboard</title>
<title-id>page.rmSiteDashboard.title</title-id>
<description>Records Management site's dashboard page</description>
<description-id>page.rmSiteDashboard.description</description-id>
<template-instance>dashboard-2-columns-wide-right</template-instance>
<authentication>user</authentication>
<properties>
<sitePages>[{"pageId":"documentlibrary"}, {"pageId":"rm-search"}]</sitePages>
<pageMetadata>{"documentlibrary":{"titleId":"page.rmDocumentLibrary.title", "descriptionId":"page.rmDocumentLibrary.description", "type":"dod5015"}}</pageMetadata>
</properties>
</page>

View File

@@ -222,7 +222,7 @@ public class RMSitesImplUnitTest extends BaseUnitTest
//mock Parameters
Parameters mockedParameters = mock(Parameters.class);
when(mockedParameters.getParameter(PARAM_SKIP_ADDTOFAVORITES)).thenReturn("true");
when(mockedParameters.getParameter(PARAM_SKIP_ADDTOFAVORITES)).thenReturn(Boolean.toString(true));
//call createRMSite method
rmSitesImpl.createRMSite(toCreate, mockedParameters);

View File

@@ -142,7 +142,7 @@ public class RMSiteEntityResourceUnitTest extends BaseUnitTest
{
String siteId = RM_SITE_ID;
Params parameters = mock(Params.class);
when(parameters.getParameter(PERMANENT_PARAMETER)).thenReturn("true");
when(parameters.getParameter(PERMANENT_PARAMETER)).thenReturn(Boolean.toString(true));
try
{
rmSiteEntityResource.delete(siteId, parameters);