cmailleux 2005/09/30 17:07:02 CEST
Modified files:
core/src/java/org/jahia/content ContentObject.java
core/src/java/org/jahia/services/metadata/core/listeners
ContentCreationDateListener.java
ContentCreatorListener.java
ContentLastContributorListener.java
ContentLastModificationDateListener.java
ContentLastPublisherListener.java
ContentLastPublishingDateListener.java
ContentMetadataListener.java
Log:
Use linkManager instead of calling objectlinkDB old jahia object
Remove Imports of ObjectLinkDB
Revision Changes Path
1.20 +2 -2 jahia/core/src/java/org/jahia/content/ContentObject.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/content/ContentObject.java.diff?r1=1.19&r2=1.20&f=h
1.4 +2 -10
jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentCreationDateListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentCreationDateListener.java.diff?r1=1.3&r2=1.4&f=h
1.3 +7 -11
jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentCreatorListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentCreatorListener.java.diff?r1=1.2&r2=1.3&f=h
1.7 +6 -8
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.6&r2=1.7&f=h
1.9 +7 -9
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.8&r2=1.9&f=h
1.4 +7 -16
jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastPublisherListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastPublisherListener.java.diff?r1=1.3&r2=1.4&f=h
1.4 +8 -16
jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastPublishingDateListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastPublishingDateListener.java.diff?r1=1.3&r2=1.4&f=h
1.4 +12 -21
jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentMetadataListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentMetadataListener.java.diff?r1=1.3&r2=1.4&f=h
Index: ContentObject.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/content/ContentObject.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ContentObject.java 20 Sep 2005 17:03:06 -0000 1.19
+++ ContentObject.java 30 Sep 2005 15:07:01 -0000 1.20
@@ -1438,7 +1438,7 @@
public Set getPickerObjects() throws JahiaException {
HashSet set = new HashSet();
- ArrayList links =
ObjectLinkDB.getInstance().findByTypeAndLeftObjectKey(
+ List links = linkManager.findByTypeAndLeftObjectKey(
StructuralRelationship.PICKER_LINK,this.getObjectKey());
for ( int i=0 ; i<links.size(); i++ ){
ObjectLink link = (ObjectLink)links.get(i);
@@ -1452,7 +1452,7 @@
}
public ContentObject getPickedObject() throws JahiaException {
- ArrayList links =
ObjectLinkDB.getInstance().findByTypeAndRightObjectKey(
+ List links = linkManager.findByTypeAndRightObjectKey(
StructuralRelationship.PICKER_LINK,this.getObjectKey());
for ( int i=0 ; i<links.size(); i++ ){
ObjectLink link = (ObjectLink)links.get(i);
Index: ContentCreationDateListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentCreationDateListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContentCreationDateListener.java 5 Jul 2005 15:46:28 -0000 1.3
+++ ContentCreationDateListener.java 30 Sep 2005 15:07:02 -0000 1.4
@@ -1,10 +1,5 @@
package org.jahia.services.metadata.core.listeners;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Locale;
-
-import org.jahia.bin.Jahia;
import org.jahia.content.ContentObject;
import org.jahia.content.JahiaObject;
import org.jahia.data.events.JahiaEvent;
@@ -15,12 +10,9 @@
import org.jahia.data.fields.LoadFlags;
import org.jahia.engines.metadata.Metadata_Engine;
import org.jahia.params.ProcessingContext;
-import org.jahia.params.SoapParamBean;
import org.jahia.registries.ServicesRegistry;
-import org.jahia.services.sites.JahiaSite;
-import org.jahia.services.usermanager.JahiaUser;
-import org.jahia.services.version.EntryLoadRequest;
-import org.jahia.utils.LanguageCodeConverters;
+
+import java.util.HashMap;
/**
Index: ContentCreatorListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentCreatorListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContentCreatorListener.java 5 Jul 2005 15:46:28 -0000 1.2
+++ ContentCreatorListener.java 30 Sep 2005 15:07:02 -0000 1.3
@@ -1,22 +1,18 @@
package org.jahia.services.metadata.core.listeners;
-import java.util.*;
-
-import org.jahia.content.*;
+import org.jahia.content.ContentObject;
+import org.jahia.content.JahiaObject;
import org.jahia.data.events.JahiaEvent;
import org.jahia.data.events.JahiaEventListener;
-import org.jahia.data.fields.*;
+import org.jahia.data.fields.FieldsEditHelper;
import org.jahia.data.fields.FieldsEditHelperAbstract;
import org.jahia.data.fields.JahiaField;
+import org.jahia.data.fields.LoadFlags;
import org.jahia.engines.metadata.Metadata_Engine;
import org.jahia.params.ProcessingContext;
-import org.jahia.services.usermanager.JahiaUser;
-import org.jahia.services.version.*;
-import org.jahia.utils.LanguageCodeConverters;
-import org.jahia.services.sites.*;
-import org.jahia.registries.*;
-import org.jahia.params.*;
-import org.jahia.bin.*;
+import org.jahia.registries.ServicesRegistry;
+
+import java.util.HashMap;
/**
* <p>Title: </p>
Index: ContentLastContributorListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastContributorListener.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ContentLastContributorListener.java 5 Jul 2005 15:46:28 -0000
1.6
+++ ContentLastContributorListener.java 30 Sep 2005 15:07:02 -0000
1.7
@@ -1,9 +1,5 @@
package org.jahia.services.metadata.core.listeners;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Locale;
-
import org.jahia.bin.Jahia;
import org.jahia.content.ContentObject;
import org.jahia.content.JahiaObject;
@@ -14,16 +10,18 @@
import org.jahia.data.fields.JahiaField;
import org.jahia.data.fields.LoadFlags;
import org.jahia.engines.metadata.Metadata_Engine;
+import org.jahia.exceptions.JahiaException;
import org.jahia.params.ProcessingContext;
-import org.jahia.params.SoapParamBean;
import org.jahia.registries.ServicesRegistry;
-import org.jahia.services.sites.JahiaSite;
+import org.jahia.services.fields.ContentField;
import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.version.EntryLoadRequest;
import org.jahia.services.workflow.WorkflowEvent;
-import org.jahia.services.fields.ContentField;
import org.jahia.utils.LanguageCodeConverters;
-import org.jahia.exceptions.JahiaException;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Locale;
/**
* <p>Title: </p>
Index: ContentLastModificationDateListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastModificationDateListener.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ContentLastModificationDateListener.java 12 Aug 2005 14:55:12 -0000
1.8
+++ ContentLastModificationDateListener.java 30 Sep 2005 15:07:02 -0000
1.9
@@ -1,9 +1,5 @@
package org.jahia.services.metadata.core.listeners;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Locale;
-
import org.jahia.bin.Jahia;
import org.jahia.content.ContentObject;
import org.jahia.content.JahiaObject;
@@ -15,17 +11,19 @@
import org.jahia.data.fields.JahiaField;
import org.jahia.data.fields.LoadFlags;
import org.jahia.engines.metadata.Metadata_Engine;
+import org.jahia.exceptions.JahiaException;
import org.jahia.params.ProcessingContext;
-import org.jahia.params.SoapParamBean;
import org.jahia.registries.ServicesRegistry;
+import org.jahia.services.fields.ContentField;
+import org.jahia.services.pages.ContentPage;
import org.jahia.services.sites.JahiaSite;
-import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.version.EntryLoadRequest;
import org.jahia.services.workflow.WorkflowEvent;
-import org.jahia.services.fields.ContentField;
-import org.jahia.services.pages.ContentPage;
import org.jahia.utils.LanguageCodeConverters;
-import org.jahia.exceptions.JahiaException;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Locale;
/**
* <p>Title: </p>
Index: ContentLastPublisherListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastPublisherListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContentLastPublisherListener.java 5 Jul 2005 15:46:28 -0000 1.3
+++ ContentLastPublisherListener.java 30 Sep 2005 15:07:02 -0000 1.4
@@ -1,25 +1,16 @@
package org.jahia.services.metadata.core.listeners;
-import java.util.*;
-
-import org.jahia.content.ContentMetadataFacade;
-import org.jahia.data.events.JahiaEvent;
-import org.jahia.content.ObjectLinkDB;
-import org.jahia.content.StructuralRelationship;
-import org.jahia.content.events.ContentActivationEvent;
import org.jahia.content.ContentDefinition;
import org.jahia.content.ContentObject;
-import org.jahia.content.ObjectKey;
import org.jahia.content.JahiaObject;
-import org.jahia.data.containers.*;
-import org.jahia.data.fields.*;
-import org.jahia.engines.metadata.Metadata_Engine;
-import org.jahia.exceptions.JahiaException;
-import org.jahia.params.ProcessingContext;
-import org.jahia.services.fields.*;
-import org.jahia.services.version.*;
-import org.jahia.services.metadata.AdviceAction;
+import org.jahia.content.ObjectKey;
+import org.jahia.content.events.ContentActivationEvent;
import org.jahia.data.events.JahiaEventListener;
+import org.jahia.data.fields.JahiaField;
+import org.jahia.services.fields.ContentField;
+import org.jahia.services.version.EntryLoadRequest;
+
+import java.util.ArrayList;
/**
* <p>Title: </p>
Index: ContentLastPublishingDateListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastPublishingDateListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContentLastPublishingDateListener.java 5 Jul 2005 15:46:28 -0000
1.3
+++ ContentLastPublishingDateListener.java 30 Sep 2005 15:07:02 -0000
1.4
@@ -1,25 +1,17 @@
package org.jahia.services.metadata.core.listeners;
-import java.util.*;
-
-import org.jahia.content.ContentMetadataFacade;
-import org.jahia.data.events.JahiaEvent;
-import org.jahia.content.ObjectLinkDB;
-import org.jahia.content.StructuralRelationship;
-import org.jahia.content.events.ContentActivationEvent;
import org.jahia.content.ContentDefinition;
import org.jahia.content.ContentObject;
-import org.jahia.content.ObjectKey;
import org.jahia.content.JahiaObject;
-import org.jahia.data.containers.*;
-import org.jahia.data.fields.*;
-import org.jahia.engines.metadata.Metadata_Engine;
-import org.jahia.exceptions.JahiaException;
-import org.jahia.params.ProcessingContext;
-import org.jahia.services.fields.*;
-import org.jahia.services.version.*;
-import org.jahia.services.metadata.AdviceAction;
+import org.jahia.content.ObjectKey;
+import org.jahia.content.events.ContentActivationEvent;
import org.jahia.data.events.JahiaEventListener;
+import org.jahia.data.fields.JahiaField;
+import org.jahia.services.fields.ContentField;
+import org.jahia.services.version.EntryLoadRequest;
+import org.jahia.services.version.JahiaSaveVersion;
+
+import java.util.ArrayList;
/**
* <p>Title: </p>
Index: ContentMetadataListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentMetadataListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContentMetadataListener.java 5 Jul 2005 15:46:28 -0000 1.3
+++ ContentMetadataListener.java 30 Sep 2005 15:07:02 -0000 1.4
@@ -1,31 +1,22 @@
package org.jahia.services.metadata.core.listeners;
-import java.util.*;
-
-import org.jahia.bin.*;
-import org.jahia.content.JahiaObject;
-import org.jahia.content.ContentDefinition;
-import org.jahia.content.ContentMetadataFacade;
-import org.jahia.data.fields.LoadFlags;
-import org.jahia.data.events.JahiaEvent;
-import org.jahia.content.ObjectLinkDB;
-import org.jahia.content.StructuralRelationship;
+import org.jahia.bin.Jahia;
+import org.jahia.content.*;
import org.jahia.content.events.ContentActivationEvent;
-import org.jahia.content.ContentObject;
-import org.jahia.content.ContentMetadataFacade;
-import org.jahia.content.ObjectKey;
-import org.jahia.data.containers.*;
-import org.jahia.data.fields.*;
-import org.jahia.engines.metadata.Metadata_Engine;
-import org.jahia.exceptions.JahiaException;
+import org.jahia.data.events.JahiaEventListener;
+import org.jahia.data.fields.JahiaFieldDefinition;
+import org.jahia.data.fields.LoadFlags;
import org.jahia.params.ProcessingContext;
import org.jahia.params.SoapParamBean;
import org.jahia.registries.ServicesRegistry;
-import org.jahia.services.metadata.AdviceAction;
-import org.jahia.data.events.JahiaEventListener;
-import org.jahia.services.workflow.WorkflowEvent;
-import org.jahia.services.sites.*;
+import org.jahia.services.sites.JahiaSite;
import org.jahia.services.version.StateModificationContext;
+import org.jahia.services.workflow.WorkflowEvent;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
/**
* <p>Title: </p>
