mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
39838: Minor fixes to yellowTheme rendering and title background 39871: ALF-610: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 39842: ALF-15294 CLONE Jodconvertor - no office manager available - Wire up 'startListener' logic better, so that it does not need to go in OpenOfficeContentTransformerWorker but in the SocketOpenOfficeConnection, which also avoids a test on start up. 39841: ALF-15294 CLONE Jodconvertor - no office manager available Changing the OOoDirect subsystem so that: - It will not start an OpenOffice process if the OOoJodconverter subsystem is also starting an process on the same port (8100 is still the default in both cases). An ERROR is logged on startup if there is a clash of ports. - It no longer tries to establishes a connection to an OpenOffice process if ooo.enabled is false, or there is a clash of port numbers with the OOoJodconverter subsystem. Both these checks are new. - ooo.enabled must now be true before it tries to connect to an OpenOffice process on a remote host (ooo.host must not be localhost). - It will no longer schedule a job to establish and test the connection if it is not being used. 39923: ALF-610: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 39922: ALF-15294 CLONE Jodconvertor - no office manager available - Start up problems with community version when the OOoJodconverter sub system is not there, because of the access to a Jod bean - Allow a default bean to be specified when the sub system bean could not be accessed. 39962: ALF-15158: Downloading Office 97 files with .doc extension result in file with .dot extension when using Google Chrome - Added more complete and intelligent content disposition header with the aim of supporting RFC 5987 39975: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX (Record Only) 39974: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/V3.4-BUG-FIX 39953: Refactored "Content I'm Editing" dashlet from synchronous (slowing down user dashboard initial display) to asynchronous client-side rendering. (ALF-13404) 39978: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_07_09 to BRANCHES/DEV/V4.1-BUG-FIX 39921: ALF-13473: IE9: can't login to awe. Upgrade YUI library to 2.9.0 for awe application. 39991: ALF-15339: Added empty-value check, caused group/user-search in workflows to fail 39999: Reversed revision 36174, thus removing Kofax 40025: Merged BRANCHES/V4.1 to BRANCHES/DEV/V4.1-BUG-FIX (Record Only) 40024: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/V4.1 40022: Fix for ALF-15144 - Slow Share doclib high-level folder browsing due to version history retrieval 40028: ALF-15346: Upgrade of Tika to 1.3-SNAPSHOT - Upgraded commons-codec from 1.4 to 1.5 - Upgraded commons-compress from 1.1 to 1.4.1 - Upgraded fontbox from 1.6.0 to 1.7.0 - Upgraded jempbox from 1.6.0 to 1.7.0 - Upgraded pdfbox from 1.6.0-patched to 1.7.0-patched - Upgraded metadata-extractor from 2.4.0-beta-1 to 2.6.2 - Upgraded poi-* from 3.9-beta1-20120329 to 3.9-beta1-20120801 - Upgraded tika-* from 1.2-20120518 to 1.3-20120801 - Added juniversalchardet version 1.0.3 - Added xmpcore version 5.1.2 - Added xz version 1.0 - Changed .classpaths, build.properties, and build.xml to correspond to above git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40268 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
65 lines
1.7 KiB
Java
65 lines
1.7 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.util.Arrays;
|
|
import java.util.Collection;
|
|
import java.util.Collections;
|
|
|
|
/**
|
|
* Implementation that supplies OOoJodconverter subsystems config parameters that might clash with the OOoDirect subsystem.
|
|
*
|
|
* @author Alan Davis
|
|
*/
|
|
public class JodConfigImpl implements JodConfig
|
|
{
|
|
private String ports;
|
|
private boolean enabled;
|
|
|
|
@Override
|
|
public Collection<String> getPortsCollection()
|
|
{
|
|
return Arrays.asList(ports.trim().split("[, ][, ]*"));
|
|
}
|
|
|
|
@Override
|
|
public String getPorts()
|
|
{
|
|
return getPortsCollection().toString().replaceAll("[ \\[\\]]", "");
|
|
}
|
|
|
|
@Override
|
|
public void setPorts(String ports)
|
|
{
|
|
this.ports = ports;
|
|
}
|
|
|
|
@Override
|
|
public boolean isEnabled()
|
|
{
|
|
return enabled;
|
|
}
|
|
|
|
@Override
|
|
public void setEnabled(boolean enabled)
|
|
{
|
|
this.enabled = enabled;
|
|
}
|
|
}
|