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 V4.1-BUG-FIX to HEAD

Browse Source 
44740: BDE-91 - added ability to enable and disable some RMI services through config.
   44744: Incorrect service url used for Links RSS feed. Code tidy up.
   44754: Fix performance degradation when using SSO header based authentication config:
    - The SlingshotAlfrescoConnector used when configuring header based SSO for Share was not extending the RequestCachingConnector class - means it was missing out on the free caching of identical GET requests per page render
    - This makes a huge difference to the number of small requests required to build pages in Share 4.0+, particularly dashboards and document details pages.
   44759: ALF-17245: Merged PATCHES/V3.4.10 to V4.1-BUG-FIX
      44104: Merged DEV to PATCHES/V3.4.10
         43953: MNT-214 : Modification date is lost when Excel 2003 is closed
            The modification date is now updated during rename operation.
      44711: Merged DEV to PATCHES/V3.4.10
         44699: MNT-214 : Modification date is lost when Excel 2003 is closed
            A fix to save modification date in shuffle rename operation.
   44760: ALF-17246: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      44757: ALF-17073: Advanced search - Lucene query construction - Change between 3.4.9 and 3.4.10
      - In the fix to ALF-12666 followed by ALF-14699 we somehow lost the ability to distinguish ANDs from ORs. The 'additional attributes' should be part of an OR, but we still need to AND together multiple ORs if the AND operator is specified. 
   44761: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      44748: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX
         42311: ALF-17235: Merged PATCHES/V4.0.2 to PATCHES/V3.4.10
            39939: ALF-15001: Gracefully handle stale NodeRefs in query results in DMDiscoveryServicePort
            - SOLR makes this more likely to occur
         44104: ALF-17236: Merged DEV to PATCHES/V3.4.10
            43953: MNT-214 : Modification date is lost when Excel 2003 is closed
               The modification date is now updated during rename operation.
         44415: ALF-17237: Merged DEV to PATCHES/V3.4.10
           MNT-211 : versionable aspect lost from .csv files edited over CIFS using Office 2003
         44711: ALF-17236: Merged DEV to PATCHES/V3.4.10
            44699: MNT-214 : Modification date is lost when Excel 2003 is closed
               A fix to save modification date in shuffle rename operation.
   44762: Merged V4.1 to V4.1-BUG-FIX
      44743: ALF-17117: Created article or publication cant be viewed on WQS site
         - Further corrections to locking to avoid deadlocks


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44763 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-12-17 14:55:13 +00:00
parent cfe1c63566
commit 6bb340048a
5 changed files with 76 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@
<property name="retries" value="${alfresco.rmi.services.retries}" />
</bean>
<bean id="baseServiceExporter" class="org.springframework.remoting.rmi.RmiServiceExporter" abstract="true">
<bean id="baseServiceExporter" class="org.alfresco.util.remote.server.AlfrescoRMIServiceExporter" abstract="true">
<property name="registryPort" value="${alfresco.rmi.services.port}" />
<property name="registryServerSocketFactory" ref="hostConfigurableSocketFactory" />
<property name="registryClientSocketFactory" ref="hostConfigurableSocketFactory" />

25
config/alfresco/remote-services-context.xml
View File

@@ -20,7 +20,7 @@
<!-- The RMI wrapper around the AVM remote interface. -->
<bean id="avmRemoteService" class="org.springframework.remoting.rmi.RmiServiceExporter" parent="baseServiceExporter">
<bean id="avmRemoteService" class="org.alfresco.util.remote.server.AlfrescoRMIServiceExporter" parent="baseServiceExporter">
<property name="service">
<ref bean="avmRemoteTransport"/>
</property>
@@ -33,6 +33,9 @@
<property name="servicePort">
<value>${avm.rmi.service.port}</value>
</property>
<property name="enabled">
<value>${avm.rmi.service.enabled}</value>
</property>
<property name="clientSocketFactory">
<ref bean="hostConfigurableSocketFactory" />
</property>
@@ -47,7 +50,7 @@
</property>
</bean>
<bean id="avmSyncServiceTransportRMI" class="org.springframework.remoting.rmi.RmiServiceExporter" parent="baseServiceExporter">
<bean id="avmSyncServiceTransportRMI" class="org.alfresco.util.remote.server.AlfrescoRMIServiceExporter" parent="baseServiceExporter">
<property name="service">
<ref bean="avmSyncServiceTransport"/>
</property>
@@ -60,13 +63,16 @@
<property name="servicePort">
<value>${avmsync.rmi.service.port}</value>
</property>
<property name="enabled">
<value>${avmsync.rmi.service.enabled}</value>
</property>
<property name="clientSocketFactory">
<ref bean="hostConfigurableSocketFactory" />
</property>
</bean>
<!-- The AuthenticationService exported as an RMI service. -->
<bean id="rmiAuthenticationService" class="org.springframework.remoting.rmi.RmiServiceExporter" parent="baseServiceExporter">
<bean id="rmiAuthenticationService" class="org.alfresco.util.remote.server.AlfrescoRMIServiceExporter" parent="baseServiceExporter">
<property name="service">
<ref bean="AuthenticationService"/>
</property>
@@ -76,6 +82,9 @@
<property name="serviceName">
<value>authentication</value>
</property>
<property name="enabled">
<value>${authentication.rmi.service.enabled}</value>
</property>
<property name="servicePort">
<value>${authentication.rmi.service.port}</value>
</property>
@@ -136,7 +145,7 @@
</bean>
<!-- The RMI export of the repo remote transport. -->
<bean id="repoRemoteTransportRMI" class="org.springframework.remoting.rmi.RmiServiceExporter" parent="baseServiceExporter">
<bean id="repoRemoteTransportRMI" class="org.alfresco.util.remote.server.AlfrescoRMIServiceExporter" parent="baseServiceExporter">
<property name="service">
<ref bean="repoRemoteTransport"/>
</property>
@@ -146,6 +155,9 @@
<property name="serviceName">
<value>repo</value>
</property>
<property name="enabled">
<value>${repo.rmi.service.enabled}</value>
</property>
<property name="servicePort">
<value>${repo.rmi.service.port}</value>
</property>
@@ -165,7 +177,7 @@
</bean>
<!-- The RMI export of the ActionService Transport -->
<bean id="actionServiceTransportRMI" class="org.springframework.remoting.rmi.RmiServiceExporter" parent="baseServiceExporter">
<bean id="actionServiceTransportRMI" class="org.alfresco.util.remote.server.AlfrescoRMIServiceExporter" parent="baseServiceExporter">
<property name="service">
<ref bean="actionServiceTransport"/>
</property>
@@ -175,6 +187,9 @@
<property name="serviceName">
<value>action</value>
</property>
<property name="enabled">
<value>${action.rmi.service.enabled}</value>
</property>
<property name="servicePort">
<value>${action.rmi.service.port}</value>
</property>

11
config/alfresco/repository.properties
View File

@@ -543,6 +543,17 @@ action.rmi.service.port=50506
deployment.rmi.service.port=50507
monitor.rmi.service.port=50508
#
# enable or disable individual RMI services
#
avm.rmi.service.enabled=true
avmsync.rmi.service.enabled=true
authentication.rmi.service.enabled=true
repo.rmi.service.enabled=true
action.rmi.service.enabled=true
deployment.rmi.service.enabled=true
monitor.rmi.service.enabled=true
# Should the Mbean server bind to an existing server. Set to true for most application servers.
# false for WebSphere clusters.

6
source/java/org/alfresco/filesys/repo/ContentDiskDriver.java
View File

@@ -3374,6 +3374,9 @@ public class ContentDiskDriver extends AlfrescoTxDiskDriver implements DiskInter
newState.setFilesystemObject(nodeToMoveRef);
newState.setFileSize(oldState.getFileSize());
// the date is updated to be properly saved when the document is closed, see MNT-214
newState.updateModifyDateTime(oldState.getModifyDateTime());
// Make sure the old file state is cached for a short while, the file may not be open so the
// file state could be expired
@@ -3424,6 +3427,9 @@ public class ContentDiskDriver extends AlfrescoTxDiskDriver implements DiskInter
newState.setFilesystemObject(finalTargetNodeRef);
newState.setFileSize(oldState.getFileSize());
// the date is updated to be properly saved when the document is closed, see MNT-214
newState.updateModifyDateTime(oldState.getModifyDateTime());
// Make sure the old file state is cached for a short while, the file may not be open so the
// file state could be expired

37
source/java/org/alfresco/util/remote/server/AlfrescoRMIServiceExporter.java Normal file
View File

@@ -0,0 +1,37 @@
package org.alfresco.util.remote.server;
import java.rmi.RemoteException;
import org.springframework.remoting.rmi.RmiServiceExporter;
public class AlfrescoRMIServiceExporter extends RmiServiceExporter
{
private boolean enabled = true;
public void setEnabled(boolean enabled)
{
this.enabled = enabled;
}
public boolean isEnabled()
{
return enabled;
}
public void prepare() throws RemoteException
{
if(enabled)
{
super.prepare();
}
}
public void destroy() throws RemoteException
{
if(enabled)
{
super.destroy();
}
}
}