inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue where importer failed to find correct xml meta-data file when an .acp file contained exported xml files. The importer would start parsing the last xml file found in the .acp file and generally barf with an exception that was bemusing.l

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2249 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2006-01-30 12:31:14 +00:00
parent de11c59226
commit a0bab2238c
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/java/org/alfresco/repo/importer/ACPImportPackageHandler.java
View File

@@ -80,27 +80,39 @@ public class ACPImportPackageHandler
{
try
{
// find data file
InputStream dataStream = null;
// find xml meta-data file
ZipEntry xmlMetaDataEntry = null;
// TODO: First, locate xml meta-data file by name
// Scan the zip entries one by one (the slow approach)
Enumeration entries = zipFile.entries();
while(entries.hasMoreElements())
{
ZipEntry entry = (ZipEntry)entries.nextElement();
if (!entry.isDirectory())
{
if (entry.getName().endsWith(".xml"))
// Locate xml file in root of .acp
String entryName = entry.getName();
if (entryName.endsWith(".xml") && entryName.indexOf('/') == -1 && entryName.indexOf('\\') == -1)
{
dataStream = zipFile.getInputStream(entry);
if (xmlMetaDataEntry != null)
{
throw new ImporterException("Failed to find unique xml meta-data file within .acp package - multiple xml meta-data files exist.");
}
xmlMetaDataEntry = entry;
}
}
}
// oh dear, there's no data file
if (dataStream == null)
if (xmlMetaDataEntry == null)
{
throw new ImporterException("Failed to find data file within zip package");
throw new ImporterException("Failed to find xml meta-data file within .acp package");
}
// open the meta-data xml file
InputStream dataStream = zipFile.getInputStream(xmlMetaDataEntry);
Reader inputReader = (dataFileEncoding == null) ? new InputStreamReader(dataStream) : new InputStreamReader(dataStream, dataFileEncoding);
return new BufferedReader(inputReader);
}
@@ -110,7 +122,7 @@ public class ACPImportPackageHandler
}
catch(IOException e)
{
throw new ImporterException("Failed to open data file within zip package due to " + e.getMessage());
throw new ImporterException("Failed to open xml meta-data file within .acp package due to " + e.getMessage());
}
}