mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merge DM-DM_deployment to HEAD
17716 : Copied alfresco/HEAD to alfresco/BRANCHES/DEV/BRIAN/DM-DM_deployment.
17721 : Moved alfresco/BRANCHES/DEV/BRIAN/DM-DM_deployment to alfresco/BRANCHES/DEV/DM-DM_deployment.
17809 : Bare Bones of TransferService.
17813 : more bones
17824 : bootstrap of the transfer spaces
17826 : Added username, path, and a getter for the password.
17832 : createTransferTarget, getTransferTargets() working.
17836 : transfer target
- duplicate name detection
- delete transfer target by name
- get transfer target by name
- TransferException added along with transfer-service.properties
17840 : transfer target
- enable / disable
- update properties
17851 : Added the notion of a transmitter for the transfer service, and an HttpClient implementation of it.
17852 : Added the web script needed for the receiving end of a transfer, along with a command processor for clients to
check availability of the service and credentials.
17856 : Added a Mockito-based test for HttpClientTransmitterImpl
17857 : Corrected javadoc for test class
17858 : Added test for overriding SSL socket factory
17859 : Wired up the transfer service to the transfer transmitter.
17896 : Rework to spring for app:transferDefinitions it's now app:transfer_definitio
- Add throws clauses to TransferService
- Bare bones of interface for begin and sendManifest
17944 : Work in progress on manifest file
17947 : added parent and child associations to the snapshot.
17956 : Now has the parent path implemented and introduces the TransferManifestNodeFactory.
17965 : Added content, MLText and collections.
17978 : addition of source and target peer associations.
17982 : Fixing parentNode information.
18008 : XML Manifest Reader checkpoint. (Still incomplete but lots working)
18040 : ParentPath is transmitted, fixes for source and target assocs.
18048 : SAIL-30: Initial commit of functionality for begin, sendManifest, and sendContent parts of the transfer process
18049 : Fix for parse of Locale type.
18054 : Added TransferManifestNodeHelper and more tests
18066 : Work in progress check in
- Implemented the content chunker
- sketched out more interfaces on TransferTransmitter.
- Please note that the chunker is not yet connected to the manifest file, that will come next.
r18069 : Wired up manifest reader to content chunker.
r18089 : Fiest cut of callback interface for review.
r18091 : added hashCode implementation which was missing from ContentData
r18095 : Start of the server-side commit. Note that this is an interim commit - not tested.
r18096 : Initial entry of a ContentData implementation of HttpClient's "Part"
r18155 : Work in progress check in.
TransferEvent - incomplete
HttpClientTransmitter - first cut complete (not tested)
Server side - first cut complete (not tested)
18156 : TransferMessage missing from last check in.
18166 : check in command processors
18167 : Work primarily on the transfer commit operation
18170 : corrected spring errors.
18176 : Further testing and fixing of transfer commit
18206 : Work in progress.
18236 : Work in progress - generally adding debug logging and sorting out exception handlers.
18240 : Fix to call "end" correctly after exception is thrown with "commit"
18242 : Aligning the manifest part names.
18243 : PostSnapshot calls the correct method on the receiver service.
18267 : First node has transferred.
18274 : Fixing abort to call end, debug statements, formatting code brackest
18275 : First code to handle updates. Also improved error messages passed back to client
18289 : Checked in work in progress. Content upload not working.
18290 : Update to ensure file type.
18300 : Added more log output and some of the error messages.
18301 : Work in progress
18302 : Added log output
18307 : Added a noddy transfer action
18315 : Sprint 2 complete - transfer and update one node.
18354 : Now the manifest file has deleted nodes.
- Adding copyright headers
18384 : Plumbing for unit tests on one box.
18416 : First end to end unit test working. (one node create and update)
18421 : Added path based update test and many send test.
18458 : Added the functionality to transfer deleted and restored nodes.
18481 : Implementation of transferAsync
18491 : SAIL-32, SAIL-35
- Added node crawler for DM-DM Transfer F6 and F9.
18620 : Basic transfer report implementation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18858 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
@@ -0,0 +1,44 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.alfresco.org/model/transferReport/1.0" xmlns:report="http://www.alfresco.org/model/transferReport/1.0" elementFormDefault="qualified">
|
||||
|
||||
<!-- XML Schema for the client side transferReport -->
|
||||
<complexType name="transferReport">
|
||||
<xs:annotation>
|
||||
<xs:documentation>
|
||||
This is the transfer report root tag
|
||||
</xs:documentation>
|
||||
</xs:annotation>
|
||||
<sequence>
|
||||
<element name="target" type="report:target" maxOccurs="1" minOccurs="1"></element>
|
||||
<element name="definition" type="report:definition" maxOccurs="1" minOccurs="1"></element>
|
||||
<element name="events" type="report:events"></element>
|
||||
</sequence>
|
||||
</complexType>
|
||||
|
||||
<complexType name="target">
|
||||
<xs:annotation>
|
||||
<xs:documentation>
|
||||
The destination of the transfer
|
||||
</xs:documentation>
|
||||
</xs:annotation>
|
||||
<attribute name="name" type="string"></attribute>
|
||||
<attribute name="endpointPort" type="int"></attribute>
|
||||
<attribute name="endpointHost" type="string"></attribute>
|
||||
</complexType>
|
||||
|
||||
<complexType name="definition">
|
||||
</complexType>
|
||||
|
||||
<complexType name="events">
|
||||
<sequence maxOccurs="unbounded" minOccurs="0">
|
||||
<element name="event" type="report:event"></element>
|
||||
</sequence>
|
||||
</complexType>
|
||||
|
||||
<complexType name="event">
|
||||
<attribute name="date" type="dateTime"></attribute>
|
||||
<!-- message is content -->
|
||||
</complexType>
|
||||
|
||||
|
||||
</schema>
|
||||
@@ -0,0 +1,43 @@
|
||||
/*
|
||||
* Copyright (C) 2009-2010 Alfresco Software Limited.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
|
||||
* This program 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 General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have received a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing"
|
||||
*/
|
||||
package org.alfresco.repo.transfer.report;
|
||||
|
||||
import org.alfresco.repo.transfer.TransferModel;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
|
||||
/**
|
||||
* The transfer report model - extended for XML Manifest Model
|
||||
*/
|
||||
public interface TransferReportModel extends TransferModel
|
||||
{
|
||||
static final String LOCALNAME_TRANSFER_REPORT = "transferReport";
|
||||
static final String LOCALNAME_TRANSFER_TARGET = "target";
|
||||
static final String LOCALNAME_TRANSFER_DEFINITION = "definition";
|
||||
static final String LOCALNAME_TRANSFER_EVENTS = "events";
|
||||
static final String LOCALNAME_TRANSFER_EVENT = "event";
|
||||
static final String REPORT_PREFIX = "report";
|
||||
|
||||
static final String TRANSFER_REPORT_MODEL_1_0_URI = "http://www.alfresco.org/model/transferReport/1.0";
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2009 Alfresco Software Limited.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
|
||||
* This program 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 General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have recieved a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing"
|
||||
*/
|
||||
package org.alfresco.repo.transfer.report;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.alfresco.repo.transfer.Transfer;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.transfer.TransferDefinition;
|
||||
import org.alfresco.service.cmr.transfer.TransferEvent;
|
||||
import org.alfresco.service.cmr.transfer.TransferTarget;
|
||||
|
||||
public interface TransferReporter
|
||||
{
|
||||
/**
|
||||
* Create a transfer report
|
||||
* @param target the target of the transfer
|
||||
* @param definition the definition of the transfer
|
||||
* @param events the transfer events generated by the transfer.
|
||||
* @return the node ref of the transfer report
|
||||
*/
|
||||
NodeRef createTransferReport(Transfer transfer,
|
||||
TransferTarget target,
|
||||
TransferDefinition definition,
|
||||
List<TransferEvent> events);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,151 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2009 Alfresco Software Limited.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
|
||||
* This program 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 General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have recieved a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing"
|
||||
*/
|
||||
package org.alfresco.repo.transfer.report;
|
||||
|
||||
import java.io.BufferedWriter;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStreamWriter;
|
||||
import java.io.Serializable;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import org.alfresco.model.ContentModel;
|
||||
import org.alfresco.repo.content.MimetypeMap;
|
||||
import org.alfresco.repo.transfer.Transfer;
|
||||
import org.alfresco.repo.transfer.TransferModel;
|
||||
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
||||
import org.alfresco.service.cmr.repository.ContentService;
|
||||
import org.alfresco.service.cmr.repository.ContentWriter;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.NodeService;
|
||||
import org.alfresco.service.cmr.transfer.TransferDefinition;
|
||||
import org.alfresco.service.cmr.transfer.TransferEvent;
|
||||
import org.alfresco.service.cmr.transfer.TransferTarget;
|
||||
import org.alfresco.service.namespace.NamespaceService;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
import org.alfresco.util.PropertyCheck;
|
||||
import org.dom4j.io.XMLWriter;
|
||||
import org.xml.sax.SAXException;
|
||||
|
||||
public class TransferReporterImpl implements TransferReporter
|
||||
{
|
||||
private NodeService nodeService;
|
||||
private ContentService contentService;
|
||||
|
||||
/** Default encoding **/
|
||||
private static String DEFAULT_ENCODING = "UTF-8";
|
||||
|
||||
public void init()
|
||||
{
|
||||
PropertyCheck.mandatory(this, "nodeService", nodeService);
|
||||
PropertyCheck.mandatory(this, "contentService", contentService);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new transfer report
|
||||
* @return NodeRef the node ref of the new transfer report
|
||||
*/
|
||||
public NodeRef createTransferReport(Transfer transfer,
|
||||
TransferTarget target,
|
||||
TransferDefinition definition,
|
||||
List<TransferEvent> events)
|
||||
{
|
||||
Map<QName, Serializable> properties = new HashMap<QName, Serializable> ();
|
||||
String transferId = transfer.getTransferId();
|
||||
String title = "transfer report: success :" + transferId;
|
||||
String name = transferId;
|
||||
String description = "successful transfer report";
|
||||
|
||||
properties.put(ContentModel.PROP_NAME, name);
|
||||
properties.put(ContentModel.PROP_TITLE, title);
|
||||
properties.put(ContentModel.PROP_DESCRIPTION, description);
|
||||
ChildAssociationRef ref = nodeService.createNode(target.getNodeRef(), ContentModel.ASSOC_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, name), TransferModel.TYPE_TRANSFER_REPORT, properties);
|
||||
ContentWriter writer = contentService.getWriter(ref.getChildRef(), ContentModel.PROP_CONTENT, true);
|
||||
writer.setLocale(Locale.getDefault());
|
||||
writer.setMimetype(MimetypeMap.MIMETYPE_XML);
|
||||
writer.setEncoding("UTF-8");
|
||||
|
||||
//
|
||||
XMLTransferReportWriter reportWriter = new XMLTransferReportWriter();
|
||||
|
||||
BufferedWriter bufferedWriter = new BufferedWriter(new OutputStreamWriter(writer.getContentOutputStream()));
|
||||
|
||||
try
|
||||
{
|
||||
reportWriter.startTransferReport("UTF-8", bufferedWriter);
|
||||
|
||||
// Header
|
||||
reportWriter.writeTarget(target);
|
||||
|
||||
reportWriter.writeDefinition(definition);
|
||||
|
||||
// Detail
|
||||
reportWriter.writeTransferEvents(events);
|
||||
|
||||
reportWriter.endTransferReport();
|
||||
|
||||
return ref.getChildRef();
|
||||
}
|
||||
|
||||
catch (SAXException se)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
finally
|
||||
{
|
||||
try
|
||||
{
|
||||
bufferedWriter.close();
|
||||
}
|
||||
catch (IOException error)
|
||||
{
|
||||
error.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void setNodeService(NodeService nodeService)
|
||||
{
|
||||
this.nodeService = nodeService;
|
||||
}
|
||||
|
||||
public NodeService getNodeService()
|
||||
{
|
||||
return nodeService;
|
||||
}
|
||||
|
||||
public void setContentService(ContentService contentService)
|
||||
{
|
||||
this.contentService = contentService;
|
||||
}
|
||||
|
||||
public ContentService getContentService()
|
||||
{
|
||||
return contentService;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,119 @@
|
||||
package org.alfresco.repo.transfer.report;
|
||||
|
||||
import java.io.Writer;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import org.alfresco.repo.transfer.TransferModel;
|
||||
import org.alfresco.repo.transfer.manifest.ManifestModel;
|
||||
import org.alfresco.repo.transfer.manifest.TransferManifestHeader;
|
||||
import org.alfresco.service.cmr.transfer.TransferDefinition;
|
||||
import org.alfresco.service.cmr.transfer.TransferEvent;
|
||||
import org.alfresco.service.cmr.transfer.TransferTarget;
|
||||
import org.alfresco.util.ISO8601DateFormat;
|
||||
import org.dom4j.io.OutputFormat;
|
||||
import org.dom4j.io.XMLWriter;
|
||||
import org.xml.sax.SAXException;
|
||||
import org.xml.sax.helpers.AttributesImpl;
|
||||
|
||||
public class XMLTransferReportWriter
|
||||
{
|
||||
public XMLTransferReportWriter()
|
||||
{
|
||||
}
|
||||
|
||||
private XMLWriter writer;
|
||||
|
||||
final AttributesImpl EMPTY_ATTRIBUTES = new AttributesImpl();
|
||||
|
||||
final String PREFIX = TransferReportModel.REPORT_PREFIX;
|
||||
|
||||
/**
|
||||
* Start the transfer report
|
||||
*/
|
||||
public void startTransferReport(String encoding, Writer writer) throws SAXException
|
||||
{
|
||||
OutputFormat format = OutputFormat.createPrettyPrint();
|
||||
format.setNewLineAfterDeclaration(false);
|
||||
format.setIndentSize(3);
|
||||
format.setEncoding(encoding);
|
||||
|
||||
this.writer = new XMLWriter(writer, format);
|
||||
this.writer.startDocument();
|
||||
|
||||
this.writer.startPrefixMapping(PREFIX, TransferReportModel.TRANSFER_REPORT_MODEL_1_0_URI);
|
||||
|
||||
// Start Transfer Manifest // uri, name, prefix
|
||||
this.writer.startElement(TransferReportModel.TRANSFER_REPORT_MODEL_1_0_URI, TransferReportModel.LOCALNAME_TRANSFER_REPORT, PREFIX + ":" + TransferReportModel.LOCALNAME_TRANSFER_REPORT, EMPTY_ATTRIBUTES);
|
||||
}
|
||||
|
||||
/**
|
||||
* End the transfer report
|
||||
*/
|
||||
public void endTransferReport() throws SAXException
|
||||
{
|
||||
// End Transfer Manifest
|
||||
writer.endElement(TransferReportModel.TRANSFER_REPORT_MODEL_1_0_URI, TransferReportModel.LOCALNAME_TRANSFER_REPORT, PREFIX + ":" + TransferReportModel.LOCALNAME_TRANSFER_REPORT);
|
||||
writer.endPrefixMapping(PREFIX);
|
||||
writer.endDocument();
|
||||
}
|
||||
|
||||
/**
|
||||
* Write the target to the report
|
||||
*/
|
||||
public void writeTarget(TransferTarget target) throws SAXException
|
||||
{
|
||||
AttributesImpl attributes = new AttributesImpl();
|
||||
attributes.addAttribute(TransferReportModel.TRANSFER_REPORT_MODEL_1_0_URI, "name", "name", "String", target.getName());
|
||||
attributes.addAttribute(TransferReportModel.TRANSFER_REPORT_MODEL_1_0_URI, "endpointHost", "endpointHost", "String", target.getEndpointHost());
|
||||
attributes.addAttribute(TransferReportModel.TRANSFER_REPORT_MODEL_1_0_URI, "endpointPort", "endpointPort", "int", String.valueOf(target.getEndpointPort()));
|
||||
|
||||
writer.startElement(TransferReportModel.TRANSFER_REPORT_MODEL_1_0_URI, TransferReportModel.LOCALNAME_TRANSFER_TARGET, PREFIX + ":" + TransferReportModel.LOCALNAME_TRANSFER_TARGET, attributes);
|
||||
writer.endElement(TransferReportModel.TRANSFER_REPORT_MODEL_1_0_URI, TransferReportModel.LOCALNAME_TRANSFER_TARGET, PREFIX + ":" + TransferReportModel.LOCALNAME_TRANSFER_TARGET);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Write the definition to the report
|
||||
*/
|
||||
public void writeDefinition(TransferDefinition definition) throws SAXException
|
||||
{
|
||||
writer.startElement(TransferReportModel.TRANSFER_REPORT_MODEL_1_0_URI, TransferReportModel.LOCALNAME_TRANSFER_DEFINITION, PREFIX + ":" + TransferReportModel.LOCALNAME_TRANSFER_DEFINITION, EMPTY_ATTRIBUTES);
|
||||
writer.endElement(TransferReportModel.TRANSFER_REPORT_MODEL_1_0_URI, TransferReportModel.LOCALNAME_TRANSFER_DEFINITION, PREFIX + ":" + TransferReportModel.LOCALNAME_TRANSFER_DEFINITION);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Write the transfer manifest header
|
||||
*/
|
||||
public void writeTransferEvents(List<TransferEvent> events) throws SAXException
|
||||
{
|
||||
writer.startElement(TransferReportModel.TRANSFER_REPORT_MODEL_1_0_URI, TransferReportModel.LOCALNAME_TRANSFER_EVENTS, PREFIX + ":" + TransferReportModel.LOCALNAME_TRANSFER_EVENTS, EMPTY_ATTRIBUTES);
|
||||
|
||||
for(TransferEvent event : events)
|
||||
{
|
||||
writeTransferEvent(event);
|
||||
}
|
||||
|
||||
writer.endElement(TransferReportModel.TRANSFER_REPORT_MODEL_1_0_URI, TransferReportModel.LOCALNAME_TRANSFER_EVENTS, PREFIX + ":" + TransferReportModel.LOCALNAME_TRANSFER_EVENTS);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Write the transfer manifest header
|
||||
*/
|
||||
public void writeTransferEvent(TransferEvent event) throws SAXException
|
||||
{
|
||||
AttributesImpl attributes = new AttributesImpl();
|
||||
attributes.addAttribute(TransferReportModel.TRANSFER_REPORT_MODEL_1_0_URI, "date", "date", "dateTime", ISO8601DateFormat.format(event.getTime()));
|
||||
|
||||
writer.startElement(TransferReportModel.TRANSFER_REPORT_MODEL_1_0_URI, TransferReportModel.LOCALNAME_TRANSFER_EVENT, PREFIX + ":" + TransferReportModel.LOCALNAME_TRANSFER_EVENT, attributes);
|
||||
|
||||
String message = event.getMessage();
|
||||
if(message != null)
|
||||
{
|
||||
writer.characters(message.toCharArray(), 0, message.length());
|
||||
}
|
||||
writer.endElement(TransferReportModel.TRANSFER_REPORT_MODEL_1_0_URI, TransferReportModel.LOCALNAME_TRANSFER_EVENT, PREFIX + ":" + TransferReportModel.LOCALNAME_TRANSFER_EVENT);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user