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.0 to HEAD

Browse Source 
33056: Fix for ALF-12280: Upgrading from version 3.4.7 to 4.0.0 failed with MS SQL database
    - Added dialect-specific script for SQL Server
   33059: Fix for ALF-12127, ALF-11161, ALF-11988
      Merged BRANCHES/DEV/THOR1 to BRANCHES/V4.0
         33049: Fixed follow issues on THOR-839 & THOR-826
                - Following webscripts now sets "Content-Type" response header to application/json
                - which makes people search display follow buttons for people correctly
      Fix for ALF-12077
         Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
            32999: Fix for ALF-12050 - IE specific handling of Ajax requests does not correctly respect no-cache setting, need to set Expires header also
   33060: Fix for ALF-12208 - group name encoding
   33073: Fix for ALF-12295 - CLONE - Upload issue ? - Failed to get content ... (No such file or directory) ... x22
   33087: Calendar: Permissions updates, fixes: ALF-12179 & makes the permissions flag boolean.
   33088: FIXED : ALF-11862: An error message appears when you open the "edit task", to request to join the "moderated site"
   Now handles null value
   33102: Fix for ACT #15024-37148 (will update with JIRA no. once available) 
   - issue where in a load balanced Share environment (multiple web-tiers behind a reverse proxy) the modification to the template layout selection for a site or user dashboard would not be reflected in all servers.
   33105: Bitrock license notice file.
   33110: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0:
      33109: ALF-11479: When upgrading from Alfresco Community 3.4.d to 4.0.b, some nodes that are blocked and have versions fail after the upgrade
   33114: Merged DEV to V4.0
      33067: Fix ALF-12206: CMIS: Error getting association information referencing archived node
   33122: Fix for ALF-12316 Repo -> SOLR query uses HTTPClient that only supports 2 simultaneous connections
   - configurable via spring (default if unconfigured is 40 connections to one host and 40 max connections)
   33142: ALF-12339: Prevents ArrayOutOfBoundsException that can occur with concurrent access of i18n bundle in WebScript
   33320: (RECORD ONLY) Merged BRANCHES\DEV\V4.0-BUG-FIX to BRANCHESV4.0
       33305: ALF-12463 Error querying database was detected during upgrade process from 3.1 to 4.0.0.
   33326: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
       33277    ALF-12468 CLONE - Regression. Searches cause database server to thrash CPU - ALF-12426
   33331: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\V4.0
       33301: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
           33299: ALF-12281: Memory leak in ReferenceCountingReadOnlyIndexReaderFactory
       33303: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
           33302: ALF-12281: Correction to previous checkin - deal with the initial reference created by the constructor and cleared by closeIfRequired()


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33763 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-02-08 11:33:18 +00:00
parent 811519ae48
commit 503b462749
5 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1036,6 +1036,8 @@
<property name="host" value="${solr.host}"/> <property name="host" value="${solr.host}"/>
<property name="port" value="${solr.port}"/> <property name="port" value="${solr.port}"/>
<property name="sslPort" value="${solr.port.ssl}"/> <property name="sslPort" value="${solr.port.ssl}"/>
<property name="maxTotalConnections" value="${solr.max.total.connections}"/>
<property name="maxHostConnections" value="${solr.max.host.connections}"/>
</bean> </bean>
<bean id="solrAdminClient" class="org.alfresco.repo.solr.SOLRAdminClient" init-method="init" destroy-method="shutdown"> <bean id="solrAdminClient" class="org.alfresco.repo.solr.SOLRAdminClient" init-method="init" destroy-method="shutdown">

4
config/alfresco/repository.properties
View File

@@ -821,6 +821,10 @@ solr.solrPassword=solr
# none, https # none, https
solr.secureComms=https solr.secureComms=https
solr.max.total.connections=40
solr.max.host.connections=40
# Solr connection timeouts # Solr connection timeouts
# solr connect timeout in ms # solr connect timeout in ms
solr.solrConnectTimeout=5000 solr.solrConnectTimeout=5000

12
source/java/org/alfresco/opencmis/CMISConnector.java
View File

@@ -1198,16 +1198,20 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
Set<String> filterSet = splitFilter(filter); Set<String> filterSet = splitFilter(filter);
for (PropertyDefinitionWrapper propDef : info.getType().getProperties()) for (PropertyDefinitionWrapper propDefWrap : info.getType().getProperties())
{ {
if ((filterSet != null) && (!filterSet.contains(propDef.getPropertyDefinition().getQueryName()))) PropertyDefinition<?> propDef = propDefWrap.getPropertyDefinition();
if ((filterSet != null) && (!filterSet.contains(propDef.getQueryName())))
{ {
// skip properties that are not in the filter // skip properties that are not in the filter
continue; continue;
} }
Serializable value = propDef.getPropertyAccessor().getValue(info); CMISPropertyAccessor cmisPropertyAccessor = propDefWrap.getPropertyAccessor();
result.addProperty(getProperty(propDef.getPropertyDefinition().getPropertyType(), propDef, value)); Serializable value = cmisPropertyAccessor.getValue(info);
PropertyType propType = propDef.getPropertyType();
PropertyData<?> propertyData = getProperty(propType, propDefWrap, value);
result.addProperty(propertyData);
} }
return result; return result;

8
source/java/org/alfresco/opencmis/CMISNodeInfoImpl.java
View File

@@ -275,7 +275,8 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
objectId = nodeRef.toString(); objectId = nodeRef.toString();
currentObjectId = objectId; currentObjectId = objectId;
return; return;
} else if (getType() == null) }
else if (getType() == null)
{ {
objecVariant = CMISObjectVariant.NOT_A_CMIS_OBJECT; objecVariant = CMISObjectVariant.NOT_A_CMIS_OBJECT;
return; return;
@@ -308,7 +309,8 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
objectId = nodeRef.toString() + CMISConnector.ID_SEPERATOR + CMISConnector.UNVERSIONED_VERSION_LABEL; objectId = nodeRef.toString() + CMISConnector.ID_SEPERATOR + CMISConnector.UNVERSIONED_VERSION_LABEL;
versionLabel = CMISConnector.UNVERSIONED_VERSION_LABEL; versionLabel = CMISConnector.UNVERSIONED_VERSION_LABEL;
currentObjectId = objectId; currentObjectId = objectId;
} else }
else
{ {
Version headVersion = versionHistory.getHeadVersion(); Version headVersion = versionHistory.getHeadVersion();
@@ -322,7 +324,7 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
: CMISObjectVariant.VERSION); : CMISObjectVariant.VERSION);
} }
hasPWC = connector.getCheckOutCheckInService().isCheckedOut(getCurrentNodeNodeRef()); hasPWC = connector.getCheckOutCheckInService().isCheckedOut(nodeRef);
} }
protected void analyseAssociationRef() protected void analyseAssociationRef()

4
source/java/org/alfresco/opencmis/mapping/TargetIdProperty.java
View File

@@ -23,6 +23,7 @@ import java.io.Serializable;
import org.alfresco.opencmis.CMISConnector; import org.alfresco.opencmis.CMISConnector;
import org.alfresco.opencmis.dictionary.CMISNodeInfo; import org.alfresco.opencmis.dictionary.CMISNodeInfo;
import org.alfresco.service.ServiceRegistry; import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.NodeRef;
import org.apache.chemistry.opencmis.commons.PropertyIds; import org.apache.chemistry.opencmis.commons.PropertyIds;
/** /**
@@ -44,6 +45,7 @@ public class TargetIdProperty extends AbstractProperty
public Serializable getValueInternal(CMISNodeInfo nodeInfo) public Serializable getValueInternal(CMISNodeInfo nodeInfo)
{ {
return createNodeInfo(nodeInfo.getAssociationRef().getTargetRef()).getObjectId(); NodeRef targetNodeRef = nodeInfo.getAssociationRef().getTargetRef();
return createNodeInfo(targetNodeRef).getObjectId();
} }
} }