diff --git a/ccm-cms-types-agenda/src/ccm-cms-types-agenda.load b/ccm-cms-types-agenda/src/ccm-cms-types-agenda.load index a76f6fe46..63196594f 100755 --- a/ccm-cms-types-agenda/src/ccm-cms-types-agenda.load +++ b/ccm-cms-types-agenda/src/ccm-cms-types-agenda.load @@ -12,5 +12,6 @@ + diff --git a/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/AgendaLoader.java b/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/AgendaLoader.java index 045961fac..d5e2bdb54 100755 --- a/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/AgendaLoader.java +++ b/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/AgendaLoader.java @@ -18,8 +18,6 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; - /** * Loader executes nonrecurring once at install time and loads the Agenda * contenttype package persistently into database. @@ -48,6 +46,7 @@ public class AgendaLoader extends AbstractContentTypeLoader { * * @return String Array of fully qualified file names */ + @Override public String[] getTypes() { return TYPES; } diff --git a/ccm-cms-types-event/src/ccm-cms-types-event.load b/ccm-cms-types-event/src/ccm-cms-types-event.load index 80d095b97..577f81c5b 100755 --- a/ccm-cms-types-event/src/ccm-cms-types-event.load +++ b/ccm-cms-types-event/src/ccm-cms-types-event.load @@ -12,5 +12,6 @@ + diff --git a/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventLoader.java b/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventLoader.java index adce005ea..0ffdfba80 100755 --- a/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventLoader.java +++ b/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventLoader.java @@ -18,8 +18,6 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; - /** * Loader executes nonrecurring once at install time and loads the * Event contenttype package persistently into database. @@ -54,5 +52,4 @@ private static final String[] TYPES = { public String[] getTypes() { return TYPES; } - } diff --git a/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLinkUnloader.java b/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLinkUnloader.java index c86b6bd9b..ee9788b0e 100644 --- a/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLinkUnloader.java +++ b/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLinkUnloader.java @@ -18,11 +18,10 @@ */ package com.arsdigita.cms.contenttypes; -import java.util.ArrayList; -import java.util.List; - /** - * + * Unloader deinstalles/removes when callen the ExternalLink contenttype + * persistantly from the database. + * * @author Tobias Osmers * @version $Revision: #1 $ $Date: 2015/04/08 $ */ diff --git a/ccm-cms-types-inlinesite/src/ccm-cms-types-inlinesite.load b/ccm-cms-types-inlinesite/src/ccm-cms-types-inlinesite.load index 8b8574286..e9b44b59a 100755 --- a/ccm-cms-types-inlinesite/src/ccm-cms-types-inlinesite.load +++ b/ccm-cms-types-inlinesite/src/ccm-cms-types-inlinesite.load @@ -12,5 +12,6 @@ + diff --git a/ccm-cms-types-inlinesite/src/com/arsdigita/cms/contenttypes/InlineSiteLoader.java b/ccm-cms-types-inlinesite/src/com/arsdigita/cms/contenttypes/InlineSiteLoader.java index 0f15d8b03..ba4aef821 100755 --- a/ccm-cms-types-inlinesite/src/com/arsdigita/cms/contenttypes/InlineSiteLoader.java +++ b/ccm-cms-types-inlinesite/src/com/arsdigita/cms/contenttypes/InlineSiteLoader.java @@ -18,9 +18,6 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; - - /** * Loader. * diff --git a/ccm-cms-types-job/src/ccm-cms-types-job.load b/ccm-cms-types-job/src/ccm-cms-types-job.load index b52071939..e3935d3d4 100755 --- a/ccm-cms-types-job/src/ccm-cms-types-job.load +++ b/ccm-cms-types-job/src/ccm-cms-types-job.load @@ -12,5 +12,6 @@ + diff --git a/ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobLoader.java b/ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobLoader.java index 8611fffd9..0e40d8033 100755 --- a/ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobLoader.java +++ b/ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobLoader.java @@ -18,8 +18,6 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; - /** * Loader * diff --git a/ccm-cms-types-legalnotice/src/ccm-cms-types-legalnotice.load b/ccm-cms-types-legalnotice/src/ccm-cms-types-legalnotice.load index 3967e26ef..29367ffac 100755 --- a/ccm-cms-types-legalnotice/src/ccm-cms-types-legalnotice.load +++ b/ccm-cms-types-legalnotice/src/ccm-cms-types-legalnotice.load @@ -12,5 +12,6 @@ + diff --git a/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeLoader.java b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeLoader.java index 2f3ce47a0..066949fd4 100755 --- a/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeLoader.java +++ b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeLoader.java @@ -18,8 +18,6 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; - /** * Loader * diff --git a/ccm-cms-types-minutes/src/ccm-cms-types-minutes.load b/ccm-cms-types-minutes/src/ccm-cms-types-minutes.load index 467a01d10..be713344e 100755 --- a/ccm-cms-types-minutes/src/ccm-cms-types-minutes.load +++ b/ccm-cms-types-minutes/src/ccm-cms-types-minutes.load @@ -12,5 +12,6 @@ + diff --git a/ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesLoader.java b/ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesLoader.java index d5e7b4df3..1e4e63446 100755 --- a/ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesLoader.java +++ b/ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesLoader.java @@ -18,8 +18,6 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; - /** * Loader * diff --git a/ccm-cms-types-service/src/ccm-cms-types-service.load b/ccm-cms-types-service/src/ccm-cms-types-service.load index 9ea1c3110..a7ea97ac9 100755 --- a/ccm-cms-types-service/src/ccm-cms-types-service.load +++ b/ccm-cms-types-service/src/ccm-cms-types-service.load @@ -12,5 +12,6 @@ + diff --git a/ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceLoader.java b/ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceLoader.java index 29749209e..17fc68f2c 100755 --- a/ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceLoader.java +++ b/ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceLoader.java @@ -18,8 +18,6 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; - /** * Loader * diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeUnloader.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeUnloader.java index ee0e9928c..4032c223e 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeUnloader.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeUnloader.java @@ -75,9 +75,10 @@ public abstract class AbstractContentTypeUnloader extends PackageLoader { /** * Parses the content-types specified in the "contentType".xml-file and - * stores them into a list. Then retrieves all content-sections into - * a dataCollection and removes all the content-types stored in the list - * from the sections in that dataCollection. + * stores them into a list. Then retrieves all contentitems from the db into + * a dataCollection and unpulishes and deletes all the contentitems/instances + * to the content-types stored in the list. Then the content-types are + * removed form all sections. * * @param ctx The context to the unload-script */ @@ -92,11 +93,8 @@ public abstract class AbstractContentTypeUnloader extends PackageLoader { List types = handler.getContentTypes(); Session ssn = ctx.getSession(); - // Auf contenttype und das base.data.object.type retrieven -> - // datacollection von den instanzen (dataObject) - // domainobjectfactory.newInst... contentItem aus den datacollections - // contentitem method is live. publiziert? - // unpublish ccm-ldn-util und dann alle deleten + // Removes all contentitems/instances of the specified + // contenttype DataCollection contentItems = ssn.retrieve( ContentItem.BASE_DATA_OBJECT_TYPE); while (contentItems.next()) { diff --git a/ccm-ldn-types-councillor/src/ccm-ldn-types-councillor.load b/ccm-ldn-types-councillor/src/ccm-ldn-types-councillor.load index 05d66f8fb..729dfa52e 100644 --- a/ccm-ldn-types-councillor/src/ccm-ldn-types-councillor.load +++ b/ccm-ldn-types-councillor/src/ccm-ldn-types-councillor.load @@ -13,5 +13,6 @@ + diff --git a/ccm-ldn-types-councillor/src/com/arsdigita/cms/contenttypes/ldn/CouncillorLoader.java b/ccm-ldn-types-councillor/src/com/arsdigita/cms/contenttypes/ldn/CouncillorLoader.java index 3d4d12c02..9c791e90f 100644 --- a/ccm-ldn-types-councillor/src/com/arsdigita/cms/contenttypes/ldn/CouncillorLoader.java +++ b/ccm-ldn-types-councillor/src/com/arsdigita/cms/contenttypes/ldn/CouncillorLoader.java @@ -15,8 +15,6 @@ package com.arsdigita.cms.contenttypes.ldn; -import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; - /** * Loader. * @@ -24,6 +22,7 @@ import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; * @version $Id: CouncillorLoader.java 1489 2007-03-19 11:39:58Z apevec $ */ public class CouncillorLoader extends AbstractContentTypeLoader { + public final static String versionId = "$Id: CouncillorLoader.java 1489 2007-03-19 11:39:58Z apevec $" + "$Author: apevec $" + diff --git a/ccm-ldn-types-esdservice/src/ccm-ldn-types-esdservice.load b/ccm-ldn-types-esdservice/src/ccm-ldn-types-esdservice.load index aa3c797d5..1513235e5 100755 --- a/ccm-ldn-types-esdservice/src/ccm-ldn-types-esdservice.load +++ b/ccm-ldn-types-esdservice/src/ccm-ldn-types-esdservice.load @@ -13,5 +13,6 @@ + diff --git a/ccm-ldn-types-esdservice/src/com/arsdigita/cms/contenttypes/ldn/ESDServiceLoader.java b/ccm-ldn-types-esdservice/src/com/arsdigita/cms/contenttypes/ldn/ESDServiceLoader.java index 24d1df542..df50621b5 100755 --- a/ccm-ldn-types-esdservice/src/com/arsdigita/cms/contenttypes/ldn/ESDServiceLoader.java +++ b/ccm-ldn-types-esdservice/src/com/arsdigita/cms/contenttypes/ldn/ESDServiceLoader.java @@ -17,8 +17,6 @@ */ package com.arsdigita.cms.contenttypes.ldn; -import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; - /** * Loader for ContentType ESDService. *