mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
138d1780cb
5456: (From WCM_DEPLOY)
There were many pure conflicts on license headers, one conflict due to CR-LF and
some other smaller issues to resolve:
-----------------------------------------
Resolved (line endings not cr-lf):
root\projects\repository\config\alfresco\public-services-context.xml
Reverted:
root\projects\web-client\source\web\images\icons\ajax_anim.gif
Reverted or Resolved (License text conflicts):
svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\JndiTest.java
svn resolved root\projects\jndi-client\source\java\org\alfresco\jndi\AVMFileDirContext.java
svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\AVMBulkLoader.java
svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilter.java
svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilterInfoBean.java
svn revert -R root\projects\catalina-virtual\source\java\org\alfresco\mbeans
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\context\AVMStandardContext.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappClassLoader.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappLoader.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMResourceBinding.java
svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostConfig.java
- why the change in method naming convention?
svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHost.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\DefaultAVMResourceBinding.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValveTest.java
svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValve.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostMatch.java
Modified:
root\projects\web-client\source\java\org\alfresco\web\ui\wcm\component\UIDeployWebsite.java (Kevin to check line 330)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
66 lines
2.3 KiB
XML
66 lines
2.3 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<!DOCTYPE beans PUBLIC "-//SPRING/DTD BEAN//EN"
|
|
"http://www.springframework.org/dtd/spring-beans.dtd">
|
|
|
|
<beans>
|
|
<!-- Remote authentication service. -->
|
|
<bean id="authenticationService" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
|
|
<property name="serviceUrl">
|
|
<value>rmi://localhost:50500/authentication</value>
|
|
</property>
|
|
<property name="serviceInterface">
|
|
<value>org.alfresco.service.cmr.security.AuthenticationService</value>
|
|
</property>
|
|
<property name="refreshStubOnConnectFailure">
|
|
<value>true</value>
|
|
</property>
|
|
</bean>
|
|
|
|
<!-- Client Ticket Holder Bean. -->
|
|
<bean id="clientTicketHolder" class="org.alfresco.repo.remote.ClientTicketHolderGlobal"/>
|
|
|
|
<!-- Remote interface for AVM. -->
|
|
<bean id="avmRemote" class="org.alfresco.repo.remote.AVMRemoteImpl">
|
|
<property name="avmRemoteTransport">
|
|
<ref bean="avmRemoteTransport"/>
|
|
</property>
|
|
<property name="clientTicketHolder">
|
|
<ref bean="clientTicketHolder"/>
|
|
</property>
|
|
</bean>
|
|
|
|
<!-- RMI Proxy bean for avmRemoteTransport -->
|
|
<bean id="avmRemoteTransport" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
|
|
<property name="serviceUrl">
|
|
<value>rmi://localhost:50500/avm</value>
|
|
</property>
|
|
<property name="serviceInterface">
|
|
<value>org.alfresco.service.cmr.remote.AVMRemoteTransport</value>
|
|
</property>
|
|
<property name="refreshStubOnConnectFailure">
|
|
<value>true</value>
|
|
</property>
|
|
</bean>
|
|
|
|
<bean id="avmSyncService" class="org.alfresco.repo.remote.AVMSyncServiceClient">
|
|
<property name="avmSyncServiceTransport">
|
|
<ref bean="avmSyncServiceTransport"/>
|
|
</property>
|
|
<property name="clientTicketHolder">
|
|
<ref bean="clientTicketHolder"/>
|
|
</property>
|
|
</bean>
|
|
|
|
<bean id="avmSyncServiceTransport" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
|
|
<property name="serviceUrl">
|
|
<value>rmi://localhost:50500/avmsync</value>
|
|
</property>
|
|
<property name="serviceInterface">
|
|
<value>org.alfresco.service.cmr.remote.AVMSyncServiceTransport</value>
|
|
</property>
|
|
<property name="refreshStubOnConnectFailure">
|
|
<value>true</value>
|
|
</property>
|
|
</bean>
|
|
</beans>
|