Fixed dependencies for DomainOwnership import

deploy_packages_to_gitea
Jens Pelzetter 2023-03-20 18:58:54 +01:00
parent cee7b5536b
commit 1701551fbc
4 changed files with 31 additions and 14 deletions

View File

@ -1,12 +1,12 @@
{ {
"name": "@librecms/ccm-cms", "name": "@librecms/ccm-cms",
"version": "7.0.0-SNAPSHOT.2023-03-13T190250", "version": "7.0.0-SNAPSHOT.2023-03-20T173612",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@librecms/ccm-cms", "name": "@librecms/ccm-cms",
"version": "7.0.0-SNAPSHOT.2023-03-13T190250", "version": "7.0.0-SNAPSHOT.2023-03-20T173612",
"license": "LGPL-3.0-or-later", "license": "LGPL-3.0-or-later",
"dependencies": { "dependencies": {
"@tiptap/core": "^2.0.0-beta.127", "@tiptap/core": "^2.0.0-beta.127",

View File

@ -1,6 +1,6 @@
{ {
"name": "@librecms/ccm-cms", "name": "@librecms/ccm-cms",
"version": "7.0.0-SNAPSHOT.2023-03-13T190250", "version": "7.0.0-SNAPSHOT.2023-03-20T173612",
"description": "JavaScript stuff for ccm-cms", "description": "JavaScript stuff for ccm-cms",
"main": "target/generated-resources/assets/@content-sections/cms-admin.js", "main": "target/generated-resources/assets/@content-sections/cms-admin.js",
"types": "target/generated-resources/assets/@content-sections/cms-admin.d.ts", "types": "target/generated-resources/assets/@content-sections/cms-admin.d.ts",

View File

@ -19,6 +19,8 @@
package org.librecms.contentsection; package org.librecms.contentsection;
import org.libreccm.categorization.Category; import org.libreccm.categorization.Category;
import org.libreccm.categorization.DomainOwnership;
import org.libreccm.categorization.DomainOwnershipImExporter;
import org.libreccm.core.ResourceType; import org.libreccm.core.ResourceType;
import org.libreccm.imexport.AbstractEntityImExporter; import org.libreccm.imexport.AbstractEntityImExporter;
import org.libreccm.imexport.Processes; import org.libreccm.imexport.Processes;
@ -31,6 +33,7 @@ import java.util.Set;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.Any;
import javax.inject.Inject; import javax.inject.Inject;
/** /**
@ -42,6 +45,11 @@ import javax.inject.Inject;
public class ContentSectionImExporter public class ContentSectionImExporter
extends AbstractEntityImExporter<ContentSection> { extends AbstractEntityImExporter<ContentSection> {
@Inject
@Any
@Processes(DomainOwnership.class)
private DomainOwnershipImExporter domainOwnershipImExporter;
@Inject @Inject
private ContentSectionRepository sectionRepository; private ContentSectionRepository sectionRepository;
@ -57,6 +65,10 @@ public class ContentSectionImExporter
Workflow.class Workflow.class
) )
); );
domainOwnershipImExporter.addRequiredEntities(
Set.of(ContentSection.class)
);
} }
@Override @Override

View File

@ -18,11 +18,13 @@
*/ */
package org.libreccm.docrepo; package org.libreccm.docrepo;
import org.libreccm.categorization.DomainOwnershipImExporter;
import org.libreccm.imexport.AbstractEntityImExporter; import org.libreccm.imexport.AbstractEntityImExporter;
import org.libreccm.imexport.Processes; import org.libreccm.imexport.Processes;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.Set;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
@ -36,13 +38,16 @@ import javax.inject.Inject;
@Processes(Repository.class) @Processes(Repository.class)
public class RepositoryImExporter extends AbstractEntityImExporter<Repository> { public class RepositoryImExporter extends AbstractEntityImExporter<Repository> {
@Inject
private DomainOwnershipImExporter domainOwnershipImExporter;
@Inject @Inject
private RepositoryRepository repositoryRepository; private RepositoryRepository repositoryRepository;
@PostConstruct @PostConstruct
@Override @Override
protected void init() { protected void init() {
// Nothing domainOwnershipImExporter.addRequiredEntities(Set.of(Repository.class));
} }
@Override @Override