Author: tdraier
Date: Fri Sep 14 12:53:37 2007
New Revision: 18460
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18460&repname=
=3Djahia
Log:
put incompatible type error messages in process log (JAHIA-899) (port 18180)
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/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=3D18460&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 14 12=
:53:37 2007
@@ -1490,6 +1490,7 @@
=
#import
org.jahia.engines.importexport.import.notimported =3D Object {0} ({1}) not=
imported ({2}, line {3})
+org.jahia.engines.importexport.import.incompatible =3D Incompatible types =
"{0}" ({1}, line {2})
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})
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=3D18460&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 14=
12:53:37 2007
@@ -1498,6 +1498,7 @@
=
#import
org.jahia.engines.importexport.import.notimported =3D Object {0} ({1}) not=
imported ({2}, line {3})
+org.jahia.engines.importexport.import.incompatible =3D Incompatible types =
"{0}" ({1}, line {2})
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})
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=3D18460&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 14=
12:53:37 2007
@@ -445,6 +445,7 @@
org.jahia.engines.importexport.export.xml.label =3D Contenu XML (seulement=
la langue en cours)
org.jahia.engines.importexport.export.zipfiles.label =3D Archive ZIP avec =
contenu XML et fichiers
org.jahia.engines.importexport.export.zipnofiles.label =3D Archive ZIP ave=
c contenu XML
+org.jahia.engines.importexport.import.incompatible =3D Type incompatible "=
{0}" ({1}, line {2})
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})
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=3D18460&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 14 12:53:37 2007
@@ -247,11 +247,13 @@
if (objectID =3D=3D 0) {
if (key instanceof JahiaPage) {
int pageId =3D ((JahiaPage)key).getParentID();
+ result.setStatus(TreeOperationResult.PARTIAL_O=
PERATION_STATUS);
logger.warn("Page link " + ref + ", in jahia l=
ink on page " + pageId + " has not been found in import");
final EngineMessage msg =3D new EngineMessage(=
"org.jahia.engines.importexport.import.linkNotFound", new Object[] {ref, ""=
+pageId, language, ""+ getLineNumber()});
result.appendWarning(new NodeImportResult(((Ja=
hiaPage)key).getContentPage().getObjectKey(), language, msg, null,null,null=
,null,null));
} else if (key instanceof JahiaBigTextField) {
int pageId =3D ((JahiaBigTextField)key).getPag=
eID();
+ result.setStatus(TreeOperationResult.PARTIAL_O=
PERATION_STATUS);
logger.warn("Page link " + ref + ", in bigtext=
" + ((JahiaBigTextField) key).getID() + " on page " + pageId + " has not b=
een found in import");
final EngineMessage msg =3D new EngineMessage(=
"org.jahia.engines.importexport.import.linkNotFoundInBigText", new Object[]=
{ref, ""+((JahiaBigTextField) key).getID(), ""+pageId, language, ""+ getLi=
neNumber()});
result.appendWarning(new NodeImportResult(((Ja=
hiaBigTextField)key).getContentField().getObjectKey(), language, msg, null,=
null,null,null,null));
@@ -328,6 +330,9 @@
} catch (JahiaException e) {
throw new SAXException(e);
}
+ if (count =3D=3D 0 && result.getStatus() =3D=3D TreeOperationResul=
t.PARTIAL_OPERATION_STATUS) {
+ result.setStatus(TreeOperationResult.FAILED_OPERATION_STATUS);
+ }
logger.info("Imported "+count+ " elements");
}
=
@@ -362,10 +367,10 @@
}
ContentObject parent =3D (ContentObject) objects.peek();
if (parent !=3D null) {
- currentObject =3D createObject(parent, namespaceURI, l=
ocalName, atts);
+ currentObject =3D createObject(parent, namespaceURI, l=
ocalName, qName, atts);
} else {
if (currentObject =3D=3D null && site.getHomePageID() =
=3D=3D -1) {
- JahiaPage jahiaPage =3D createPage(localName, name=
spaceURI, atts, 0, site.getAclID());
+ JahiaPage jahiaPage =3D createPage(localName, name=
spaceURI, qName, atts, 0, site.getAclID());
currentObject =3D jahiaPage.getContentPage();
=
WorkflowEvent theEvent =3D new WorkflowEvent (this=
, currentObject, jParams.getUser(), language, false);
@@ -420,7 +425,7 @@
} else {
pageID =3D parent.getID();
}
- currentObject =3D getOrCreateContainerListOrField(=
localName, namespaceURI, atts, parent, pageID, containerID, false);
+ currentObject =3D getOrCreateContainerListOrField(=
localName, namespaceURI, qName, atts, parent, pageID, containerID, false);
} else if (parent instanceof ContentContainerList) {
// Container inside a list
List l =3D parent.getChilds(jParams.getUser(), elr=
);
@@ -452,7 +457,7 @@
}
}
if (updateOnly && currentObject =3D=3D null) {
- currentObject =3D createObject(parent, namespa=
ceURI, localName, atts);
+ currentObject =3D createObject(parent, namespa=
ceURI, localName, qName, atts);
}
if (op =3D=3D VersioningDifferenceStatus.TO_BE_REM=
OVED) {
containerIndex.put(parent, new Integer(iIndex.=
intValue()));
@@ -464,7 +469,7 @@
ContentPageField theField =3D (ContentPageField) p=
arent;
currentObject =3D theField.getContentPage(elr);
if (updateOnly && currentObject =3D=3D null) {
- currentObject =3D createObject(parent, namespa=
ceURI, localName, atts);
+ currentObject =3D createObject(parent, namespa=
ceURI, localName, qName, atts);
}
}
}
@@ -497,6 +502,7 @@
if (!objects.isEmpty() && objects.peek() !=3D null) {
key =3D new ContentPageKey(((ContentObject)objects.pee=
k()).getPageID());
}
+ result.setStatus(TreeOperationResult.PARTIAL_OPERATION_STA=
TUS);
final EngineMessage msg =3D new EngineMessage("org.jahia.e=
ngines.importexport.import.notimported", new Object[] {uuid, localName, lan=
guage, ""+ getLineNumber()});
result.appendWarning(new NodeImportResult(key, language, m=
sg, localName, namespaceURI, qName, atts, null));
if (uuid !=3D null) {
@@ -621,7 +627,7 @@
// }
}
=
- protected ContentObject createObject(ContentObject parent, String name=
spaceURI, String localName, Attributes atts) throws JahiaException {
+ protected ContentObject createObject(ContentObject parent, String name=
spaceURI, String localName, String qName, Attributes atts) throws JahiaExce=
ption {
logger.debug("Create {" + namespaceURI + "}" + localName);
ContentObject object =3D null;
int pageID =3D 0;
@@ -633,12 +639,12 @@
object =3D parent;
updatePage(((ContentPage)object), localName, atts);
} else {
- object =3D getOrCreateContainerListOrField(localName, name=
spaceURI, atts, parent, pageID, containerID, true);
+ object =3D getOrCreateContainerListOrField(localName, name=
spaceURI, qName, atts, parent, pageID, containerID, true);
}
} else if (parent instanceof ContentContainer) {
int containerID =3D parent.getID();
pageID =3D ((ContentContainer) parent).getPageID();
- object =3D getOrCreateContainerListOrField(localName, namespac=
eURI, atts, parent, pageID, containerID, true);
+ object =3D getOrCreateContainerListOrField(localName, namespac=
eURI, qName, atts, parent, pageID, containerID, true);
} else if (parent instanceof ContentContainerList) {
=
boolean isSingleContainer =3D false;
@@ -655,10 +661,16 @@
if (importedPt !=3D null) {
importedPt =3D importedPt.substring(importedPt.indexOf=
(':')+1);
if (!importedPt.equals(jcd.getName()) && !importedPt.e=
quals(pt) && !localName.equals(jcd.getName()) && !localName.equals(pt)) {
- throw new JahiaException("Cannot import - incompat=
ible types "+"{"+namespaceURI+"}"+localName,"Cannot import - incompatible t=
ypes"+"{"+namespaceURI+"}"+localName,JahiaException.USER_ERROR,JahiaExcepti=
on.CRITICAL_SEVERITY);
+ result.setStatus(TreeOperationResult.PARTIAL_OPERA=
TION_STATUS);
+ final EngineMessage msg =3D new EngineMessage("org=
.jahia.engines.importexport.import.incompatible", new Object[] {localName, =
language, ""+ getLineNumber()});
+ result.appendWarning(new NodeImportResult(null, la=
nguage, msg, localName, namespaceURI, qName , atts, null));
+ return null;
}
} else if (!localName.equals(jcd.getName()) && !localName.=
equals(pt)) {
- throw new JahiaException("Cannot import - incompatible=
types "+"{"+namespaceURI+"}"+localName,"Cannot import - incompatible types=
"+"{"+namespaceURI+"}"+localName,JahiaException.USER_ERROR,JahiaException.C=
RITICAL_SEVERITY);
+ result.setStatus(TreeOperationResult.PARTIAL_OPERATION=
_STATUS);
+ final EngineMessage msg =3D new EngineMessage("org.jah=
ia.engines.importexport.import.incompatible", new Object[] {localName, lang=
uage, ""+ getLineNumber()});
+ result.appendWarning(new NodeImportResult(null, langua=
ge, msg, localName, namespaceURI, qName , atts, null));
+ return null;
}
} catch (ClassNotFoundException e) {
}
@@ -723,7 +735,10 @@
} else if (parent instanceof ContentPageField) {
// Page
if (!namespaceURI.equals(ImportExportBaseService.JAHIA_URI)) {
- throw new JahiaException("Cannot import - incompatible typ=
es "+"{"+namespaceURI+"}"+localName,"Cannot import - incompatible types"+"{=
"+namespaceURI+"}"+localName,JahiaException.USER_ERROR,JahiaException.CRITI=
CAL_SEVERITY);
+ result.setStatus(TreeOperationResult.PARTIAL_OPERATION_STA=
TUS);
+ final EngineMessage msg =3D new EngineMessage("org.jahia.e=
ngines.importexport.import.incompatible", new Object[] {localName, language=
, ""+ getLineNumber()});
+ result.appendWarning(new NodeImportResult(null, language, =
msg, localName, namespaceURI, qName , atts, null));
+ return null;
}
ContentPageField theField =3D (ContentPageField) parent;
pageID =3D theField.getPageID();
@@ -739,7 +754,7 @@
object =3D cp;
} else {
int parentAclID =3D theField.getAclID();
- jahiaPage =3D createPage(localName, namespaceURI, atts, pa=
geID, parentAclID);
+ jahiaPage =3D createPage(localName, namespaceURI, qName, a=
tts, pageID, parentAclID);
=
JahiaField jahiaField =3D ((ContentPageField) parent).getJ=
ahiaField(elr);
jahiaField.setValue(Integer.toString(jahiaPage.getID()));
@@ -799,7 +814,7 @@
return object;
}
=
- private JahiaPage createPage(String localName, String namespaceURI, At=
tributes atts, int pageID, int parentAclID) throws JahiaException {
+ private JahiaPage createPage(String localName, String namespaceURI, St=
ring qName, Attributes atts, int pageID, int parentAclID) throws JahiaExcep=
tion {
JahiaPage jahiaPage;
String title =3D atts.getValue(ImportExportBaseService.JAHIA_URI, =
"title");
if (namespaceURI.equals(ImportExportBaseService.JAHIA_URI)) {
@@ -831,6 +846,7 @@
logger.warn("Template not found : "+template);
jpd =3D ServicesRegistry.getInstance().getJahiaPageTem=
plateService().lookupPageTemplate(site.getDefaultTemplateID());
=
+ result.setStatus(TreeOperationResult.PARTIAL_OPERATION=
_STATUS);
final EngineMessage msg =3D new EngineMessage("org.jah=
ia.engines.importexport.import.template", new Object[] {atts.getValue(Impor=
tExportBaseService.JCR_URI, "uuid"), template, language, ""+ getLineNumber(=
)});
result.appendWarning(new NodeImportResult(null, langua=
ge, msg, localName, namespaceURI, null,atts,null));
}
@@ -855,15 +871,21 @@
result.addPidMapping(Integer.parseInt(oldPid), jahiaPa=
ge.getID());
}
} else {
- throw new JahiaException("Cannot import - incompatible typ=
es "+"{"+namespaceURI+"}"+localName,"Cannot import - incompatible types"+"{=
"+namespaceURI+"}"+localName,JahiaException.USER_ERROR,JahiaException.CRITI=
CAL_SEVERITY);
+ result.setStatus(TreeOperationResult.PARTIAL_OPERATION_STA=
TUS);
+ final EngineMessage msg =3D new EngineMessage("org.jahia.e=
ngines.importexport.import.incompatible", new Object[] {localName, language=
, ""+ getLineNumber()});
+ result.appendWarning(new NodeImportResult(null, language, =
msg, localName, namespaceURI, qName , atts, null));
+ return null;
}
} else {
- throw new JahiaException("Cannot import - incompatible types "=
+"{"+namespaceURI+"}"+localName,"Cannot import - incompatible types"+"{"+na=
mespaceURI+"}"+localName,JahiaException.USER_ERROR,JahiaException.CRITICAL_=
SEVERITY);
+ result.setStatus(TreeOperationResult.PARTIAL_OPERATION_STATUS);
+ final EngineMessage msg =3D new EngineMessage("org.jahia.engin=
es.importexport.import.incompatible", new Object[] {localName, language, ""=
+ getLineNumber()});
+ result.appendWarning(new NodeImportResult(null, language, msg,=
localName, namespaceURI, qName , atts, null));
+ return null;
}
return jahiaPage;
}
=
- private ContentObject getOrCreateContainerListOrField(String localName=
, String namespaceURI, Attributes atts, ContentObject parent, int pageID, i=
nt containerID, boolean updateIfExists) throws JahiaException {
+ private ContentObject getOrCreateContainerListOrField(String localName=
, String namespaceURI, String qName, Attributes atts, ContentObject parent,=
int pageID, int containerID, boolean updateIfExists) throws JahiaException=
{
ContentObject object =3D null;
=
boolean isContainerList =3D false;
@@ -1040,7 +1062,10 @@
=
if (cf =3D=3D null) {
if (jfd =3D=3D null) {
- throw new JahiaException("Cannot import - incompatible=
types "+"{"+namespaceURI+"}"+localName,"Cannot import - incompatible types=
"+"{"+namespaceURI+"}"+localName,JahiaException.USER_ERROR,JahiaException.C=
RITICAL_SEVERITY);
+ result.setStatus(TreeOperationResult.PARTIAL_OPERATION=
_STATUS);
+ final EngineMessage msg =3D new EngineMessage("org.jah=
ia.engines.importexport.import.incompatible", new Object[] {localName, lang=
uage, ""+ getLineNumber()});
+ result.appendWarning(new NodeImportResult(null, langua=
ge, msg, localName, namespaceURI, qName , atts, null));
+ return null;
}
// Field Definition
String value =3D atts.getValue(ImportExportBaseService.JAH=
IA_URI, "value");
@@ -1085,11 +1110,13 @@
if (ctnName =3D=3D null) {
logger.warn("Definitions not found : " +localName + " =
/ " + parent.getObjectKey() + " (" + tplName + ")");
=
+ result.setStatus(TreeOperationResult.PARTIAL_OPERATION=
_STATUS);
final EngineMessage msg =3D new EngineMessage("org.jah=
ia.engines.importexport.import.definition", new Object[] {atts.getValue(Imp=
ortExportBaseService.JCR_URI, "uuid"), localName, parent.getObjectKey(), tp=
lName , language, ""+ getLineNumber()});
result.appendWarning(new NodeImportResult(key, languag=
e, msg, localName, namespaceURI, null,atts,null));
} else {
logger.warn("Definitions not found : " +localName + " =
/ " + parent.getObjectKey() + " (" + ctnName + " in " + tplName + ")");
=
+ result.setStatus(TreeOperationResult.PARTIAL_OPERATION=
_STATUS);
final EngineMessage msg =3D new EngineMessage("org.jah=
ia.engines.importexport.import.definitionInCtn", new Object[] {atts.getValu=
e(ImportExportBaseService.JCR_URI, "uuid"), localName, parent.getObjectKey(=
), tplName , ctnName, language, ""+ getLineNumber()});
result.appendWarning(new NodeImportResult(key, languag=
e, msg, localName, namespaceURI, null,atts,null));
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
