Author: tdraier
Date: Fri Jul 6 14:50:21 2007
New Revision: 17905
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17905&repname=
=3Djahia
Log:
introduced importresults, add pid mapping information,
improved some import results nodes (backport 17888 17889 17890)
Added:
trunk/core/src/java/org/jahia/services/importexport/ExtendedImportResul=
t.java
- copied unchanged from r17891, branches/JAHIA-5-0-SP-BRANCH/core/src=
/java/org/jahia/services/importexport/ExtendedImportResult.java
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/admin/sites/ManageSites.java
trunk/core/src/java/org/jahia/services/importexport/ActivationContentPi=
ckerJob.java
trunk/core/src/java/org/jahia/services/importexport/ChangeContentPicker=
Job.java
trunk/core/src/java/org/jahia/services/importexport/CopyJob.java
trunk/core/src/java/org/jahia/services/importexport/ImportExportBaseSer=
vice.java
trunk/core/src/java/org/jahia/services/importexport/ImportExportService=
.java
trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java
trunk/core/src/java/org/jahia/services/importexport/ImportJob.java
trunk/core/src/java/org/jahia/services/importexport/NodeImportResult.ja=
va
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=3D17905&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 14=
:50:21 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.templateCompilation =3D Template {0}=
does not compile
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})
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=3D17905&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=
14:50:21 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.templateCompilation =3D Template {0}=
does not compile
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})
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=3D17905&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=
14:50:21 2007
@@ -452,6 +452,7 @@
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})
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.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/admin/sites/ManageSites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/admin/sites/ManageSites.java&rev=3D17905&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/java/org/jahia/admin/sites/ManageSites.java (original)
+++ trunk/core/src/java/org/jahia/admin/sites/ManageSites.java Fri Jul 6 1=
4:50:21 2007
@@ -56,6 +56,7 @@
import org.jahia.services.importexport.ImportExportBaseService;
import org.jahia.services.importexport.ImportJob;
import org.jahia.services.importexport.ImportResult;
+import org.jahia.services.importexport.ExtendedImportResult;
import org.jahia.services.lock.LockKey;
import org.jahia.services.lock.LockRegistry;
import org.jahia.services.pages.*;
@@ -1103,7 +1104,7 @@
=
ServicesRegistry.getInstance().getSchedulerService=
().scheduleJobNow(jobDetail);
} else {
- ServicesRegistry.getInstance().getImportExportServ=
ice().importFile(null, jParams, initialZip, true, new ImportResult());
+ ServicesRegistry.getInstance().getImportExportServ=
ice().importFile(null, jParams, initialZip, true, new ExtendedImportResult(=
));
}
}
=
Modified: trunk/core/src/java/org/jahia/services/importexport/ActivationCon=
tentPickerJob.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/importexport/ActivationContentPickerJob.java&rev=3D17905&=
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/java/org/jahia/services/importexport/ActivationContentPi=
ckerJob.java (original)
+++ trunk/core/src/java/org/jahia/services/importexport/ActivationContentPi=
ckerJob.java Fri Jul 6 14:50:21 2007
@@ -66,7 +66,7 @@
=
ContentObject pickedObject =3D picker.getPickedObject(StructuralRe=
lationship.ACTIVATION_PICKER_LINK);
=
- ImportResult result =3D new ImportResult();
+ ExtendedImportResult result =3D new ExtendedImportResult();
=
Set files =3D new HashSet();
JahiaUser oldUser =3D jParams.getUser();
Modified: trunk/core/src/java/org/jahia/services/importexport/ChangeContent=
PickerJob.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/importexport/ChangeContentPickerJob.java&rev=3D17905&repn=
ame=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/ChangeContentPicker=
Job.java (original)
+++ trunk/core/src/java/org/jahia/services/importexport/ChangeContentPicker=
Job.java Fri Jul 6 14:50:21 2007
@@ -59,7 +59,7 @@
String language =3D context.getCurrentLocale().toString();
=
JahiaUser oldUser =3D context.getUser();
- ImportResult result =3D new ImportResult();
+ ExtendedImportResult result =3D new ExtendedImportResult();
=
if ("objectChanged".equals(eventType)) {
ContentObject source =3D ContentObject.getContentObjectInstanc=
e(ObjectKey.getInstance((String) jobDataMap.get("source")));
Modified: trunk/core/src/java/org/jahia/services/importexport/CopyJob.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/importexport/CopyJob.java&rev=3D17905&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/java/org/jahia/services/importexport/CopyJob.java (origi=
nal)
+++ trunk/core/src/java/org/jahia/services/importexport/CopyJob.java Fri Ju=
l 6 14:50:21 2007
@@ -62,7 +62,7 @@
ContentObject dest =3D ContentObject.getContentObjectInstance(Obje=
ctKey.getInstance((String) jobDataMap.get(DEST)));
String link =3D (String) jobDataMap.get(LINK);
String version =3D (String) jobDataMap.get(VERSION);
- ImportResult result =3D new ImportResult();
+ ExtendedImportResult result =3D new ExtendedImportResult();
=
EntryLoadRequest loadrequest =3D EntryLoadRequest.STAGED;
=
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=3D17905&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 14:50:21 2007
@@ -632,6 +632,7 @@
boolean viewMetadata =3D !Boolean.FALSE.equals(params.get(VIEW=
_METADATA));
boolean viewLinks =3D !Boolean.FALSE.equals(params.get(VIEW_JA=
HIALINKS));
boolean viewWF =3D !Boolean.FALSE.equals(params.get(VIEW_WORKF=
LOW));
+ boolean viewPid =3D !Boolean.FALSE.equals(params.get(VIEW_PID)=
);
Set ghost =3D (Set) params.get(GHOST);
=
String link =3D (String) params.get(LINK);
@@ -936,6 +937,10 @@
exportWF(object, attr);
}
=
+ if (viewPid && object instanceof ContentPage) {
+ attr.addAttribute(JAHIA_URI, "pid", "jahia:pid", "CDATA", =
String.valueOf(object.getID()));
+ }
+
if (link !=3D null) {
attr.addAttribute(JAHIA_URI, "linkkey", "jahia:linkkey", "=
CDATA", object.getObjectKey().toString());
attr.addAttribute(JAHIA_URI, "linktype", "jahia:linktype",=
"CDATA", link);
@@ -1383,7 +1388,7 @@
}
}
=
- public ContentObject importFile(ContentObject parent, final Processing=
Context jParams, InputStream inputStream, boolean setUuid, ImportResult res=
ult) throws IOException {
+ public ContentObject importFile(ContentObject parent, final Processing=
Context jParams, InputStream inputStream, boolean setUuid, ExtendedImportRe=
sult result) throws IOException {
File tmp =3D File.createTempFile("import","zip");
OutputStream os =3D new FileOutputStream(tmp);
byte[] buf =3D new byte[4096];
@@ -1396,7 +1401,7 @@
return o;
}
=
- public ContentObject importFile(ContentObject parent, final Processing=
Context jParams, File file, boolean setUuid, ImportResult result) throws IO=
Exception {
+ public ContentObject importFile(ContentObject parent, final Processing=
Context jParams, File file, boolean setUuid, ExtendedImportResult result) t=
hrows IOException {
CategoriesImportHandler categoriesImportHandler =3D new Categories=
ImportHandler(jParams);
UsersImportHandler usersImportHandler =3D new UsersImportHandler(j=
Params);
List catProps =3D null;
@@ -1615,15 +1620,15 @@
}
}
=
- public ContentObject importDocument(ContentObject parent, String lang,=
ProcessingContext jParams, Reader reader, boolean updateOnly, boolean setU=
uid, ImportResult result) {
+ public ContentObject importDocument(ContentObject parent, String lang,=
ProcessingContext jParams, Reader reader, boolean updateOnly, boolean setU=
uid, ExtendedImportResult result) {
return importDocument(parent, lang, jParams, new InputSource(reade=
r), updateOnly, setUuid, result);
}
=
- public ContentObject importDocument(ContentObject parent, String lang,=
ProcessingContext jParams, InputStream inputStream, boolean updateOnly, bo=
olean setUuid, ImportResult result) {
+ public ContentObject importDocument(ContentObject parent, String lang,=
ProcessingContext jParams, InputStream inputStream, boolean updateOnly, bo=
olean setUuid, ExtendedImportResult result) {
return importDocument(parent, lang, jParams, new InputSource(input=
Stream), updateOnly, setUuid, result);
}
=
- public ContentObject importDocument(ContentObject parent, String lang,=
ProcessingContext jParams, InputSource is, boolean updateOnly, boolean set=
Uuid, ImportResult result) {
+ public ContentObject importDocument(ContentObject parent, String lang,=
ProcessingContext jParams, InputSource is, boolean updateOnly, boolean set=
Uuid, ExtendedImportResult result) {
JahiaUser oldUser =3D jParams.getUser();
try {
SAXParserFactory factory;
@@ -2082,7 +2087,7 @@
}
}
=
- public ContentObject copy(ContentObject source, ContentObject parentDe=
st, ProcessingContext jParams, EntryLoadRequest loadRequest, String link, I=
mportResult result) {
+ public ContentObject copy(ContentObject source, ContentObject parentDe=
st, ProcessingContext jParams, EntryLoadRequest loadRequest, String link, E=
xtendedImportResult result) {
try {
return copy(source, parentDest, getSiteLanguages(jParams.getSi=
te()), jParams, loadRequest, link, result);
} catch (JahiaException e) {
@@ -2091,7 +2096,7 @@
}
}
=
- public ContentObject copy(ContentObject source, ContentObject parentDe=
st, Set languages, ProcessingContext jParams, EntryLoadRequest loadRequest,=
String link, ImportResult result) {
+ public ContentObject copy(ContentObject source, ContentObject parentDe=
st, Set languages, ProcessingContext jParams, EntryLoadRequest loadRequest,=
String link, ExtendedImportResult result) {
JahiaUser oldUser =3D jParams.getUser();
try {
JahiaSite destSite =3D sitesService.getSite(parentDest.getSite=
ID());
Modified: trunk/core/src/java/org/jahia/services/importexport/ImportExportS=
ervice.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/importexport/ImportExportService.java&rev=3D17905&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/java/org/jahia/services/importexport/ImportExportService=
.java (original)
+++ trunk/core/src/java/org/jahia/services/importexport/ImportExportService=
.java Fri Jul 6 14:50:21 2007
@@ -81,6 +81,7 @@
String VIEW_JAHIALINKS =3D "links";
String VIEW_ACL =3D "acl";
String VIEW_WORKFLOW =3D "wf";
+ String VIEW_PID =3D "pid";
String INCLUDED =3D "included";
=
// Export
@@ -105,23 +106,23 @@
=
// Imports
=
- ContentObject importFile(ContentObject parent, ProcessingContext jPara=
ms, InputStream inputStream, boolean setUuid, ImportResult result) throws I=
OException;
+ ContentObject importFile(ContentObject parent, ProcessingContext jPara=
ms, InputStream inputStream, boolean setUuid, ExtendedImportResult result) =
throws IOException;
=
- ContentObject importFile(ContentObject parent, ProcessingContext jPara=
ms, File file, boolean setUuid, ImportResult result) throws IOException;
+ ContentObject importFile(ContentObject parent, ProcessingContext jPara=
ms, File file, boolean setUuid, ExtendedImportResult result) throws IOExcep=
tion;
=
- ContentObject importDocument(ContentObject parent, String lang, Proces=
singContext jParams, Reader reader, boolean updateOnly, boolean setUuid, Im=
portResult result);
+ ContentObject importDocument(ContentObject parent, String lang, Proces=
singContext jParams, Reader reader, boolean updateOnly, boolean setUuid, Ex=
tendedImportResult result);
=
- ContentObject importDocument(ContentObject parent, String lang, Proces=
singContext jParams, InputStream inputStream, boolean updateOnly, boolean s=
etUuid, ImportResult result);
+ ContentObject importDocument(ContentObject parent, String lang, Proces=
singContext jParams, InputStream inputStream, boolean updateOnly, boolean s=
etUuid, ExtendedImportResult result);
=
- ContentObject importDocument(ContentObject parent, String lang, Proces=
singContext jParams, InputSource inputSource, boolean updateOnly, boolean s=
etUuid, ImportResult result);
+ ContentObject importDocument(ContentObject parent, String lang, Proces=
singContext jParams, InputSource inputSource, boolean updateOnly, boolean s=
etUuid, ExtendedImportResult result);
=
void importCategories(ProcessingContext jParams, InputStream is);
=
// Copy
=
- ContentObject copy(ContentObject source, ContentObject parentDest, Pro=
cessingContext jParams, EntryLoadRequest loadRequest, String link, ImportRe=
sult result);
+ ContentObject copy(ContentObject source, ContentObject parentDest, Pro=
cessingContext jParams, EntryLoadRequest loadRequest, String link, Extended=
ImportResult result);
=
- ContentObject copy(ContentObject source, ContentObject parentDest, Set=
languages, ProcessingContext jParams, EntryLoadRequest loadRequest, String=
link, ImportResult result);
+ ContentObject copy(ContentObject source, ContentObject parentDest, Set=
languages, ProcessingContext jParams, EntryLoadRequest loadRequest, String=
link, ExtendedImportResult result);
=
boolean isCompatible(JahiaContainerDefinition dest, JahiaContainerDefi=
nition source);
=
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=3D17905&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 Jul 6 14:50:21 2007
@@ -123,7 +123,7 @@
protected ContentObject topObjectWithAclChanged;
protected String topAcl;
protected boolean restoreAcl =3D true;
- protected ImportResult result;
+ protected ExtendedImportResult result;
protected boolean copyUuid =3D false;
protected boolean copyReadAccessOnly =3D false;
protected int count =3D 0;
@@ -132,11 +132,11 @@
private TransactionTemplate transactionTemplate =3D null;
public static final String JAHIA_LINK =3D "jahiaLink";
=
- public ImportHandler(ContentObject root, ProcessingContext jParams, St=
ring language, ImportResult result) {
+ public ImportHandler(ContentObject root, ProcessingContext jParams, St=
ring language, ExtendedImportResult result) {
this(root, jParams, language, jParams.getSite(), result);
}
=
- public ImportHandler(ContentObject root, ProcessingContext jParams, St=
ring language, JahiaSite site, ImportResult result) {
+ public ImportHandler(ContentObject root, ProcessingContext jParams, St=
ring language, JahiaSite site, ExtendedImportResult result) {
this.jParams =3D jParams;
this.objects =3D new Stack();
this.currentObject =3D root;
@@ -847,6 +847,11 @@
=
String pageKey =3D atts.getValue(ImportExportBaseService.J=
AHIA_URI, "pageKey");
setPageKey(pageKey, jahiaPage.getContentPage());
+
+ String oldPid =3D atts.getValue(ImportExportBaseService.JA=
HIA_URI, "pid");
+ if (oldPid !=3D null) {
+ 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);
}
@@ -1771,10 +1776,14 @@
InputStream is =3D ServicesRegistry.getInstance().getImportExp=
ortService().makeJahiaRequest(url, jParams.getUser(), null, null, 5);
is.close();
} catch (IOException e) {
- logger.error("Cant make a local request at "+Jahia.getSettings=
().getLocalAccessUri()+", check your localAccessUri parameter ("+e.getMessa=
ge()+")");
-//
-// final EngineMessage msg =3D new EngineMessage("org.jahia.eng=
ines.importexport.import.templateCompilation", new Object[] {});
-// result.appendWarning(new NodeImportResult(new ContentPageKey=
(pageID), language, msg, null,null,null,null,e));
+ if (e.getMessage().startsWith("Unsupported HTTP status code [5=
00]")) {
+ String defname =3D ContentPage.getPage(pageID).getPageTemp=
late(elr).getName();
+ final EngineMessage msg =3D new EngineMessage("org.jahia.e=
ngines.importexport.import.templateCompilation", new Object[] {defname});
+ result.setStatus(TreeOperationResult.PARTIAL_OPERATION_STA=
TUS);
+ result.appendError(new NodeImportResult(new ContentPageKey=
(pageID), language, msg, null,null,null,null,e));
+ } else {
+ logger.error("Cant make a local request at "+Jahia.getSett=
ings().getLocalAccessUri()+", check your localAccessUri parameter ("+e.getM=
essage()+")");
+ }
}
finally {
if (method !=3D null)
@@ -1814,7 +1823,7 @@
return topAcl;
}
=
- public ImportResult getResult() {
+ public ExtendedImportResult getResult() {
return result;
}
}
Modified: trunk/core/src/java/org/jahia/services/importexport/ImportJob.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/importexport/ImportJob.java&rev=3D17905&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/java/org/jahia/services/importexport/ImportJob.java (ori=
ginal)
+++ trunk/core/src/java/org/jahia/services/importexport/ImportJob.java Fri =
Jul 6 14:50:21 2007
@@ -61,7 +61,7 @@
DAVFileAccess f =3D new DAVFileAccess (context, context.getSite(),=
context.getUser(), uri);
inputStream =3D f.downloadFile();
=
- ImportResult result =3D new ImportResult();
+ ExtendedImportResult result =3D new ExtendedImportResult();
ContentObject imported =3D null;
if (inputStream !=3D null) {
if (contentType.indexOf("zip")>0) {
Modified: trunk/core/src/java/org/jahia/services/importexport/NodeImportRes=
ult.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/importexport/NodeImportResult.java&rev=3D17905&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/NodeImportResult.ja=
va (original)
+++ trunk/core/src/java/org/jahia/services/importexport/NodeImportResult.ja=
va Fri Jul 6 14:50:21 2007
@@ -61,6 +61,10 @@
this.t =3D t;
}
=
+ public String getNamespace() {
+ return namespace;
+ }
+
public String getLocalName() {
return localName;
}
@@ -72,6 +76,11 @@
public String getImportString() {
return importString;
}
+
+ public Throwable getException() {
+ return t;
+ }
+
}
/**
*$Log $
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
