tdraier 2005/04/04 12:16:44 CEST
Modified files:
core/src/java/org/jahia/services/metadata/core/listeners
ContentLastContributorListener.java
ContentLastModificationDateListener.java
Log:
fixed last modification date & contributor metadata
Revision Changes Path
1.4 +4 -76
jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastContributorListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastContributorListener.java.diff?r1=1.3&r2=1.4&f=h
1.5 +1 -56
jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastModificationDateListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastModificationDateListener.java.diff?r1=1.4&r2=1.5&f=h
Index: ContentLastModificationDateListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastModificationDateListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContentLastModificationDateListener.java 25 Feb 2005 14:35:07 -0000
1.4
+++ ContentLastModificationDateListener.java 4 Apr 2005 10:16:44 -0000
1.5
@@ -55,58 +55,6 @@
processEvent("metadataEngineBeforeSave",theEvent);
}
- public void contentObjectCreated(JahiaEvent theEvent){
- ParamBean jParams = theEvent.getParams();
- ContentObject contentObject = (ContentObject)theEvent.getObject();
-
- if ( contentObject == null || jParams==null ){
- return;
- }
- try {
- JahiaObject jahiaObject =
contentObject.getMetadata(this.getMetadataName());
- if ( jahiaObject == null ){
- return;
- }
- ContentObject metadata =
ContentObject.getContentObjectInstance(jahiaObject.getObjectKey());
-
- JahiaField jahiaField =
ServicesRegistry.getInstance().getJahiaFieldService()
-
.loadField(metadata.getID(),LoadFlags.ALL,jParams);
- if ( jahiaField == null ){
- return;
- }
- jahiaField.setObject(String.valueOf(theEvent.getEventTime()));
- jahiaField.save(jParams);
- } catch ( Throwable t ){
- logger.debug(t);
- }
- }
-
- public void contentObjectUpdated(JahiaEvent theEvent){
- ParamBean jParams = theEvent.getParams();
- ContentObject contentObject = (ContentObject)theEvent.getObject();
-
- if ( contentObject == null || jParams==null ){
- return;
- }
- try {
- JahiaObject jahiaObject =
contentObject.getMetadata(this.getMetadataName());
- if ( jahiaObject == null ){
- return;
- }
- ContentObject metadata =
ContentObject.getContentObjectInstance(jahiaObject.getObjectKey());
-
- JahiaField jahiaField =
ServicesRegistry.getInstance().getJahiaFieldService()
-
.loadField(metadata.getID(),LoadFlags.ALL,jParams);
- if ( jahiaField == null ){
- return;
- }
- jahiaField.setObject(String.valueOf(theEvent.getEventTime()));
- jahiaField.save(jParams);
- } catch ( Throwable t ){
- logger.debug(t);
- }
- }
-
public void objectChanged (WorkflowEvent theEvent) {
ContentObject contentObject = (ContentObject)theEvent.getObject();
if ( contentObject == null ){
@@ -132,10 +80,7 @@
JahiaSite site =
ServicesRegistry.getInstance().getJahiaSitesService()
.getSite(contentObject.getSiteID());
- ParamBean jParams = new
SoapParamBean(Jahia.getStaticServletConfig().getServletContext(),
- Jahia.getSettings(),
- System.currentTimeMillis(),
- site, theEvent.getUser());
+ ParamBean jParams = Jahia.getThreadParamBean();
JahiaField jahiaField =
ServicesRegistry.getInstance().getJahiaFieldService()
.loadField(metadata.getID(),LoadFlags.ALL,jParams,entryLoadRequest);
Index: ContentLastContributorListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastContributorListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContentLastContributorListener.java 25 Feb 2005 14:35:07 -0000
1.3
+++ ContentLastContributorListener.java 4 Apr 2005 10:16:44 -0000
1.4
@@ -55,74 +55,7 @@
processEvent("metadataEngineBeforeSave",theEvent);
}
- public void contentObjectCreated(JahiaEvent theEvent){
- ParamBean jParams = theEvent.getParams();
- ContentObject contentObject = (ContentObject)theEvent.getObject();
-
- if ( contentObject == null || jParams == null ){
- return;
- }
- String userName = "unknown";
- if ( jParams.getUser() != null ){
- userName = jParams.getUser().getUsername();
- }
- try {
- JahiaObject jahiaObject =
contentObject.getMetadata(this.getMetadataName());
- if ( jahiaObject == null ){
- return;
- }
- ContentObject metadata =
ContentObject.getContentObjectInstance(jahiaObject.getObjectKey());
-
- JahiaField jahiaField =
ServicesRegistry.getInstance().getJahiaFieldService()
-
.loadField(metadata.getID(),LoadFlags.ALL,jParams);
- if ( jahiaField == null ){
- return;
- }
- jahiaField.setValue(userName);
- jahiaField.save(jParams);
- } catch ( Throwable t ){
- logger.debug(t);
- }
- }
-
- /**
- * Event fired once a content object has been updated ( changes stored
in persistence )
- *
- * @param theEvent JahiaEvent
- * @throws JahiaException
- */
- public void contentObjectUpdated (JahiaEvent theEvent) {
- ParamBean jParams = theEvent.getParams();
- ContentObject contentObject = (ContentObject)theEvent.getObject();
-
- if ( contentObject == null || jParams == null ){
- return;
- }
- String userName = "unknown";
- if ( jParams.getUser() != null ){
- userName = jParams.getUser().getUsername();
- }
- try {
- JahiaObject jahiaObject =
contentObject.getMetadata(this.getMetadataName());
- if ( jahiaObject == null ){
- return;
- }
- ContentObject metadata =
ContentObject.getContentObjectInstance(jahiaObject.getObjectKey());
-
- JahiaField jahiaField =
ServicesRegistry.getInstance().getJahiaFieldService()
-
.loadField(metadata.getID(),LoadFlags.ALL,jParams);
- if ( jahiaField == null ){
- return;
- }
- jahiaField.setValue(userName);
- jahiaField.save(jParams);
- } catch ( Throwable t ){
- logger.debug(t);
- }
- }
-
public void objectChanged (WorkflowEvent theEvent) {
- /*
ContentObject contentObject = (ContentObject)theEvent.getObject();
if ( contentObject == null ){
return;
@@ -135,7 +68,9 @@
}
ContentObject metadata =
ContentObject.getContentObjectInstance(jahiaObject.getObjectKey());
- JahiaUser user = theEvent.getUser();
+ ParamBean jParams = Jahia.getThreadParamBean();
+
+ JahiaUser user = jParams.getUser();
String userName = "unknown";
if ( user != null ){
userName = user.getUsername();
@@ -150,13 +85,6 @@
EntryLoadRequest entryLoadRequest = new
EntryLoadRequest(EntryLoadRequest.STAGING_WORKFLOW_STATE,
0,locales);
- JahiaSite site =
ServicesRegistry.getInstance().getJahiaSitesService()
- .getSite(contentObject.getSiteID());
- ParamBean jParams = new
SoapParamBean(Jahia.getSettings().getContext(),
- Jahia.getSettings(),
- System.currentTimeMillis(),
- site, theEvent.getUser());
-
JahiaField jahiaField =
ServicesRegistry.getInstance().getJahiaFieldService()
.loadField(metadata.getID(),LoadFlags.ALL,jParams,entryLoadRequest);
if ( jahiaField == null ){
@@ -166,7 +94,7 @@
jahiaField.save(jParams);
} catch ( Throwable t ){
logger.debug(t);
- }*/
+ }
}
public void processEvent (String eventName, JahiaEvent theEvent) {
