Author: tdraier
Date: Fri Sep 21 11:44:52 2007
New Revision: 18614
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18614&repname=
=3Djahia
Log:
display nice error when language do not match ( JAHIA-2139 ) ( port 18556 )
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
trunk/core/src/java/org/jahia/services/importexport/ImportHandler.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=3D18614&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 Sep 21 11=
:44:52 2007
@@ -1501,6 +1501,7 @@
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})
+org.jahia.engines.importexport.import.languages =3D Languages do not match=
, {0} is not defined for this site.
=
##process Display
org.jahia.engines.processDisplay.label =3D Process
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=3D18614&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 Sep 21=
11:44:52 2007
@@ -1508,6 +1508,7 @@
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})
+org.jahia.engines.importexport.import.languages =3D Languages do not match=
, {0} is not defined for this site.
=
##process Display
org.jahia.engines.processDisplay.label =3D Process
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=3D18614&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 Sep 21=
11:44:52 2007
@@ -456,6 +456,7 @@
org.jahia.engines.importexport.import.notimported =3D Objet {0} ({1}) non =
import=C3=A9 ({2}, ligne {3})
org.jahia.engines.importexport.import.template =3D Template non trouv=C3=
=A9e pour l''objet {0} : {1} ({2}, ligne {3})
org.jahia.engines.importexport.import.templateCompilation =3D La template =
{0} ne compile pas
+org.jahia.engines.importexport.import.languages =3D Les langues ne corresp=
ondent pas, {0} n''est pas d=C3=A9fini pour ce site.
org.jahia.engines.include.actionSelector.Authoring.label =3D =C3=89dition
org.jahia.engines.include.actionSelector.Categories.label =3D Cat=C3=A9gor=
ies
org.jahia.engines.include.actionSelector.ContentDefinition.label =3D D=C3=
=A9finition de contenu
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=3D18614&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 Sep 21 11:44:52 2007
@@ -1694,10 +1694,17 @@
parser.parse(is, handler);
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));
+ if ("languages".equals(e.getMessage())) {
+ logger.warn("Languages do not match");
+ result.setStatus(TreeOperationResult.FAILED_OPERATION_STAT=
US);
+ final EngineMessage msg =3D new EngineMessage("org.jahia.e=
ngines.importexport.import.languages", new Object[] {lang});
+ result.appendError(new NodeImportResult(null, null, msg, n=
ull,null,null,null, e));
+ } else {
+ logger.warn("Cannot import document" ,e);
+ result.setStatus(TreeOperationResult.FAILED_OPERATION_STAT=
US);
+ final EngineMessage msg =3D new EngineMessage("org.jahia.e=
ngines.importexport.import.fileerror", new Object[] {});
+ result.appendError(new NodeImportResult(null, null, msg, n=
ull,null,null,null, e));
+ }
return null;
} finally {
jParams.setTheUser(oldUser);
Modified: trunk/core/src/java/org/jahia/services/importexport/ImportHandler=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/importexport/ImportHandler.java&rev=3D18614&repname=3Djah=
ia
=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/ImportHandler.java =
(original)
+++ trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java =
Fri Sep 21 11:44:52 2007
@@ -178,7 +178,7 @@
} else if (!"".equals(currentLocale.getCountry())) {
currentLocale =3D new Locale(currentLocale.getLang=
uage());
} else {
- throw new SAXException("Languages do not match");
+ throw new SAXException("languages");
}
}
}
@@ -345,7 +345,26 @@
result.setStatus(TreeOperationResult.FAILED_OPERATION_STATUS);
final EngineMessage msg =3D new EngineMessage("org.jahia.engin=
es.importexport.import.empty", new Object[] {language});
result.appendError(new NodeImportResult(null, language, msg, l=
ocalName, namespaceURI, qName, atts, null));
- objects.push(null);
+
+ JahiaPageService pageService =3D ServicesRegistry.getInstance(=
).getJahiaPageService();
+ try {
+ JahiaPage page =3D pageService.createPage(site.getID(),
+ 0,
+ PageInfoInterface.TYPE_DIRECT,
+ "Welcome to " + site.getServerName(),
+ site.getDefaultTemplateID(),
+ "http://";,
+ -1,
+ jParams.getUser().getUserKey(),
+ site.getAclID(),
+ jParams);
+ objects.push(page.getContentPage());
+ } catch (JahiaException e) {
+ logger.error("Cannot create default home page",e);
+ objects.push(null);
+ }
+ jParams.resetSubstituteEntryLoadRequest();
+
return;
}
try {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
