ALF-10549 - VtiServerCustomResponse bean definition missing ScriptUtils bean ref. (and not suppressed from Repo browser)

Trivial tidying to associated files.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30839 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mike Hatfield
2011-09-29 09:11:59 +00:00
parent 79508da9fc
commit da831724d7
2 changed files with 49 additions and 46 deletions

View File

@@ -3,46 +3,49 @@
<beans> <beans>
<bean id="doclibCustomVtiProperties" parent="common-placeholder-configurer"> <bean id="doclibCustomVtiProperties" parent="common-placeholder-configurer">
<property name="locations"> <property name="locations">
<list> <list>
<value>classpath*:alfresco/module/org.alfresco.module.vti/context/vti.properties</value> <value>classpath*:alfresco/module/org.alfresco.module.vti/context/vti.properties</value>
<!-- Override --> <!-- Override -->
<value>classpath*:alfresco/extension/custom-vti.properties</value> <value>classpath*:alfresco/extension/custom-vti.properties</value>
</list> </list>
</property> </property>
<property name="nullValue" value="null" /> <property name="nullValue" value="null" />
<property name="properties"> <property name="properties">
<props> <props>
<prop key="vti.server.external.port">0</prop> <prop key="vti.server.external.port">0</prop>
<prop key="vti.server.external.host">null</prop> <prop key="vti.server.external.host">null</prop>
</props> </props>
</property> </property>
</bean> </bean>
<bean id="doclibCustomVtiServer" class="org.alfresco.repo.jscript.app.VtiServerCustomResponse"> <bean id="doclibCustomVtiServer" class="org.alfresco.repo.jscript.app.VtiServerCustomResponse">
<property name="port"> <property name="scriptUtils">
<value>${vti.server.external.port}</value> <ref bean="utilsScript" />
</property> </property>
<property name="host"> <property name="sysAdminParams">
<value>${vti.server.external.host}</value> <ref bean="sysAdminParams" />
</property> </property>
<property name="sysAdminParams"> <property name="port">
<ref bean="sysAdminParams" /> <value>${vti.server.external.port}</value>
</property> </property>
</bean> <property name="host">
<value>${vti.server.external.host}</value>
</property>
</bean>
<bean id="slingshotDocLibCustomResponse" parent="baseJavaScriptExtension" class="org.alfresco.repo.jscript.SlingshotDocLibCustomResponse"> <bean id="slingshotDocLibCustomResponse" parent="baseJavaScriptExtension" class="org.alfresco.repo.jscript.SlingshotDocLibCustomResponse">
<property name="extensionName"> <property name="extensionName">
<value>slingshotDocLib</value> <value>slingshotDocLib</value>
</property> </property>
<property name="customResponses"> <property name="customResponses">
<map> <map>
<entry key="vtiServer"> <entry key="vtiServer">
<ref bean="doclibCustomVtiServer"/> <ref bean="doclibCustomVtiServer"/>
</entry> </entry>
</map> </map>
</property> </property>
</bean> </bean>
</beans> </beans>

View File

@@ -56,6 +56,16 @@ public class VtiServerCustomResponse implements CustomResponse
this.scriptUtils = scriptUtils; this.scriptUtils = scriptUtils;
} }
/**
* Setter for sysAdminParams
*
* @param sysAdminParams
*/
public void setSysAdminParams(SysAdminParams sysAdminParams)
{
this.sysAdminParams = sysAdminParams;
}
/** /**
* Setter for vtiServer Port * Setter for vtiServer Port
* *
@@ -76,16 +86,6 @@ public class VtiServerCustomResponse implements CustomResponse
this.vtiServerHost = vtiServerHost; this.vtiServerHost = vtiServerHost;
} }
/**
* Setter for sysAdminParams
*
* @param sysAdminParams
*/
public void setSysAdminParams(SysAdminParams sysAdminParams)
{
this.sysAdminParams = sysAdminParams;
}
/** /**
* Populates the DocLib webscript response with custom metadata * Populates the DocLib webscript response with custom metadata
* *