Author: tdraier
Date: Fri Jul 6 12:30:48 2007
New Revision: 17900
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17900&repname=
=3Djahia
Log:
added an error when file is in incorrect format (backport 17866)
Modified:
trunk/core/src/conf/java/JahiaEnginesResources.properties
trunk/core/src/conf/java/JahiaEnginesResources_en.properties
trunk/core/src/conf/java/JahiaEnginesResources_fr.properties
trunk/core/src/java/org/jahia/services/importexport/ImportExportBaseSer=
vice.java
Modified: trunk/core/src/conf/java/JahiaEnginesResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources.properties&rev=3D17900&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/JahiaEnginesResources.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources.properties Fri Jul 6 12=
:30:48 2007
@@ -1450,6 +1450,7 @@
org.jahia.engines.importexport.import.linkNotFound =3D Page link {0} in ja=
hia link on page {1} has not been found in import - ({2}, line {3})
org.jahia.engines.importexport.import.linkNotFoundInBigText =3D Page link =
{0} in bigtext {1} on page {2} has not been found in import - ({3}, line {4=
})
org.jahia.engines.importexport.import.template =3D Template not found for =
object {0} : {1} ({2}, line {3})
+org.jahia.engines.importexport.import.fileerror =3D Error when importing f=
ile
org.jahia.engines.importexport.import.error =3D Error when importing objec=
t {0} ({1}) : {2} ({3}, line {4})
org.jahia.engines.importexport.import.definition =3D Definition not found =
for object {0} ({1}), in {2} (template {3}) ({4}, line {5})
org.jahia.engines.importexport.import.definitionInCtn =3D Definition not f=
ound for object {0} ({1}), in {2} (container {4} in template {3}) ({5}, lin=
e {6})
Modified: trunk/core/src/conf/java/JahiaEnginesResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources_en.properties&rev=3D17900&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/JahiaEnginesResources_en.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources_en.properties Fri Jul 6=
12:30:48 2007
@@ -1442,6 +1442,7 @@
org.jahia.engines.importexport.import.linkNotFound =3D Page link {0} in ja=
hia link on page {1} has not been found in import - ({2}, line {3})
org.jahia.engines.importexport.import.linkNotFoundInBigText =3D Page link =
{0} in bigtext {1} on page {2} has not been found in import - ({3}, line {4=
})
org.jahia.engines.importexport.import.template =3D Template not found for =
object {0} : {1} ({2}, line {3})
+org.jahia.engines.importexport.import.fileerror =3D Error when importing f=
ile
org.jahia.engines.importexport.import.error =3D Error when importing objec=
t {0} ({1}) : {2} ({3}, line {4})
org.jahia.engines.importexport.import.definition =3D Definition not found =
for object {0} ({1}), in {2} (template {3}) ({4}, line {5})
org.jahia.engines.importexport.import.definitionInCtn =3D Definition not f=
ound for object {0} ({1}), in {2} (container {4} in template {3}) ({5}, lin=
e {6})
Modified: trunk/core/src/conf/java/JahiaEnginesResources_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources_fr.properties&rev=3D17900&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/JahiaEnginesResources_fr.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources_fr.properties Fri Jul 6=
12:30:48 2007
@@ -447,6 +447,7 @@
org.jahia.engines.importexport.import.definition =3D D=C3=A9finition non t=
rouv=C3=A9e pour l''objet {0} ({1}), in {2} (template {3}) ({4}, ligne {5})
org.jahia.engines.importexport.import.definitionInCtn =3D D=C3=A9finition =
non trouv=C3=A9e pour l''objet {0} ({1}), in {2} (container {4} dans la tem=
plate {3}) ({5}, ligne {6})
org.jahia.engines.importexport.import.error =3D Erreur lors de l''import d=
e l''objet {0} ({1}) : {2} ({3}, ligne {4})
+org.jahia.engines.importexport.import.fileerror =3D Erreur lors de l'impor=
t du fichier
org.jahia.engines.importexport.import.linkNotFound =3D Le lien {0} dans la=
page {1} n a pas =C3=A9t=C3=A9 trouv=C3=A9 dans l''import - ({2}, ligne {3=
})
org.jahia.engines.importexport.import.linkNotFoundInBigText =3D Le lien {0=
} dans le bigtext {1} sur la page {2} n''a pas =C3=A9t=C3=A9 trouv=C3=A9 da=
ns l''import - ({3}, ligne {4})
org.jahia.engines.importexport.import.notimported =3D Objet {0} ({1}) non =
import=C3=A9 ({2}, ligne {3})
Modified: trunk/core/src/java/org/jahia/services/importexport/ImportExportB=
aseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/importexport/ImportExportBaseService.java&rev=3D17900&rep=
name=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/importexport/ImportExportBaseSer=
vice.java (original)
+++ trunk/core/src/java/org/jahia/services/importexport/ImportExportBaseSer=
vice.java Fri Jul 6 12:30:48 2007
@@ -85,6 +85,7 @@
import org.jahia.services.webdav.JahiaWebdavBaseService;
import org.jahia.taglibs.esi.JesiConst;
import org.jahia.utils.LanguageCodeConverters;
+import org.jahia.engines.EngineMessage;
import org.quartz.CronTrigger;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
@@ -1650,6 +1651,9 @@
return handler.getLastObject();
} catch (Exception e) {
logger.warn("Cannot import document" ,e);
+ result.setStatus(TreeOperationResult.FAILED_OPERATION_STATUS);
+ final EngineMessage msg =3D new EngineMessage("org.jahia.engin=
es.importexport.import.fileerror", new Object[] {});
+ result.appendError(new NodeImportResult(null, null, msg, null,=
null,null,null, e));
return null;
} finally {
jParams.setTheUser(oldUser);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
