Author: tdraier
Date: Thu Aug 2 17:02:34 2007
New Revision: 18124
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18124&repname=
=3Djahia
Log:
optimized metadata import, do not reset last modification and contributor d=
ate
(port 18012)
Modified:
trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java
trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentL=
astContributorListener.java
trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentL=
astModificationDateListener.java
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=3D18124&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 =
Thu Aug 2 17:02:34 2007
@@ -157,6 +157,7 @@
public void startDocument() throws SAXException {
logger.info("Import starts");
oldLocale =3D jParams.getCurrentLocale();
+ jParams.setAttribute("importMode", Boolean.TRUE);
Locale currentLocale =3D LanguageCodeConverters.languageCodeToLoca=
le(language);
=
try {
@@ -808,8 +809,6 @@
logger.debug("Why is cross ref list empty ?");
}
}
- JahiaEvent objectCreatedEvent =3D new JahiaEvent(this, jParams=
, object);
- ServicesRegistry.getInstance().getJahiaEventService().fireCont=
entObjectCreated(objectCreatedEvent);
}
return object;
}
Modified: trunk/core/src/java/org/jahia/services/metadata/core/listeners/Co=
ntentLastContributorListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/metadata/core/listeners/ContentLastContributorListener.ja=
va&rev=3D18124&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/metadata/core/listeners/ContentL=
astContributorListener.java (original)
+++ trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentL=
astContributorListener.java Thu Aug 2 17:02:34 2007
@@ -162,7 +162,7 @@
}
=
protected void handleObjectChanged(JahiaEvent theEvent, boolean conten=
tCreated) {
- if (theEvent.getSource().getClass().equals(ImportHandler.class)){
+ if (Jahia.getThreadParamBean().getAttribute("importMode") !=3D nul=
l){
return;
}
Object eventObject =3D theEvent.getObject();
Modified: trunk/core/src/java/org/jahia/services/metadata/core/listeners/Co=
ntentLastModificationDateListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/metadata/core/listeners/ContentLastModificationDateListen=
er.java&rev=3D18124&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/metadata/core/listeners/ContentL=
astModificationDateListener.java (original)
+++ trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentL=
astModificationDateListener.java Thu Aug 2 17:02:34 2007
@@ -147,7 +147,7 @@
}
=
public void handleObjectChanged(JahiaEvent theEvent) {
- if (theEvent.getSource().getClass().equals(ImportHandler.class)){
+ if (Jahia.getThreadParamBean().getAttribute("importMode") !=3D nul=
l){
return;
}
Object eventObject =3D theEvent.getObject();
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
