From 7e5df1c36d97c725dc36a22692ce0a844d9b615b Mon Sep 17 00:00:00 2001
From: Mike Hatfield <mike.hatfield@alfresco.com>
Date: Tue, 16 Dec 2008 15:57:57 +0000
Subject: [PATCH] Merged DEV/SHARE-LINKS to HEAD   11867: Fix issues raised by
 Mike's code review   11906: Finish Links Dashlet   12080: Fix bugs raised by
 3d code review   12142: Missed Dashlet Code   12405: Final run-through of
 Links component before merge to HEAD   12406: Further minor edits to Links

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12416 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/core-services-context.xml | 40 +++++++++++------------
 config/alfresco/model/linksModel.xml      |  2 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index 7ad8b4c221..48c348020c 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -86,9 +86,9 @@
          <map>
            <!-- MBeans to register with alfrescoMBeanServer -->
            <entry key="Alfresco:Name=VirtServerRegistry,Type=VirtServerRegistry" value-ref="VirtServerRegistry"/>
-           <entry key="Alfresco:Name=FileServerConfig,Type=FileServerConfig" value-ref="FileServerConfig"/>
-           <entry key="Alfresco:Name=Log4jHierarchy,Type=Log4JHierarchy" value-ref="log4jHierarchy"/>
-           <entry key="Alfresco:Name=RepoServerMgmt,Type=RepoServerMgmt" value-ref="RepoServerMgmt"/>
+           <entry key="Alfresco:Name=FileServerConfig,Type=FileServerConfig" value-ref="FileServerConfig"/>
+           <entry key="Alfresco:Name=Log4jHierarchy,Type=Log4JHierarchy" value-ref="log4jHierarchy"/>
+           <entry key="Alfresco:Name=RepoServerMgmt,Type=RepoServerMgmt" value-ref="RepoServerMgmt"/>
          </map>
        </property>
     </bean>
@@ -122,17 +122,17 @@
 
     <bean id="FileServerConfig"
           class="org.alfresco.filesys.FileServerConfig">
-        <property name="fileServerConfiguration"><ref bean="fileServerConfiguration"/></property>
-        <property name="ftpServer"><ref bean="ftpServer"/></property>
-        <property name="cifsServer"><ref bean="cifsServer"/></property>
+        <property name="fileServerConfiguration"><ref bean="fileServerConfiguration"/></property>
+        <property name="ftpServer"><ref bean="ftpServer"/></property>
+        <property name="cifsServer"><ref bean="cifsServer"/></property>
         <property name="nfsServer"><ref bean="nfsServer"/></property> 
     </bean>
 
-    <!-- Log4J Hierarchy -->
-    <bean id="log4jHierarchy" class="org.apache.log4j.jmx.HierarchyDynamicMBean"/>
+    <!-- Log4J Hierarchy -->
+    <bean id="log4jHierarchy" class="org.apache.log4j.jmx.HierarchyDynamicMBean"/>
 
-    <bean id="log4JHierarchyInit" class="org.alfresco.repo.admin.Log4JHierarchyInit" init-method="init">
-    	<property name="log4jHierarchy" ref="log4jHierarchy"/>
+    <bean id="log4JHierarchyInit" class="org.alfresco.repo.admin.Log4JHierarchyInit" init-method="init">
+    	<property name="log4jHierarchy" ref="log4jHierarchy"/>
 
         <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
         <!-- Supplementary log4j.properties files                                       -->
@@ -204,15 +204,15 @@
                 <value>classpath*:alfresco/extension/dev-log4j.properties</value>
             </list>
         </property>
-    </bean>
+    </bean>
 
 
     <bean id="RepoServerMgmt" class="org.alfresco.repo.admin.RepoServerMgmt">
-        <property name="transactionService"><ref bean="transactionService"/></property>
-        <property name="authenticationService"><ref bean="authenticationService"/></property>
-        <property name="maxUsers"><value>${server.maxusers}</value></property>
-        <property name="singleUserOnly"><value>${server.singleuseronly.name}</value></property>
-    </bean>
+        <property name="transactionService"><ref bean="transactionService"/></property>
+        <property name="authenticationService"><ref bean="authenticationService"/></property>
+        <property name="maxUsers"><value>${server.maxusers}</value></property>
+        <property name="singleUserOnly"><value>${server.singleuseronly.name}</value></property>
+    </bean>
 
 
     <!-- Datasource bean -->
@@ -260,9 +260,9 @@
     <bean id="transactionService" class="org.alfresco.repo.transaction.TransactionServiceImpl">
         <property name="transactionManager">
             <ref bean="transactionManager" />
-        </property>
-        <property name="sysAdminCache">
-            <ref bean="sysAdminCache"/>
+        </property>
+        <property name="sysAdminCache">
+            <ref bean="sysAdminCache"/>
         </property>
         <property name="allowWrite">
             <value>${server.transaction.allow-writes}</value>
@@ -929,7 +929,7 @@
                 <!-- Blog Integration model -->
                 <value>alfresco/model/blogIntegrationModel.xml</value>
 
-		<!-- Links model -->
+                <!-- Links model -->
                 <value>alfresco/model/linksModel.xml</value>
 
                 <!-- Deprecated types -->
diff --git a/config/alfresco/model/linksModel.xml b/config/alfresco/model/linksModel.xml
index 884efab877..b2d7ae4018 100644
--- a/config/alfresco/model/linksModel.xml
+++ b/config/alfresco/model/linksModel.xml
@@ -22,7 +22,7 @@
       <type name="lnk:link">
          <parent>cm:content</parent>
          <properties>
-            <property name="lnk:linkTitle">
+            <property name="lnk:title">
                <title>Link Title</title>
                <type>d:text</type>
                <mandatory>false</mandatory>