mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
40605: ALF-15273: Merged PATCHES/V4.0.1 to V4.1-BUG-FIX 40132: ALF-15376: Activiti schema updates fail when hibernate.default_schema is set with ORA-00942. - Corrected schema case to uppercase when database is Oracle. 40235: ALF-15367: Reverse merged the following revisions because the fix is deemed not robust enough. 40132: ALF-15376: Activiti schema updates fail when hibernate.default_schema is set with ORA-00942. - Corrected schema case to uppercase when database is Oracle. 40041: ALF-15376: Merged V4.1-BUG-FIX to PATCHES/V4.0.1 39969: Merged DEV/BELARUS-V4.1-BUG-FIX-2012_07_09 to V4.1-BUG-FIX: ALF-15273 : Activiti schema updates fail when hibernate.default_schema is set with ORA-00942. The Activiti database is now correctly initialized with the correct "hibernate.default_schema" 40470: ALF-15376: how to debug the creation of Activiti tables (ACT_) when upgrading to 4.X - added more logging to Activiti schema creation 40471: ALF-15376: Activiti schema updates fail when hibernate.default_schema is set with ORA-00942 - Ignore hibernate.default_schema and determine default schema from the Connection DatabaseMetaData - Provided the Activiti schema initializer with the default schema information - Provided countAppliedPatches() with default schema information 40501: ALF-15376: Improved webapp logging.properties to use a console handler so that it doesn't suppress absolutely everything and we can selectively turn on logging! 40608: Fix for ALF-4274 - JSF - Paste action does not work when browse.jsp is overrided 40611: GERMAN: Translation updates based on EN r40604 40612: SPANISH: Translation updates based on EN r40604 40613: FRENCH: Translation updates based on EN r40604 40614: ITALIAN: Translation updates based on EN r40604 40615: JAPANESE: Translation updates based on EN r40604 40616: DUTCH: Translation updates based on EN r40604 40617: CHINESE: Translation updates based on EN r40604 40629: ALF-15321: upgrade Activiti to fix logging 40632: Fix for ALF-15487 Search not working for queries containing 3-digit versions Fix for ALF-15356 SOLR doesn't support searching by cm:name of file with underscore and dots 40655: Fix for ALF-14752 - Collapse Links part at the WCM details page lead to error. 40662: Eclipse classpath fixes 40663: Merged DEV to V4.1-BUG-FIX 40661: ALF-15318 (part 2): It's possible to log in by disabled user (NTLM with SSO in a clustered env) The onValidateFailed() methods were moved to BaseSSOAuthenticationFilter to response with a 401 for a disabled user. 40665: ALF-15448: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 40664: ALF-15578 CLONE 3.4.11: LibreOffice 3.6 startup on Mac fails 40685: Merged PATCHES/V4.0.2 to V4.1-BUG-FIX 39274: Merged DEV to V4.0.2 (4.0.2.4) << Unable to merge code as supplied as it introduced a change to a public API, which would break alfresco.log if the RM AMP was installed See RM-452 >> 39166: ALF-15583 / ALF-14584: autoVersionOnUpdateProps=true does not increment the version label after checkout/checkin 'VersionableAspectTest' has been modified in accordance with concept: several modifications of node in a single transaction are interpreted as a single version. Each operation in the test which should provide a new version have been made atomic 39089: ALF-15583 / ALF-14584: autoVersionOnUpdateProps=true does not increment the version label after checkout/checkin Check of lock has been corrected since 'cm:lockable' aspect doesn't indicate lock state: - 'LockService' service has been extended with 'isLocked(NodRef)' method which returns 'true' if document is locked and current user is not an owner of the lock; - new 'VersionableAspectTest' has been added to test the use-case described in the issue and to test whether 'VersionableAspect' changes version label of a locked document 39369: ALF-15583 / ALF-14584 autoVersionOnUpdateProps=true does not increment the version label after checkout/checkin - Test failures: A READ_ONLY lock was being set because we are adding a versionable aspect. This resulted in an Exception when attempting to update the version. Change made to the isLocked method (now called isLockedOrReadOnly) to reflect that a node is locked even for the owner and the lock type is not a WRITE lock. 39939: ALF-15584 / ALF-15001: Gracefully handle stale NodeRefs in query results in DMDiscoveryServicePort - SOLR makes this more likely to occur 40455: ALF-15585 / ALF-15383: Long-running Feed Cleaner - Part 1: Limit problems caused by missing indexes - Remove all count calls - Remove logic requiring calls to SiteService to list all sites - Added in an ID range limit to act as a hard-stop to entry growth (set to 1M) - TODO: use JobLockService 40461: ALF-15585 / ALF-15383: Long running Feed Cleaner - Part 2: Added JobLockService usage to ensure only one instance runs at a time 40463: ALF-15585 / ALF-15383: Long running Feed Cleaner - A bit more trace and debug 40526: ALF-15586: Fixed ALF-15540: CMIS: Synchronized block in service interceptor 40574: ALF-15585 / ALF-15383: Long running Feed Cleaner - Fix MySQL variant of activities-common-SqlMap 40579: ALF-15585: Fix fallout from rev 40455: ALF-15383: Long-running Feed Cleaner - MySQL dialect was duplicating ALL SQL statements - Split 'large' SQL selects into activities-select-SqlMap.xml containing 7 statements that are all overridden for MySQL - Fixed split in common file between different types of statements 40588: ALF-15587 / ALF-15385: Merged V3.4-BUG-FIX to PATCHES/V4.0.2 (Lost revision) 28830: ALF-7622 Refactored JScriptWorkflowTask. Now when setProperties() is called it properly updates the WorkflowTask properties via the WorflowService.updateTask() method. 40687: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 40599: ALF-15567: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX 40511: ALF-12008: Merged DEV to PATCHES/V3.4.10 Due to Windows Explorer's URL concatenation behaviour, we must present links as shortcuts to the real URL, rather than direct hrefs. This is at least consistent with the way the CIFS server handles links. See org.alfresco.filesys.repo.ContentDiskDriver.openFile(). 40518: ALF-12008: Fixed compilation error git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40691 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
151 lines
4.9 KiB
Java
151 lines
4.9 KiB
Java
/* Copyright (C) 2005-2012 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.io.File;
|
|
|
|
import org.alfresco.error.AlfrescoRuntimeException;
|
|
import org.apache.commons.logging.Log;
|
|
import org.apache.commons.logging.LogFactory;
|
|
|
|
/**
|
|
* Provides OpenOffice and LibreOffice variant information.
|
|
*
|
|
* @author Alan Davis
|
|
*/
|
|
public class OpenOfficeVariant
|
|
{
|
|
private static final String[] EXTENSIONS = new String[] {"", ".exe", ".com", ".bat", ".cmd"};
|
|
private static final Log logger = LogFactory.getLog(OpenOfficeCommandLine.class);
|
|
private static final String OS_NAME = System.getProperty("os.name").toLowerCase();
|
|
|
|
private final boolean windows = isWindows();
|
|
|
|
public File getOfficeHome(File executable)
|
|
{
|
|
// Get the grandparent
|
|
File officeHome = executable;
|
|
for (int i=1; officeHome != null && i <= 2; i++)
|
|
{
|
|
officeHome = officeHome.getParentFile();
|
|
}
|
|
|
|
if (officeHome == null && executable != null)
|
|
{
|
|
throw new AlfrescoRuntimeException("Did not find OppenOffice home from executable "+executable.getAbsolutePath());
|
|
}
|
|
|
|
return officeHome;
|
|
}
|
|
|
|
public File findExecutable(String executableName)
|
|
{
|
|
File file = new File(executableName);
|
|
if (file.isAbsolute())
|
|
{
|
|
file = canExecute(file);
|
|
}
|
|
else
|
|
{
|
|
file = findExecutableOnPath(executableName);
|
|
}
|
|
return file;
|
|
}
|
|
|
|
private File findExecutableOnPath(String executableName)
|
|
{
|
|
String systemPath = System.getenv("PATH");
|
|
systemPath = systemPath == null ? System.getenv("path") : systemPath;
|
|
String[] pathDirs = systemPath.split(File.pathSeparator);
|
|
|
|
File fullyQualifiedExecutable = null;
|
|
for (String pathDir : pathDirs)
|
|
{
|
|
File file = canExecute(new File(pathDir, executableName));
|
|
if (file != null)
|
|
{
|
|
fullyQualifiedExecutable = file;
|
|
break;
|
|
}
|
|
}
|
|
return fullyQualifiedExecutable;
|
|
}
|
|
|
|
private File canExecute(File file)
|
|
{
|
|
File fullyQualifiedExecutable = null;
|
|
File dir = file.getParentFile();
|
|
String name = file.getName();
|
|
for (String ext: EXTENSIONS)
|
|
{
|
|
file = new File(dir, name+ext);
|
|
if (file.canExecute())
|
|
{
|
|
fullyQualifiedExecutable = file;
|
|
break;
|
|
}
|
|
if (!windows)
|
|
{
|
|
break;
|
|
}
|
|
}
|
|
return fullyQualifiedExecutable;
|
|
}
|
|
|
|
public boolean isLibreOffice3Dot5(File officeHome)
|
|
{
|
|
if (logger.isDebugEnabled())
|
|
{
|
|
logger.debug("System.getProperty(\"os.name\")="+System.getProperty("os.name"));
|
|
logger.debug("officeHome="+(officeHome == null ? null : "'"+officeHome.getAbsolutePath()+"'"));
|
|
logger.debug("basis-link:"+new File(officeHome, "basis-link").isFile());
|
|
logger.debug("basis-link:"+new File(officeHome, "basis-link").isDirectory());
|
|
logger.debug(" ure-link:"+new File(officeHome, "ure-link").isFile());
|
|
logger.debug(" ure-link:"+new File(officeHome, "ure-link").isDirectory());
|
|
logger.debug(" NOTICE:"+new File(officeHome, "NOTICE").isFile());
|
|
}
|
|
return
|
|
officeHome != null &&
|
|
!new File(officeHome, "basis-link").isFile() &&
|
|
(new File(officeHome, "ure-link").isFile() || new File(officeHome, "ure-link").isDirectory());
|
|
}
|
|
|
|
public boolean isLibreOffice3Dot6(File officeHome)
|
|
{
|
|
if (logger.isDebugEnabled())
|
|
{
|
|
logger.debug(" NOTICE:"+new File(officeHome, "NOTICE").isFile());
|
|
}
|
|
return isLibreOffice3Dot5(officeHome) && new File(officeHome, "NOTICE").isFile();
|
|
}
|
|
|
|
public boolean isLinux()
|
|
{
|
|
return OS_NAME.startsWith("linux");
|
|
}
|
|
|
|
public boolean isMac()
|
|
{
|
|
return OS_NAME.startsWith("mac");
|
|
}
|
|
|
|
public boolean isWindows()
|
|
{
|
|
return OS_NAME.startsWith("windows");
|
|
}
|
|
} |