Author: knguyen
Date: Thu May 31 16:17:28 2007
New Revision: 17422
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17422&repname=
=3Djahia
Log:
metadata update need staged loadRequest instead of live.
Added:
trunk/core/src/java/org/jahia/services/metadata/core/listeners/Metadata=
Tools.java
Modified:
trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentC=
reationDateListener.java
trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentC=
reatorListener.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
trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentL=
astPublisherListener.java
trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentL=
astPublishingDateListener.java
trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentP=
agePathListener.java
Modified: trunk/core/src/java/org/jahia/services/metadata/core/listeners/Co=
ntentCreationDateListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/metadata/core/listeners/ContentCreationDateListener.java&=
rev=3D17422&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/ContentC=
reationDateListener.java (original)
+++ trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentC=
reationDateListener.java Thu May 31 16:17:28 2007
@@ -24,6 +24,7 @@
import org.jahia.data.fields.JahiaField;
import org.jahia.engines.metadata.Metadata_Engine;
import org.jahia.params.ProcessingContext;
+import org.jahia.services.version.EntryLoadRequest;
=
import java.util.HashMap;
=
@@ -98,6 +99,7 @@
if ( contentObject =3D=3D null || jParams=3D=3Dnull ){
return;
}
+ boolean resetStagingLoadRequest =3D MetadataTools.switchToStagingE=
ntryLoadRequest(jParams);
try {
JahiaField jahiaField =3D contentObject.getMetadataAsJahiaFiel=
d(this.getMetadataName(),jParams);
if ( jahiaField =3D=3D null ){
@@ -109,6 +111,10 @@
}
} catch ( Throwable t ){
logger.debug(t);
+ } finally {
+ if (resetStagingLoadRequest){
+ jParams.resetSubstituteEntryLoadRequest();
+ }
}
}
=
Modified: trunk/core/src/java/org/jahia/services/metadata/core/listeners/Co=
ntentCreatorListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/metadata/core/listeners/ContentCreatorListener.java&rev=
=3D17422&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/ContentC=
reatorListener.java (original)
+++ trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentC=
reatorListener.java Thu May 31 16:17:28 2007
@@ -100,6 +100,7 @@
if ( jParams.getUser() !=3D null ){
userName =3D jParams.getUser().getUsername();
}
+ boolean resetStagingLoadRequest =3D MetadataTools.switchToStagingE=
ntryLoadRequest(jParams);
try {
JahiaField jahiaField =3D contentObject.getMetadataAsJahiaFiel=
d(this.getMetadataName(),jParams);
if ( jahiaField =3D=3D null ){
@@ -111,6 +112,10 @@
}
} catch ( Throwable t ){
logger.debug("Exception occured on contentObjectCreated event"=
,t);
+ } finally {
+ if (resetStagingLoadRequest){
+ jParams.resetSubstituteEntryLoadRequest();
+ }
}
}
}
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=3D17422&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 May 31 16:17:28 2007
@@ -271,6 +271,8 @@
if ( jParams =3D=3D null ){
jParams =3D Jahia.getThreadParamBean();
}
+ boolean resetStagingLoadRequest =3D MetadataTools.switchToStagingE=
ntryLoadRequest(jParams);
+ try {
JahiaField jahiaField =3D contentObject.getMetadataAsJahiaField(th=
is.getMetadataName(),jParams, true);
if ( jahiaField =3D=3D null ){
return;
@@ -284,6 +286,15 @@
jahiaField.setValue(userName);
jahiaField.save(jParams);
}
+ } catch ( Throwable t ){
+ if (resetStagingLoadRequest){
+ jParams.resetSubstituteEntryLoadRequest();
+ }
+ throw new Exception(t);
+ }
+ if (resetStagingLoadRequest){
+ jParams.resetSubstituteEntryLoadRequest();
+ }
}
=
public void processEvent (String eventName, JahiaEvent theEvent) {
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=3D17422&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 May 31 16:17:28 2007
@@ -250,7 +250,9 @@
ProcessingContext jParams,
JahiaEvent theEvent)
throws Exception {
- logger.debug("Updating metadata for object " + contentObject);
+ boolean resetStagingLoadRequest =3D MetadataTools.switchToStagingE=
ntryLoadRequest(jParams);
+ try {
+ if(logger.isDebugEnabled())logger.debug("Updating metadata for=
object "+contentObject);
JahiaField jahiaField =3D contentObject.getMetadataAsJahiaField(th=
is.getMetadataName(), jParams, true);
if (jahiaField =3D=3D null) {
resetLastUpdateTime(contentObject.getObjectKey());
@@ -258,6 +260,15 @@
}
jahiaField.setObject(String.valueOf(theEvent.getEventTime()));
jahiaField.save(jParams);
+ } catch ( Throwable t ){
+ if (resetStagingLoadRequest){
+ jParams.resetSubstituteEntryLoadRequest();
+ }
+ throw new Exception(t);
+ }
+ if (resetStagingLoadRequest){
+ jParams.resetSubstituteEntryLoadRequest();
+ }
}
=
public void processEvent(String eventName, JahiaEvent theEvent) {
Modified: trunk/core/src/java/org/jahia/services/metadata/core/listeners/Co=
ntentLastPublisherListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/metadata/core/listeners/ContentLastPublisherListener.java=
&rev=3D17422&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=
astPublisherListener.java (original)
+++ trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentL=
astPublisherListener.java Thu May 31 16:17:28 2007
@@ -177,7 +177,8 @@
ProcessingContext jParams,
JahiaEvent theEvent)
throws Exception {
-
+ boolean resetStagingLoadRequest =3D MetadataTools.switchToStagingE=
ntryLoadRequest(jParams);
+ try {
JahiaField jahiaField =3D contentObject.getMetadataAsJahiaField(th=
is.getMetadataName(), jParams, false);
if (jahiaField =3D=3D null) {
resetLastUpdateTime(contentObject.getObjectKey());
@@ -191,7 +192,15 @@
}
jahiaField.setValue(userName);
jahiaField.save(jParams);
-
+ } catch ( Throwable t ){
+ if (resetStagingLoadRequest){
+ jParams.resetSubstituteEntryLoadRequest();
+ }
+ throw new Exception(t);
+ }
+ if (resetStagingLoadRequest){
+ jParams.resetSubstituteEntryLoadRequest();
+ }
}
=
}
Modified: trunk/core/src/java/org/jahia/services/metadata/core/listeners/Co=
ntentLastPublishingDateListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/metadata/core/listeners/ContentLastPublishingDateListener=
.java&rev=3D17422&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=
astPublishingDateListener.java (original)
+++ trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentL=
astPublishingDateListener.java Thu May 31 16:17:28 2007
@@ -169,7 +169,8 @@
ProcessingContext jParams,
JahiaEvent theEvent)
throws Exception {
-
+ boolean resetStagingLoadRequest =3D MetadataTools.switchToStagingE=
ntryLoadRequest(jParams);
+ try {
JahiaField jahiaField =3D contentObject.getMetadataAsJahiaField(th=
is.getMetadataName(), jParams, true);
if (jahiaField =3D=3D null) {
synchronized(lastUpdateTimeMap) {lastUpdateTimeMap.remove(cont=
entObject.getObjectKey());}
@@ -177,7 +178,15 @@
}
jahiaField.setObject(String.valueOf(theEvent.getEventTime()));
jahiaField.save(jParams);
-
+ } catch ( Throwable t ){
+ if (resetStagingLoadRequest){
+ jParams.resetSubstituteEntryLoadRequest();
+ }
+ throw new Exception(t);
+ }
+ if (resetStagingLoadRequest){
+ jParams.resetSubstituteEntryLoadRequest();
+ }
}
=
}
Modified: trunk/core/src/java/org/jahia/services/metadata/core/listeners/Co=
ntentPagePathListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/metadata/core/listeners/ContentPagePathListener.java&rev=
=3D17422&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/ContentP=
agePathListener.java (original)
+++ trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentP=
agePathListener.java Thu May 31 16:17:28 2007
@@ -109,6 +109,7 @@
}
String pagePath =3D "";
=
+ boolean resetStagingLoadRequest =3D MetadataTools.switchToStagingE=
ntryLoadRequest(jParams);
try {
pagePath =3D contentObject.getPagePathString(jParams);
=
@@ -123,6 +124,10 @@
jahiaField.save(jParams);
} catch ( Throwable t ){
logger.debug(t);
+ } finally {
+ if (resetStagingLoadRequest){
+ jParams.resetSubstituteEntryLoadRequest();
+ }
}
}
}
Added: trunk/core/src/java/org/jahia/services/metadata/core/listeners/Metad=
ataTools.java
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/core/src=
/java/org/jahia/services/metadata/core/listeners/MetadataTools.java&rev=3D1=
7422&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/Metadata=
Tools.java (added)
+++ trunk/core/src/java/org/jahia/services/metadata/core/listeners/Metadata=
Tools.java Thu May 31 16:17:28 2007
@@ -0,0 +1,37 @@
+package org.jahia.services.metadata.core.listeners;
+
+import org.jahia.params.ProcessingContext;
+import org.jahia.services.version.EntryLoadRequest;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: hollis
+ * Date: 31 mai 2007
+ * Time: 11:59:11
+ * To change this template use File | Settings | File Templates.
+ */
+public class MetadataTools {
+
+ public static boolean switchToStagingEntryLoadRequest(ProcessingContex=
t jParams){
+ if ( jParams =3D=3D null ){
+ return false;
+ }
+ EntryLoadRequest loadRequest =3D jParams.getEntryLoadRequest();
+ if (loadRequest=3D=3Dnull){
+ return false;
+ }
+ if ( loadRequest.isStaging() ){
+ return false;
+ }
+ List locales =3D new ArrayList();
+ locales.addAll(loadRequest.getLocales());
+ EntryLoadRequest stagingEntryLoadRequest =3D
+ new EntryLoadRequest(EntryLoadRequest.STAGING_WORKFLOW_STA=
TE,0,locales);
+ jParams.setSubstituteEntryLoadRequest(stagingEntryLoadRequest);
+ return true;
+ }
+
+}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
