Merged V3.0 to HEAD

11481: ETHREEOH-499 - Full colour icons for unavailable buttons in wiki page component. ETHREEOH-506 - Incorrect delete wiki page icon
   11482: Re-added repo blog-action to allow external blog publishing from Share client
   11485: ETHREEOH-155 Incorrect display of "Calendar" page
   11488: Fixed: ETHREEOH-553 Members list is not sorted alphabetically

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12443 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mike Hatfield
2008-12-17 12:22:09 +00:00
parent 7f41a56382
commit 39b0754c11
2 changed files with 79 additions and 0 deletions

View File

@@ -41,6 +41,7 @@
<import resource="classpath:alfresco/linkvalidation-service-context.xml"/>
<import resource="classpath:alfresco/remote-services-context.xml"/>
<import resource="classpath*:alfresco/office-addin-context.xml"/>
<import resource="classpath:alfresco/blog-context.xml"/>
<import resource="classpath:alfresco/thumbnail-service-context.xml"/>
<import resource="classpath:alfresco/preference-service-context.xml"/>
<import resource="classpath:alfresco/swf-transform-context.xml"/>

View File

@@ -0,0 +1,78 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<beans>
<!-- Blog Integration Service -->
<bean id="BlogIntegrationService" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces">
<value>org.alfresco.repo.blogIntegration.BlogIntegrationService</value>
</property>
<property name="target">
<ref bean="blogIntegrationService"/>
</property>
<property name="interceptorNames">
<list>
<idref local="BlogIntegrationService_transaction"/>
<idref bean="AuditMethodInterceptor"/>
<idref bean="exceptionTranslator"/>
<idref local="BlogIntegrationService_security"/>
</list>
</property>
</bean>
<bean id="BlogIntegrationService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
<property name="transactionManager">
<ref bean="transactionManager"/>
</property>
<property name="transactionAttributes">
<props>
<prop key="*">${server.transaction.mode.default}</prop>
</props>
</property>
</bean>
<bean id="BlogIntegrationService_security" class="org.alfresco.repo.security.permissions.impl.AlwaysProceedMethodInterceptor" />
<bean id="blogIntegrationService" class="org.alfresco.repo.blogIntegration.BlogIntegrationServiceImpl">
<property name="nodeService" ref="NodeService"/>
<property name="contentService" ref="ContentService"/>
</bean>
<!-- Blog Integration Implementations -->
<bean id="baseBlogIntegrationImplmentation" abstract="true" init-method="register">
<property name="blogIntegrationService" ref="blogIntegrationService"/>
</bean>
<bean id="wordPressBlogIntegration" parent="baseBlogIntegrationImplmentation" class="org.alfresco.repo.blogIntegration.wordpress.WordPressIntegration">
<property name="name" value="wordpress"/>
<property name="displayName" value="WordPress"/>
</bean>
<bean id="typePadBlogIntegration" parent="baseBlogIntegrationImplmentation" class="org.alfresco.repo.blogIntegration.typepad.TypepadIntegration">
<property name="name" value="typepad"/>
<property name="displayName" value="Typepad"/>
</bean>
<!-- Blog Repository Actions -->
<bean id="blog-post" class="org.alfresco.repo.action.executer.BlogAction" parent="action-executer">
<property name="nodeService">
<ref bean="nodeService" />
</property>
<property name="dictionaryService">
<ref bean="dictionaryService" />
</property>
<property name="blogIntegrationService">
<ref bean="blogIntegrationService" />
</property>
<property name="applicableTypes">
<list>
<value>{http://www.alfresco.org/model/content/1.0}null</value>
</list>
</property>
</bean>
</beans>