mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
0bd1c922b4
38859: ALF-14240: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
38858: ALF-15012 CLONE - New properties for "baseContentTransformer" prevent a remote OpenOffice configuration to start
- Turns out that the 'New properties' that I added in 3.4.8 made it harder to get a remote OpenOffice instance
working, but it has not been possible to do OpenOffice transformations on a remote machine for some time in the
way described on the wiki
https://wiki.alfresco.com/wiki/Running_OpenOffice_From_Remote_Machine#Remote_Machine_Setup
- The following issues were all closed as "Not a Bug - Unsupported use case", even though the wiki describes it.
They all work now - Only discovered these after I had fixed the code.
ALF-236: (Alfresco 3.1.1) RemoteOpenOfficeContentTransformer fails to transform txt to odt
ALF-4049: (Alfresco 3.2.2) RemoteOpenOfficeContentTransformer can't be used in a sub-system...
ALF-8440: (Alfresco 3.3.3) Indicates moving OpenOffice transformations to the subsystem OOoDirect requires
different spring bean overrides.
- Having worked out that RemoteOpenOfficeContentTransformer was really just a very early version of
OpenOfficeContentTransformerWorker, I have removed RemoteOpenOfficeContentTransformer and the
remote-openoffice-context.xml.sample and modified OpenOfficeContentTransformerWorker to support remote
OpenOffice instances. Rather than having to override spring beans it is now possible to do the
configuration using Alfresco global properties. Introduced one new one: ooo.host This must be set to the name
or ip of the remote system, ooo.port (already existed) must be set to the port used by the remote OppenOffice
instance and ooo.enabled (already existed) must be set to false so that a local instance is not started.
- As a side effect of using OpenOfficeContentTransformerWorker, all bug fixes that have been added to this
class will now also be available to remote OpenOffice instances.
- Added extra change to share-form-config.xml (not in 3.4) to include the host as a field
38742: ALF-14801 - Overwrite or delete a folder containing multiple files and folders via CIFS on Lion OS X fails with StringIndexOutOfBoundsException
38679: ALF-14857 - Importing .eml messages generated from Lotus Notes doesn't work
38675: ALF-14942 Cast operation will always fail in MoveFileOperation
38666: Merged V4.1 to V4.1-BUG-FIX
38665: ALF-13260: Mysql does an awful planification of ibatis "select_ChildAssocOfParentByName" query after some heavy load
- improved "select_ChildAssocOfParentByName" where clause to engage existing index
38598: New Chinese translations from Gloria plus Bitrock configuration to enable them
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@38860 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
49 lines
1.7 KiB
Java
49 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 net.sf.jooreports.openoffice.converter.AbstractOpenOfficeDocumentConverter;
|
|
import net.sf.jooreports.openoffice.converter.OpenOfficeDocumentConverter;
|
|
import net.sf.jooreports.openoffice.converter.StreamOpenOfficeDocumentConverter;
|
|
|
|
public class SocketOpenOfficeConnection extends net.sf.jooreports.openoffice.connection.SocketOpenOfficeConnection
|
|
{
|
|
private boolean defaultHost = true;
|
|
|
|
public SocketOpenOfficeConnection() {
|
|
super();
|
|
}
|
|
|
|
public SocketOpenOfficeConnection(int port) {
|
|
super(port);
|
|
}
|
|
|
|
public SocketOpenOfficeConnection(String host, int port) {
|
|
super(host, port);
|
|
defaultHost = DEFAULT_HOST.equals(host);
|
|
}
|
|
|
|
public AbstractOpenOfficeDocumentConverter getDefaultConverter()
|
|
{
|
|
return defaultHost
|
|
? new OpenOfficeDocumentConverter(this)
|
|
: new StreamOpenOfficeDocumentConverter(this);
|
|
}
|
|
}
|