Fixed dependencies for publications im/export.

sci-publications/src/main/java/org/scientificcms/publications/ArticleInCollectedVolumeImExporter.java

@@ -14,7 +14,7 @@ import javax.enterprise.context.RequestScoped;
 @RequestScoped
 @Processes(ArticleInCollectedVolume.class)
 public class ArticleInCollectedVolumeImExporter
-extends AbstractPublicationImExporter<ArticleInCollectedVolume>{
+    extends AbstractPublicationImExporter<ArticleInCollectedVolume> {
 
     @Override
     public Class<ArticleInCollectedVolume> getEntityClass() {
@@ -24,13 +24,7 @@ extends AbstractPublicationImExporter<ArticleInCollectedVolume>{
     @Override
     @PostConstruct
     protected void init() {
-        addRequiredEntities(
+        addRequiredEntities(Set.of(CollectedVolume.class));
-            Set.of(
-                CollectedVolume.class
-            )
-        );
     }
 
-    
-    
 }

sci-publications/src/main/java/org/scientificcms/publications/ArticleInJournalImExporter.java

@@ -24,11 +24,7 @@ public class ArticleInJournalImExporter
     @Override
     @PostConstruct
     protected void init() {
-        addRequiredEntities(
+        addRequiredEntities(Set.of(Journal.class));
-            Set.of(
-            Journal.class
-        )
-        );
     }
 
 }

sci-publications/src/main/java/org/scientificcms/publications/ExpertiseImExporter.java

@@ -15,7 +15,7 @@ import javax.enterprise.context.RequestScoped;
 @RequestScoped
 @Processes(Expertise.class)
 public class ExpertiseImExporter
-    extends AbstractPublicationImExporter<Expertise>{
+    extends AbstractPublicationImExporter<Expertise> {
 
     @Override
     public Class<Expertise> getEntityClass() {
@@ -25,11 +25,7 @@ public class ExpertiseImExporter
     @Override
     @PostConstruct
     protected void init() {
-        addRequiredEntities(
+        addRequiredEntities(Set.of(Organization.class));
-            Set.of(
-                Organization.class
-            )
-        );
     }
 
 }

sci-publications/src/main/java/org/scientificcms/publications/GreyLiteratureImExporter.java

@@ -1,6 +1,9 @@
 package org.scientificcms.publications;
 
 import org.libreccm.imexport.Processes;
+import org.librecms.assets.Organization;
+
+import java.util.Set;
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.RequestScoped;
@@ -22,7 +25,7 @@ public class GreyLiteratureImExporter
     @Override
     @PostConstruct
     protected void initUnPublishedImExporter() {
-        // Nothing
+        addRequiredEntities(Set.of(Organization.class));
     }
 
 }

sci-publications/src/main/java/org/scientificcms/publications/InProceedingsImExporter.java

@@ -24,11 +24,7 @@ public class InProceedingsImExporter
     @Override
     @PostConstruct
     protected void init() {
-        addRequiredEntities(
+        addRequiredEntities(Set.of(Proceedings.class));
-            Set.of(
-                Proceedings.class
-            )
-        );
     }
 
 }

sci-publications/src/main/java/org/scientificcms/publications/InternetArticleImExporter.java

@@ -25,11 +25,7 @@ public class InternetArticleImExporter
     @Override
     @PostConstruct
     protected void init() {
-        addRequiredEntities(
+        addRequiredEntities(Set.of(Organization.class));
-            Set.of(
-                Organization.class
-            )
-        );
     }
 
 }

sci-publications/src/main/java/org/scientificcms/publications/WorkingPaperImExporter.java

@@ -1,6 +1,9 @@
 package org.scientificcms.publications;
 
 import org.libreccm.imexport.Processes;
+import org.librecms.assets.Organization;
+
+import java.util.Set;
 
 import javax.enterprise.context.RequestScoped;
 
@@ -11,7 +14,7 @@ import javax.enterprise.context.RequestScoped;
 @RequestScoped
 @Processes(WorkingPaper.class)
 public class WorkingPaperImExporter
-    extends AbstractUnPublishedImExporter<WorkingPaper>{
+    extends AbstractUnPublishedImExporter<WorkingPaper> {
 
     @Override
     public Class<WorkingPaper> getEntityClass() {
@@ -20,9 +23,7 @@ public class WorkingPaperImExporter
 
     @Override
     protected void initUnPublishedImExporter() {
-        // Nothing
+        addRequiredEntities(Set.of(Organization.class));
     }
 
-    
-    
 }

sci-publications/src/main/java/org/scientificcms/publications/assets/SeriesAssetImExporter.java

@@ -3,8 +3,10 @@ package org.scientificcms.publications.assets;
 import org.libreccm.imexport.AbstractEntityImExporter;
 import org.libreccm.imexport.Processes;
 import org.librecms.contentsection.AssetRepository;
+import org.scientificcms.publications.Series;
 
 import java.util.Objects;
+import java.util.Set;
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.RequestScoped;
@@ -26,7 +28,7 @@ extends AbstractEntityImExporter<SeriesAsset> {
     @PostConstruct
     @Override
     protected void init() {
-        // Nothing
+        addRequiredEntities(Set.of(Series.class));
     }
 
     @Override

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInCollectedVolumeItemImExporter.java

@@ -2,6 +2,7 @@ package org.scientificcms.publications.contenttypes;
 
 import org.libreccm.imexport.Processes;
 import org.librecms.contentsection.AbstractContentItemImExporter;
+import org.scientificcms.publications.ArticleInCollectedVolume;
 
 import java.util.Set;
 
@@ -17,11 +18,7 @@ public class ArticleInCollectedVolumeItemImExporter extends AbstractContentItemI
 
     @Override
     protected void initContentItemImExporter() {
-        addRequiredEntities(
+        addRequiredEntities(Set.of(ArticleInCollectedVolume.class));
-            Set.of(
-                CollectedVolumeItem.class
-            )
-        );
     }
 
     @Override

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInJournalItemImExporter.java

@@ -2,7 +2,7 @@ package org.scientificcms.publications.contenttypes;
 
 import org.libreccm.imexport.Processes;
 import org.librecms.contentsection.AbstractContentItemImExporter;
-import org.scientificcms.publications.assets.JournalAsset;
+import org.scientificcms.publications.ArticleInJournal;
 
 import java.util.Set;
 
@@ -19,11 +19,7 @@ public class ArticleInJournalItemImExporter
 
     @Override
     protected void initContentItemImExporter() {
-        addRequiredEntities(
+        addRequiredEntities(Set.of(ArticleInJournal.class));
-            Set.of(
-                JournalAsset.class
-            )
-        );
     }
 
     @Override

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/CollectedVolumeItemImExporter.java

@@ -2,7 +2,7 @@ package org.scientificcms.publications.contenttypes;
 
 import org.libreccm.imexport.Processes;
 import org.librecms.contentsection.AbstractContentItemImExporter;
-import org.scientificcms.publications.assets.PublisherAsset;
+import org.scientificcms.publications.CollectedVolume;
 
 import java.util.Set;
 
@@ -19,11 +19,7 @@ public class CollectedVolumeItemImExporter
 
     @Override
     protected void initContentItemImExporter() {
-        addRequiredEntities(
+        addRequiredEntities(Set.of(CollectedVolume.class));
-            Set.of(
-                PublisherAsset.class
-            )
-        );
     }
 
     @Override

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ExpertiseItemImExporter.java

@@ -1,8 +1,8 @@
 package org.scientificcms.publications.contenttypes;
 
 import org.libreccm.imexport.Processes;
-import org.librecms.assets.Organization;
 import org.librecms.contentsection.AbstractContentItemImExporter;
+import org.scientificcms.publications.Expertise;
 
 import java.util.Set;
 
@@ -19,11 +19,7 @@ public class ExpertiseItemImExporter
 
     @Override
     protected void initContentItemImExporter() {
-        addRequiredEntities(
+        addRequiredEntities(Set.of(Expertise.class));
-            Set.of(
-                Organization.class
-            )
-        );
     }
 
     @Override

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/GreyLiteratureItemImExporter.java

@@ -1,8 +1,8 @@
 package org.scientificcms.publications.contenttypes;
 
 import org.libreccm.imexport.Processes;
-import org.librecms.assets.Organization;
 import org.librecms.contentsection.AbstractContentItemImExporter;
+import org.scientificcms.publications.GreyLiterature;
 
 import java.util.Set;
 
@@ -19,11 +19,7 @@ public class GreyLiteratureItemImExporter
 
     @Override
     protected void initContentItemImExporter() {
-        addRequiredEntities(
+        addRequiredEntities(Set.of(GreyLiterature.class));
-            Set.of(
-                Organization.class
-            )
-        );
     }
 
     @Override

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InProceedingsItemImExporter.java

@@ -2,6 +2,7 @@ package org.scientificcms.publications.contenttypes;
 
 import org.libreccm.imexport.Processes;
 import org.librecms.contentsection.AbstractContentItemImExporter;
+import org.scientificcms.publications.InProceedings;
 
 import java.util.Set;
 
@@ -18,11 +19,7 @@ public class InProceedingsItemImExporter
 
     @Override
     protected void initContentItemImExporter() {
-        addRequiredEntities(
+        addRequiredEntities(Set.of(InProceedings.class));
-            Set.of(
-                ProceedingsItem.class
-            )
-        );
     }
 
     @Override

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/MonographItemImExporter.java

@@ -2,6 +2,7 @@ package org.scientificcms.publications.contenttypes;
 
 import org.libreccm.imexport.Processes;
 import org.librecms.contentsection.AbstractContentItemImExporter;
+import org.scientificcms.publications.Monograph;
 import org.scientificcms.publications.assets.PublisherAsset;
 
 import java.util.Set;
@@ -19,11 +20,7 @@ public class MonographItemImExporter
 
     @Override
     protected void initContentItemImExporter() {
-        addRequiredEntities(
+        addRequiredEntities(Set.of(Monograph.class));
-            Set.of(
-                PublisherAsset.class
-            )
-        );
     }
 
     @Override

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ProceedingsItemImExporter.java

@@ -1,9 +1,8 @@
 package org.scientificcms.publications.contenttypes;
 
 import org.libreccm.imexport.Processes;
-import org.librecms.assets.Organization;
 import org.librecms.contentsection.AbstractContentItemImExporter;
-import org.scientificcms.publications.assets.PublisherAsset;
+import org.scientificcms.publications.Proceedings;
 
 import java.util.Set;
 
@@ -20,12 +19,7 @@ public class ProceedingsItemImExporter
 
     @Override
     protected void initContentItemImExporter() {
-        addRequiredEntities(
+        addRequiredEntities(Set.of(Proceedings.class));
-            Set.of(
-                Organization.class,
-                PublisherAsset.class
-            )
-        );
     }
 
     @Override

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/TalkItemImExporter.java

@@ -2,6 +2,9 @@ package org.scientificcms.publications.contenttypes;
 
 import org.libreccm.imexport.Processes;
 import org.librecms.contentsection.AbstractContentItemImExporter;
+import org.scientificcms.publications.Talk;
+
+import java.util.Set;
 
 import javax.enterprise.context.RequestScoped;
 
@@ -21,7 +24,7 @@ public class TalkItemImExporter
 
     @Override
     protected void initContentItemImExporter() {
-        // Nothing
+        addRequiredEntities(Set.of(Talk.class));
     }
 
 }

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/WorkingPaperItemImExporter.java

@@ -1,8 +1,8 @@
 package org.scientificcms.publications.contenttypes;
 
 import org.libreccm.imexport.Processes;
-import org.librecms.assets.Organization;
 import org.librecms.contentsection.AbstractContentItemImExporter;
+import org.scientificcms.publications.WorkingPaper;
 
 import java.util.Set;
 
@@ -19,11 +19,7 @@ public class WorkingPaperItemImExporter
 
     @Override
     protected void initContentItemImExporter() {
-        addRequiredEntities(
+        addRequiredEntities(Set.of(WorkingPaper.class));
-            Set.of(
-                Organization.class
-            )
-        );
     }
 
     @Override