inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged DEV/SHARE-LINKS to HEAD

Browse Source 
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
This commit is contained in:
Mike Hatfield
2008-12-16 15:57:57 +00:00
parent 0e3914fadc
commit 7e5df1c36d
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
config/alfresco/core-services-context.xml
View File

@@ -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 -->

2
config/alfresco/model/linksModel.xml
View File

@@ -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>