Author: knguyen
Date: Thu May 31 16:06:06 2007
New Revision: 17420
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17420&repname=
=3Djahia
Log:
metadata update need staged loadRequest instead of live.
Added:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/MetadataTools.java
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentCreationDateListener.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentCreatorListener.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastContributorListener.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastModificationDateListener.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastPublisherListener.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastPublishingDateListener.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentPagePathListener.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/met=
adata/core/listeners/ContentCreationDateListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/metadata/core/listeners/ContentCre=
ationDateListener.java&rev=3D17420&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentCreationDateListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentCreationDateListener.java Thu May 31 16:06:06 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: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/met=
adata/core/listeners/ContentCreatorListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/metadata/core/listeners/ContentCre=
atorListener.java&rev=3D17420&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentCreatorListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentCreatorListener.java Thu May 31 16:06:06 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: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/met=
adata/core/listeners/ContentLastContributorListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/metadata/core/listeners/ContentLas=
tContributorListener.java&rev=3D17420&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastContributorListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastContributorListener.java Thu May 31 16:06:06 2007
@@ -271,18 +271,29 @@
if ( jParams =3D=3D null ){
jParams =3D Jahia.getThreadParamBean();
}
- JahiaField jahiaField =3D contentObject.getMetadataAsJahiaField(th=
is.getMetadataName(),jParams, true);
- if ( jahiaField =3D=3D null ){
- return;
- }
- JahiaUser user =3D jParams.getUser();
- String userName =3D "unknown";
- if ( user !=3D null ){
- userName =3D user.getUsername();
+ boolean resetStagingLoadRequest =3D MetadataTools.switchToStagingE=
ntryLoadRequest(jParams);
+ try {
+ JahiaField jahiaField =3D contentObject.getMetadataAsJahiaFiel=
d(this.getMetadataName(),jParams, true);
+ if ( jahiaField =3D=3D null ){
+ return;
+ }
+ JahiaUser user =3D jParams.getUser();
+ String userName =3D "unknown";
+ if ( user !=3D null ){
+ userName =3D user.getUsername();
+ }
+ synchronized(jahiaField) {
+ jahiaField.setValue(userName);
+ jahiaField.save(jParams);
+ }
+ } catch ( Throwable t ){
+ if (resetStagingLoadRequest){
+ jParams.resetSubstituteEntryLoadRequest();
+ }
+ throw new Exception(t);
}
- synchronized(jahiaField) {
- jahiaField.setValue(userName);
- jahiaField.save(jParams);
+ if (resetStagingLoadRequest){
+ jParams.resetSubstituteEntryLoadRequest();
}
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/met=
adata/core/listeners/ContentLastModificationDateListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/metadata/core/listeners/ContentLas=
tModificationDateListener.java&rev=3D17420&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastModificationDateListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastModificationDateListener.java Thu May 31 16:06:06=
2007
@@ -250,14 +250,25 @@
ProcessingContext jParams,
JahiaEvent theEvent)
throws Exception {
- if(logger.isDebugEnabled())logger.debug("Updating metadata for obj=
ect "+contentObject);
- JahiaField jahiaField =3D contentObject.getMetadataAsJahiaField(th=
is.getMetadataName(),jParams, true);
- if ( jahiaField =3D=3D null ){
- resetLastUpdateTime(contentObject.getObjectKey());
- return;
+ boolean resetStagingLoadRequest =3D MetadataTools.switchToStagingE=
ntryLoadRequest(jParams);
+ try {
+ if(logger.isDebugEnabled())logger.debug("Updating metadata for=
object "+contentObject);
+ JahiaField jahiaField =3D contentObject.getMetadataAsJahiaFiel=
d(this.getMetadataName(),jParams, true);
+ if ( jahiaField =3D=3D null ){
+ resetLastUpdateTime(contentObject.getObjectKey());
+ return;
+ }
+ jahiaField.setObject(String.valueOf(theEvent.getEventTime()));
+ jahiaField.save(jParams);
+ } catch ( Throwable t ){
+ if (resetStagingLoadRequest){
+ jParams.resetSubstituteEntryLoadRequest();
+ }
+ throw new Exception(t);
+ }
+ if (resetStagingLoadRequest){
+ jParams.resetSubstituteEntryLoadRequest();
}
- jahiaField.setObject(String.valueOf(theEvent.getEventTime()));
- jahiaField.save(jParams);
}
=
public void processEvent(String eventName, JahiaEvent theEvent) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/met=
adata/core/listeners/ContentLastPublisherListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/metadata/core/listeners/ContentLas=
tPublisherListener.java&rev=3D17420&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastPublisherListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastPublisherListener.java Thu May 31 16:06:06 2007
@@ -177,21 +177,30 @@
ProcessingContext jParams,
JahiaEvent theEvent)
throws Exception {
+ boolean resetStagingLoadRequest =3D MetadataTools.switchToStagingE=
ntryLoadRequest(jParams);
+ try {
+ JahiaField jahiaField =3D contentObject.getMetadataAsJahiaFiel=
d(this.getMetadataName(), jParams, false);
+ if (jahiaField =3D=3D null) {
+ resetLastUpdateTime(contentObject.getObjectKey());
+ return;
+ }
=
- JahiaField jahiaField =3D contentObject.getMetadataAsJahiaField(th=
is.getMetadataName(), jParams, false);
- if (jahiaField =3D=3D null) {
- resetLastUpdateTime(contentObject.getObjectKey());
- return;
+ JahiaUser user =3D jParams.getUser();
+ String userName =3D "unknown";
+ if (user !=3D null) {
+ userName =3D user.getUsername();
+ }
+ jahiaField.setValue(userName);
+ jahiaField.save(jParams);
+ } catch ( Throwable t ){
+ if (resetStagingLoadRequest){
+ jParams.resetSubstituteEntryLoadRequest();
+ }
+ throw new Exception(t);
}
-
- JahiaUser user =3D jParams.getUser();
- String userName =3D "unknown";
- if (user !=3D null) {
- userName =3D user.getUsername();
+ if (resetStagingLoadRequest){
+ jParams.resetSubstituteEntryLoadRequest();
}
- jahiaField.setValue(userName);
- jahiaField.save(jParams);
-
}
=
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/met=
adata/core/listeners/ContentLastPublishingDateListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/metadata/core/listeners/ContentLas=
tPublishingDateListener.java&rev=3D17420&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastPublishingDateListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastPublishingDateListener.java Thu May 31 16:06:06 2=
007
@@ -170,15 +170,24 @@
ProcessingContext jParams,
JahiaEvent theEvent)
throws Exception {
-
- JahiaField jahiaField =3D contentObject.getMetadataAsJahiaField(th=
is.getMetadataName(), jParams, true);
- if (jahiaField =3D=3D null) {
- synchronized(lastUpdateTimeMap) {lastUpdateTimeMap.remove(cont=
entObject.getObjectKey());}
- return;
+ boolean resetStagingLoadRequest =3D MetadataTools.switchToStagingE=
ntryLoadRequest(jParams);
+ try {
+ JahiaField jahiaField =3D contentObject.getMetadataAsJahiaFiel=
d(this.getMetadataName(), jParams, true);
+ if (jahiaField =3D=3D null) {
+ synchronized(lastUpdateTimeMap) {lastUpdateTimeMap.remove(=
contentObject.getObjectKey());}
+ return;
+ }
+ jahiaField.setObject(String.valueOf(theEvent.getEventTime()));
+ jahiaField.save(jParams);
+ } catch ( Throwable t ){
+ if (resetStagingLoadRequest){
+ jParams.resetSubstituteEntryLoadRequest();
+ }
+ throw new Exception(t);
+ }
+ if (resetStagingLoadRequest){
+ jParams.resetSubstituteEntryLoadRequest();
}
- jahiaField.setObject(String.valueOf(theEvent.getEventTime()));
- jahiaField.save(jParams);
-
}
=
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/met=
adata/core/listeners/ContentPagePathListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/metadata/core/listeners/ContentPag=
ePathListener.java&rev=3D17420&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentPagePathListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentPagePathListener.java Thu May 31 16:06:06 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: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metada=
ta/core/listeners/MetadataTools.java
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/core/listeners/Met=
adataTools.java&rev=3D17420&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/MetadataTools.java (added)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/MetadataTools.java Thu May 31 16:06:06 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
