Merge from HEAD to WCM-DEV2.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-09-02 18:19:00 +00:00
parent db3c29b45e
commit 820da6ecab
147 changed files with 9873 additions and 1289 deletions

View File

@@ -355,7 +355,7 @@
</property>
</bean>
<bean id="script" class="org.alfresco.repo.action.executer.ScriptActionExecutor" parent="action-executer">
<bean id="script" class="org.alfresco.repo.action.executer.ScriptActionExecuter" parent="action-executer">
<property name="serviceRegistry">
<ref bean="ServiceRegistry" />
</property>
@@ -363,10 +363,16 @@
<ref bean="personService" />
</property>
<property name="storeUrl">
<value>${spaces.store}</value>
<value>${spaces.store}</value>
</property>
<property name="companyHomePath">
<value>/${spaces.company_home.childname}</value>
<value>/${spaces.company_home.childname}</value>
</property>
</bean>
<bean id="counter" class="org.alfresco.repo.action.executer.CounterIncrementActionExecuter" parent="action-executer">
<property name="nodeService">
<ref bean="nodeService" /> <!-- runtime nodeService -->
</property>
</bean>