mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
27600: ALF-8522: MyBatis: Performance: ensure <association> elements are properly keyed 27608: RINF 09 / RINF 10: DB-based paged query for get children (DocLib & CMIS) - update FileFolder paging API - update GetChildren canned query sorting (to return sort props prior to batched pre-load) 27614: RINF 09 / RINF 10: DB-based paged query for get children (DocLib & CMIS) - add missing file (and fix my SmartSVN ignore unversioned list ;-) - follow-on to r27608 27621: RINF 11: Extended generalized CannedQueryDAO to support common selects - MyBatis resultset termination included - RINF 11: Integrate existing CannedQueryDAO (ALF-8417) - RINF 11: Canned queries (ALF-7167) 27623: RINF 09 / RINF 10: DB-based paged query for get children (DocLib & CMIS) - if total count not requested then can cut-off permission checks (based on max items) and instead set "hasMore" flag (if applicable) - now used by Share DocLib folder tree listing (on LHS) - see ALF-6570 27636: RINF 09 / RINF 10: DB-based getChildren - improvements to treenode (push down sort by name, get subfolders with max 1, remove redundant max check) - re: ALF-6570 - add default child assoc sort (if no sort requested) - minor tweak to getChildren CQ trace logging 27641: RINF 11: Extended generalized CannedQueryDAO - add temporary MyBatis workarounds for ResultHandler-based queries --> support unlimited queries for nested results maps (MyBatis #129) --> clear cache to return results on subsequent calls (MyBatis #58 ...) 27642: RINF 16: Ordered associations: Added NodeService.setAssociations - All reordering, deleting and adding node by NodeService impl. - ALF-7405 (ALF-7404 RINF 16: Peer association enhancements) 27643: ALF-8183 SVC 01: I18N List of values constraint. Added ListOfValuesConstraint.getDisplayLabel(constraintAllowableValue) method which uses the usual I18NUtil methods to retrieve a localised display-label for the LoV constraint values. These can be added to resource bundles in the usual way using a key as follows: listconstraint.test_list1.ABC=ABC display where "listconstraint." is a fixed prefix. "test_list1" is the shortform QName for the constraint with colon replaced by underscore. "ABC" is one of the allowed values for the named constraint. The test case changes & the associated model & property changes should make things clear. 27644: Test cases for ChannelService.createChannel and ChannelService.getChannels 27645: ALF-8183. I18N LIST constraint. This check-in ensures that requests for a LIST.value display label for: a non-existent value returns null an unlocalised value returns the allowableValue String from the model (backwards compatibility). 27651: Fixing compile errors caused by moving NodeLocator classes. 27652: RINF 09 / RINF 10: DB-based getChildren CQ - replace direct use of "sqlSessionTemplate" with "cannedQueryDAO"(RINF 11) 27657: RINF 09: GetChildren CQ - temp fix for cm:modified (when qname does not exist) - TODO review 27666: Support for ALF-8594: RSOLR 039: SOLR sorting - sorting for all single valued types 27671: Ignore virtual tomcat build 27673: Projects core, datamodel and solr now explicitly list their library dependencies and no longer include the 3rd party project 27681: Added pub:channelInfo aspect tows:webasset and ws:section. Also ws:website now extends pub:DeliveryChannel. Added new behaviours to section and website to ensure the channel info is populated. 27682: Added example SOLR config dir and instructions on how to set up - simple dev set up only subject to lots of change 27685: Cleanup: Removed non-javadoc; Removed unused methods; Added @override 27689: Update SOLR test instance dependencies 27692: ALF-8183 SVC 01: I18N Lost of values constraint. Added code to the FormService's PropertyFieldProcessor so that the allowedValues for a ListOfValuesConstraint have both the allowed value and its localised display label, if there is one. Added English property values for the bpm:allowedStatus constraint and also for the LIST constraint in the FDK. 27693: WCM-QS ML work - Have the webscript return more details on the node and its parents, and begin to use this in the UI to allow you to create as well as manage translations 27695: Workaround/fix for ALF-5747. Incompatibilities with OpenOffice 3.3 It looks like OOo 3.3.0 shipped with a missing component. The ConfigurationRegistry, which is used to remotely query the OOo version, was not implemented in 3.3.0 and therefore gives an ugly (and unavoidable) exception on OOo startup. There's not much we can do here, beyond getting users to upgrade their OOo install. I've added a catch clause that detects this problem and emits a slightly friendlier warning to the log. 27720: ALF-8532: WPUB: F148: Foundation API: Request that a node be published to the live environment 27727: Removed duplicates 27734: WCM-QS ML Updates to handle marking a node as an initial translation, and a start on creating translations 27735: Fixed generics warning 27736: Added PermissionService.getReaders(List<Long> aclIds) - Support for ALF-8335: RSOLR 013: DAOs and remote APIs for ACL changesets (ALF-7072) - Also cleaned up empty javadoc 27739: Implemented NodeFilters and NodeFinders for AbstractChannelType and ChannelServiceImpl. 27741: RINF 09: GetChildren CQ - fix sorting - with unit tests (for default Share DocLib fields) - partial ALF-8638 - ALF-8584 (follow-on for r27657) 27746: Start on linking the WCM-QS ML ui and the forms service for creating the translation 27747: Added --INCLUDE: directive to SQL scripts to allow importing of DB-specific snippets - ALF-8498: SVC 06: Property holding comment count for a node 27748: Web scripts for ACLs and ACL readers - Unit tests at all levels (Webscripts, Service and DAO) - Tweaks to the DB queries to support index-based sorting - Support for ALF-8335: RSOLR 013: DAOs and remote APIs for ACL changesets (ALF-7072) 27753: Fixed enum naming 27754: Undo changes to ChannelServiceImplIntegratedTest made in 27739 that broke the build 27762: Part I: ALF-7992: RSOLR 024: Locale support for query: SOLR - restructure and split localisation from generic query parsing - Lucene impl migrated and tested - No SOLR impl yet - Fix CMIS QueyTest - Fix references for LuceneQueryParser mostly to AbstractLuceneQueryParser 27763: Initial implementation of ALF-8498. SVC 06: Property holding comment count for a node. This check-in adds a rollup property to hold the commentCount (fm:commentCount under fm:discussable). It adds registered behaviours for fm:post deletion/creation that will decrement/increment the commentCount for the discussable ancestor node. I've also added a new test class to test this rollup property. There was no existing test class at this level and indeed there is no CommentService or DiscussionService. Instead the REST API of comment.put.desc.xml uses the ScriptNodeService to create the correct node structure. Therefore the test code has had to do the same thing. 27766: Slight reimpl of ALF-8498. Moved the rollup property onto its own aspect. So now we have fm:discussable, as before, for generic discussions and posts (including Explorer comments). And we have fm:commentsRollup which is only for rolling up Share comments. 27777: WCM QS ML Forms config and related tweaks to support having newly created nodes made multilingual where required 27781: Add repository project dependency for test context and debug - fixes model issue with SOLRAPIClientTest 27782: SOLR - move back to dynamic catch all field which seems to be working -> simpler build and model management 27810: ALF-8405 SiteAspect needs to handle child types of Site as well as Site itself 27821: ALF-7070: Fixed SOLRSerializer to handle residual properties (not in dictionary) 27828: RINF 11: Canned Queries (CQ) - update API post review . - add underlying pageRequest/pageResult for single page (or max items if skip is 0) - add hasMoreItems (ALF-8470) and update unit tests - return total count range - accurate count (if lower=upper), approximation (lower<upper) or more than (lower known, upper unknown) - update option to request total count with max (if cutoff/trimmed then returns unknown upper count) 27829: RINF 09: GetChildren CQ - paging support for FileFolderService list - update impl wrt CQ API changes (follow-on to r27828) - add factory method to return CQ with common params & update FileFolderService - update CMIS getChildren (AlrescoCmisService) - update scripting layer (ScriptNode, ScriptPagingNodes) - update Share DocLib (including doclist & treenode) - ALF-8641 - add proto (UI subject to review) to demo Share DocLib requesting max total count (eg. "Showing items 1 - 50 of 1000++") 27837: Moving the pdfbox, fontbox, jempbox libs from 1.3.1 to 1.5.0, which adds various bugfixes. 27838: Web scripts for ACLs and ACL readers - Simplification of paging API for ACLs - Support for ALF-8335: RSOLR 013: DAOs and remote APIs for ACL changesets (ALF-7072) 27839: SOLR ACL tracking client code and tests - Support for ALF-8335: RSOLR 013: ACL changesets client APIs (ALF-8463) 27844: Build fix. Making SiteServiceImplTest more tolerant of preexisting sites. 27845: Build fix. Making SiteServiceTest more tolerant of preexisting sites in databse. 27846: Build fix relating to ALF-8183. An extra test constraint requires an increment to a assertion expectedValue in this test. 27849: ALF-8532: WPUB: F148: Foundation API: Request that a node be published to the live environment - Added more necessary interfaces and framework code 27850: RINF 09: GetChildren CQ - update sorting unit test + fixes - nulls sort 'low' - fix multi sort props 27858: ALF-8532: WPUB: F148: Foundation API: Request that a node be published to the live environment - Initial cut of persisting publishing events (not tested yet) 27861: WCM QS ML webscript work - fix some issues, and start on webscript unit test Also updates a failing test with details of why it's failing (switch from JSON to XML some time ago) 27864: Fix context minimal tests - web publishing context is already included from the high level context, and shouldn't be in the core one 27867: ALF-8184: SVC 02: Encode and decode of forms itemId should be done in the REST layer and not in each individual form processor. 27868: Sample Adobe Illustrator files from Linton, for use in testing future metadata/transformer support 27869: Fixed ChannelServiceImplTest failures. 27870: Created JBPM process definition to publish scheduled Publishing Events. 27872: Sample Adobe Illustrator 3 file (PS not PDF based) from Linton, for use in testing future metadata/transformer support 27874: OpenCMIS update 27875: Change the Tika auto transformer to register aliases of mime types, as well as the canonical ones, for when Alfresco uses the alias 27876: RINF 11: Permission checking in canned queries (ALF-8419) 27877: RINF 39: Optimise GetChildren CQ for unsorted maxItems (ALF-8576) 27878: RINF 09: Update FileFolderService - all list methods should use GetChildren CQ (ALF-8733) 27882: ALF-8532: WPUB: F148: Foundation API: Request that a node be published to the live environment - Unit test for the publishing package serializer/deserializer 27885: Change order of publishing context so it comes after transfer service context. 27886: Fix for ALF-7992: RSOLR 024: Locale support for query: SOLR - d:mltext, d:text. d:content - phrase, term, prefix, wild, ranges, fuzzy etc - localised tokenisation - consistent tokenisation for cross language support ( phrase, term, prefix, wild, ranges, fuzzy etc) - CMIS related stuff to be tested later 27897: Minor tweak to prevent repeated gets of the default locale when writing properties 27900: WCM QS ML webscript tests 27905: Fixed PostgreSQL HeartbeatTest: WorkflowDeployer was checking for read-only server too late 27906: Remove unused imports 27907: Used common SQL snippets for DB2 node inserts. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28319 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
299 lines
12 KiB
Java
299 lines
12 KiB
Java
/*
|
|
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
|
*
|
|
* This file is part of Alfresco
|
|
*
|
|
* Alfresco is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Alfresco is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
package org.alfresco.util;
|
|
|
|
import java.lang.reflect.Method;
|
|
import java.net.ConnectException;
|
|
import java.util.Map;
|
|
import java.util.TreeMap;
|
|
|
|
import net.sf.jooreports.openoffice.connection.AbstractOpenOfficeConnection;
|
|
import net.sf.jooreports.openoffice.connection.OpenOfficeConnection;
|
|
|
|
import org.alfresco.error.AlfrescoRuntimeException;
|
|
import org.alfresco.repo.content.metadata.MetadataExtracterRegistry;
|
|
import org.apache.commons.logging.Log;
|
|
import org.apache.commons.logging.LogFactory;
|
|
import org.quartz.Job;
|
|
import org.quartz.JobDataMap;
|
|
import org.quartz.JobExecutionContext;
|
|
import org.quartz.JobExecutionException;
|
|
import org.springframework.context.ApplicationContext;
|
|
import org.springframework.context.ApplicationEvent;
|
|
import org.springframework.extensions.surf.util.AbstractLifecycleBean;
|
|
import org.springframework.extensions.surf.util.I18NUtil;
|
|
|
|
import com.sun.star.registry.RegistryValueType;
|
|
import com.sun.star.registry.XRegistryKey;
|
|
import com.sun.star.registry.XSimpleRegistry;
|
|
import com.sun.star.uno.UnoRuntime;
|
|
|
|
/**
|
|
* A bootstrap class that checks for the presence of a valid <b>OpenOffice</b> connection, as provided by the
|
|
* <code>net.sf.jooreports.openoffice.connection.OpenOfficeConnection</code> implementations.
|
|
*
|
|
* @author Derek Hulley
|
|
*/
|
|
public class OpenOfficeConnectionTester extends AbstractLifecycleBean
|
|
{
|
|
private static final String ATTRIBUTE_AVAILABLE = "available";
|
|
private static final String INFO_CONNECTION_VERIFIED = "system.openoffice.info.connection_verified";
|
|
private static final String ERR_CONNECTION_FAILED = "system.openoffice.err.connection_failed";
|
|
private static final String ERR_CONNECTION_LOST = "system.openoffice.err.connection_lost";
|
|
private static final String ERR_CONNECTION_REMADE = "system.openoffice.err.connection_remade";
|
|
|
|
private static Log logger = LogFactory.getLog(OpenOfficeConnectionTester.class);
|
|
|
|
private OpenOfficeConnection connection;
|
|
private Map<String, Object> openOfficeMetadata = new TreeMap<String, Object>();
|
|
private boolean strict;
|
|
|
|
public OpenOfficeConnectionTester()
|
|
{
|
|
this.strict = false;
|
|
}
|
|
|
|
/**
|
|
* @param connection the <b>OpenOffice</b> connection.
|
|
*/
|
|
public void setConnection(OpenOfficeConnection connection)
|
|
{
|
|
this.connection = connection;
|
|
}
|
|
|
|
/**
|
|
* @param strict set to <tt>true</tt> to generate a failure if the connection is not connected
|
|
* during the {@link #checkConnection() connection check}, or false to just issue
|
|
* a warning. The default is <tt>false</tt>.
|
|
*/
|
|
public void setStrict(boolean strict)
|
|
{
|
|
this.strict = strict;
|
|
}
|
|
|
|
/**
|
|
* @see #checkConnection()
|
|
*/
|
|
@Override
|
|
protected void onBootstrap(ApplicationEvent event)
|
|
{
|
|
checkConnection();
|
|
((ApplicationContext) event.getSource()).publishEvent(new OpenOfficeConnectionEvent(this.openOfficeMetadata));
|
|
}
|
|
|
|
/**
|
|
* Disconnect
|
|
*/
|
|
@Override
|
|
protected void onShutdown(ApplicationEvent event)
|
|
{
|
|
if(connection != null)
|
|
{
|
|
if(connection.isConnected())
|
|
{
|
|
connection.disconnect();
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Perform the actual connection check. If this component is {@link #setStrict(boolean) strict},
|
|
* then a disconnected {@link #setConnection(OpenOfficeConnection) connection} will result in a
|
|
* runtime exception being generated.
|
|
*/
|
|
private void checkConnection()
|
|
{
|
|
String connectedMessage = I18NUtil.getMessage(INFO_CONNECTION_VERIFIED);
|
|
boolean connected = testAndConnect();
|
|
OpenOfficeConnectionTesterJob.wasConnected = Boolean.valueOf(connected);
|
|
if (connected)
|
|
{
|
|
// the connection is fine
|
|
logger.debug(connectedMessage);
|
|
return;
|
|
}
|
|
// now we have to either fail or report the connection
|
|
String msg = I18NUtil.getMessage(ERR_CONNECTION_FAILED);
|
|
if (strict)
|
|
{
|
|
throw new AlfrescoRuntimeException(msg);
|
|
}
|
|
else
|
|
{
|
|
logger.warn(msg);
|
|
}
|
|
}
|
|
|
|
public boolean testAndConnect()
|
|
{
|
|
synchronized (this.openOfficeMetadata)
|
|
{
|
|
PropertyCheck.mandatory(this, "connection", connection);
|
|
if (!connection.isConnected())
|
|
{
|
|
try
|
|
{
|
|
connection.connect();
|
|
}
|
|
catch (ConnectException e)
|
|
{
|
|
// No luck
|
|
this.openOfficeMetadata.clear();
|
|
this.openOfficeMetadata.put(ATTRIBUTE_AVAILABLE, Boolean.FALSE);
|
|
return false;
|
|
}
|
|
}
|
|
|
|
// Let's try to get at the version metadata
|
|
Boolean lastAvailability = (Boolean)this.openOfficeMetadata.get(ATTRIBUTE_AVAILABLE);
|
|
if (lastAvailability == null || !lastAvailability.booleanValue())
|
|
{
|
|
this.openOfficeMetadata.put(ATTRIBUTE_AVAILABLE, Boolean.TRUE);
|
|
try
|
|
{
|
|
// We have to peak inside the connection class to get the service we want!
|
|
Method getServiceMethod = AbstractOpenOfficeConnection.class.getDeclaredMethod("getService",
|
|
String.class);
|
|
getServiceMethod.setAccessible(true);
|
|
Object configurationRegistry = getServiceMethod.invoke(connection,
|
|
"com.sun.star.configuration.ConfigurationRegistry");
|
|
XSimpleRegistry registry = (XSimpleRegistry) UnoRuntime.queryInterface(
|
|
com.sun.star.registry.XSimpleRegistry.class, configurationRegistry);
|
|
registry.open("org.openoffice.Setup", true, false);
|
|
XRegistryKey root = registry.getRootKey();
|
|
XRegistryKey product = root.openKey("Product");
|
|
for (XRegistryKey key : product.openKeys())
|
|
{
|
|
switch (key.getValueType().getValue())
|
|
{
|
|
case RegistryValueType.LONG_value:
|
|
openOfficeMetadata.put(key.getKeyName(), key.getLongValue());
|
|
break;
|
|
case RegistryValueType.ASCII_value:
|
|
openOfficeMetadata.put(key.getKeyName(), key.getAsciiValue());
|
|
break;
|
|
case RegistryValueType.STRING_value:
|
|
openOfficeMetadata.put(key.getKeyName(), key.getStringValue());
|
|
break;
|
|
}
|
|
}
|
|
registry.close();
|
|
}
|
|
catch (com.sun.star.uno.RuntimeException oooRuntimeException)
|
|
{
|
|
// ALF-5747 discusses an OOo problem whereby an interface component was not implemented & therefore version
|
|
// information cannot be retrieved. This does not seem to affect the operation of the OOo process.
|
|
// If we see this exception, which occurs in OOo 3.3.0, we'll shorten the exception log & make it friendlier.
|
|
|
|
final String exceptionMessage = oooRuntimeException.getMessage();
|
|
if (exceptionMessage != null && exceptionMessage.contains("com.sun.star.configuration.ConfigurationRegistry: not implemented"))
|
|
{
|
|
logger.warn("Error trying to query Open Office version information. " +
|
|
"OpenOffice.org's ConfigurationRegistry not implemented in this version of OOo. This should not affect the operation of OOo.");
|
|
// We have intentionally not logged the exception object here.
|
|
}
|
|
else
|
|
{
|
|
logger.warn("Error trying to query Open Office version information", oooRuntimeException);
|
|
}
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
logger.warn("Error trying to query Open Office version information", e);
|
|
}
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Quartz job that checks an OpenOffice connection.
|
|
*
|
|
* @author Derek Hulley
|
|
* @since 2.1.2
|
|
*/
|
|
public static class OpenOfficeConnectionTesterJob implements Job
|
|
{
|
|
private static volatile Boolean wasConnected;
|
|
|
|
public OpenOfficeConnectionTesterJob()
|
|
{
|
|
}
|
|
|
|
/**
|
|
* Check the connection.
|
|
* @see OpenOfficeConnectionTester#checkConnection()
|
|
*/
|
|
public synchronized void execute(JobExecutionContext context) throws JobExecutionException
|
|
{
|
|
/*
|
|
* Synchronized just in case of overzelous triggering.
|
|
*/
|
|
|
|
JobDataMap jobData = context.getJobDetail().getJobDataMap();
|
|
// Get the connecion tester
|
|
Object openOfficeConnectionTesterObj = jobData.get("openOfficeConnectionTester");
|
|
if (openOfficeConnectionTesterObj == null || !(openOfficeConnectionTesterObj instanceof OpenOfficeConnectionTester))
|
|
{
|
|
throw new AlfrescoRuntimeException("OpenOfficeConnectionJob data must contain valid 'openOfficeConnectionTester' reference");
|
|
}
|
|
OpenOfficeConnectionTester openOfficeConnectionTester = (OpenOfficeConnectionTester) openOfficeConnectionTesterObj;
|
|
|
|
// Get the extractor and transformer registries. These are not mandatory.
|
|
Object metadataExractorRegistryObj = jobData.get("metadataExractorRegistry");
|
|
MetadataExtracterRegistry metadataExtracterRegistry = null;
|
|
if (metadataExractorRegistryObj != null && (metadataExractorRegistryObj instanceof MetadataExtracterRegistry))
|
|
{
|
|
metadataExtracterRegistry = (MetadataExtracterRegistry) metadataExractorRegistryObj;
|
|
}
|
|
|
|
// Now ping the connection. It doesn't matter if it fails or not.
|
|
boolean connected = openOfficeConnectionTester.testAndConnect();
|
|
// Now log, if necessary
|
|
if (OpenOfficeConnectionTesterJob.wasConnected == null)
|
|
{
|
|
// This is the first pass
|
|
}
|
|
else if (OpenOfficeConnectionTesterJob.wasConnected.booleanValue() == connected)
|
|
{
|
|
// Nothing changed since last time
|
|
}
|
|
else
|
|
{
|
|
if (connected)
|
|
{
|
|
// This is reported as a warning as admins must be aware that it is bouncing
|
|
logger.info(I18NUtil.getMessage(ERR_CONNECTION_REMADE));
|
|
}
|
|
else
|
|
{
|
|
logger.error(I18NUtil.getMessage(ERR_CONNECTION_LOST));
|
|
}
|
|
// The value changed so ensure that the registries are bounced
|
|
if (metadataExtracterRegistry != null)
|
|
{
|
|
metadataExtracterRegistry.resetCache();
|
|
}
|
|
}
|
|
// Record the state
|
|
OpenOfficeConnectionTesterJob.wasConnected = Boolean.valueOf(connected);
|
|
}
|
|
}
|
|
}
|