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

Merged 1.4 to HEAD

Browse Source 
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4316 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4317 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4319 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4328 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4652 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-19 12:18:46 +00:00
parent 372b3a8243
commit 00e6c989fc
5 changed files with 53 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/java/org/alfresco/repo/admin/patch/util/ImportFileUpdater.java
View File

@@ -41,6 +41,7 @@ public class ImportFileUpdater
/** The current import version number **/
private String version;
private boolean shownWarning = false;
/**
* Updates the passed import file into the equivalent 1.4 format.
@@ -52,6 +53,7 @@ public class ImportFileUpdater
{
XmlPullParser reader = getReader(source);
XMLWriter writer = getWriter(destination);
this.shownWarning = false;
try
{
@@ -206,11 +208,20 @@ public class ImportFileUpdater
}
else if (reader.getName().equals(NAME_RULE) == true)
{
if (this.version.startsWith("1.3") == true)
if (this.shownWarning == false && this.version == null)
{
System.out.println("WARNING: No version information has been found in this import file. It will be presumed it has been exported from 1.3");
this.shownWarning = true;
}
if (this.version == null || this.version.startsWith("1.3") == true || this.version.startsWith("1.2") == true)
{
new RuleCallback().doCallback(reader, writer);
result = true;
}
else
{
throw new RuntimeException("Import files of version " + this.version + " are not supported by this tool.");
}
}
return result;
}