diff --git a/sci-publications/src/main/java/org/scientificcms/publications/Expertise.java b/sci-publications/src/main/java/org/scientificcms/publications/Expertise.java index 6c22bfc..ee9c22c 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/Expertise.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/Expertise.java @@ -121,15 +121,19 @@ public class Expertise extends Publication { @Override public String toString(final String data) { - return super.toString(String.format(", place = \"%s\", " - + "numberOfPages = %d, " - + "organization = %s, " - + "orderer = %s%s", - place, - Objects.toString(numberOfPages), - Objects.toString(organization), - Objects.toString(orderer), - data)); + return super.toString( + String.format( + ", place = \"%s\", " + + "numberOfPages = %d, " + + "organization = %s, " + + "orderer = %s%s", + place, + numberOfPages, + Objects.toString(organization), + Objects.toString(orderer), + data + ) + ); } } diff --git a/sci-publications/src/main/java/org/scientificcms/publications/Monograph.java b/sci-publications/src/main/java/org/scientificcms/publications/Monograph.java index 2f8f37d..2608cca 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/Monograph.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/Monograph.java @@ -75,9 +75,13 @@ public class Monograph extends PublicationWithPublisher { @Override public String toString(final String data) { - return super.toString(String.format(", reviewed = %b%s", - reviewed, - data)); + return super.toString( + String.format( + ", reviewed = %b%s", + reviewed, + data + ) + ); } } diff --git a/sci-publications/src/main/java/org/scientificcms/publications/Publication.java b/sci-publications/src/main/java/org/scientificcms/publications/Publication.java index d6f4d80..67194e4 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/Publication.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/Publication.java @@ -395,33 +395,34 @@ public class Publication implements Exportable, Serializable { } public String toString(final String data) { - - return String.format("%s{ " - + "publicationId = %d, " - + "uuid = \"%s\"" - + "yearOfPublication = %d, " - + "authorships = %s, " - + "title = %s, " - + "shortDescription = %s, " - + "publicationAbstract = %s, " - + "misc = %s, " - + "peerReviewed = %b, " - + "yearFirstPublished = %d, " - + "languageOfPublication = \"%s\"%d" - + " }", - super.toString(), - publicationId, - uuid, - yearOfPublication, - authorships, - Objects.toString(title), - Objects.toString(shortDescription), - Objects.toString(publicationAbstract), - Objects.toString(misc), - peerReviewed, - yearFirstPublished, - Objects.toString(languageOfPublication), - data); + return String.format( + "%s{ " + + "publicationId = %d, " + + "uuid = \"%s\"" + + "yearOfPublication = %d, " + + "authorships = %s, " + + "title = %s, " + + "shortDescription = %s, " + + "publicationAbstract = %s, " + + "misc = %s, " + + "peerReviewed = %b, " + + "yearFirstPublished = %d, " + + "languageOfPublication = \"%s\"%s" + + " }", + super.toString(), + publicationId, + uuid, + yearOfPublication, + Objects.toString(authorships), + Objects.toString(title), + Objects.toString(shortDescription), + Objects.toString(publicationAbstract), + Objects.toString(misc), + peerReviewed, + yearFirstPublished, + Objects.toString(languageOfPublication), + data + ); } @Override diff --git a/sci-publications/src/main/java/org/scientificcms/publications/PublicationWithPublisher.java b/sci-publications/src/main/java/org/scientificcms/publications/PublicationWithPublisher.java index f8ea78b..6fea379 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/PublicationWithPublisher.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/PublicationWithPublisher.java @@ -180,7 +180,7 @@ public class PublicationWithPublisher extends Publication { return false; } final PublicationWithPublisher other - = (PublicationWithPublisher) obj; + = (PublicationWithPublisher) obj; if (!other.canEqual(this)) { return false; } @@ -213,24 +213,25 @@ public class PublicationWithPublisher extends Publication { @Override public String toString(final String data) { - return (String.format("%s{ " - + "publisher = %s, " - + "isbn10 = \"%s\", " - + "isbn13 = \"%s\", " - + "volume = %d, " - + "numberOfVolumes = %d, " - + "numberOfPages = %d, " - + "edition = %s%s" - + "}", - super.toString(), - Objects.toString(publisher), - isbn10, - isbn13, - volume, - numberOfVolumes, - numberOfPages, - Objects.toString(edition), - data)); + return super.toString( + String.format( + "publisher = %s, " + + "isbn10 = \"%s\", " + + "isbn13 = \"%s\", " + + "volume = %d, " + + "numberOfVolumes = %d, " + + "numberOfPages = %d, " + + "edition = %s%s", + Objects.toString(publisher), + isbn10, + isbn13, + volume, + numberOfVolumes, + numberOfPages, + Objects.toString(edition), + data + ) + ); } } diff --git a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ContactImExporter.java b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ContactImExporter.java index 9105fe8..db6599c 100644 --- a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ContactImExporter.java +++ b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ContactImExporter.java @@ -4,6 +4,7 @@ import org.libreccm.imexport.AbstractEntityImExporter; import org.libreccm.imexport.Processes; import org.librecms.assets.Organization; import org.librecms.assets.Person; +import org.librecms.contentsection.ContentItemRepository; import java.util.Objects; import java.util.Set; @@ -25,6 +26,9 @@ public class ContactImExporter @Inject private ContactRepository contactRepo; + + @Inject + private ContentItemRepository itemRepo; @PostConstruct @Override @@ -46,7 +50,10 @@ public class ContactImExporter @Override @Transactional(Transactional.TxType.REQUIRED) protected void saveImportedEntity(final Contact entity) { + final SciProject project = entity.getProject(); + project.addContact(entity); contactRepo.save(entity); + itemRepo.save(project); } @Override diff --git a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/MembershipImExporter.java b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/MembershipImExporter.java index d146a3a..ea73d9b 100644 --- a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/MembershipImExporter.java +++ b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/MembershipImExporter.java @@ -3,6 +3,7 @@ package org.scientificcms.contenttypes.sciproject; import org.libreccm.imexport.AbstractEntityImExporter; import org.libreccm.imexport.Processes; import org.librecms.assets.Person; +import org.librecms.contentsection.ContentItemRepository; import java.util.Objects; import java.util.Set; @@ -22,6 +23,9 @@ import javax.transaction.Transactional; public class MembershipImExporter extends AbstractEntityImExporter { + @Inject + private ContentItemRepository itemRepo; + @Inject private MembershipRepository membershipRepo; @@ -44,7 +48,10 @@ public class MembershipImExporter @Override @Transactional(Transactional.TxType.REQUIRED) protected void saveImportedEntity(final Membership entity) { + final SciProject project = entity.getProject(); + project.addMember(entity); membershipRepo.save(entity); + itemRepo.save(project); } @Override diff --git a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/SponsoringRepository.java b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/SponsoringRepository.java index eb70f8b..b1744d7 100644 --- a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/SponsoringRepository.java +++ b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/SponsoringRepository.java @@ -36,7 +36,8 @@ public class SponsoringRepository @Override public boolean isNew(final Sponsoring sponsoring) { - return sponsoring.getSponsoringId() == 0; + return sponsoring.getSponsoringId() == 0 + || sponsoring.getUuid() == null; } } diff --git a/scicms-bundle-devel-wildfly/pom.xml b/scicms-bundle-devel-wildfly/pom.xml index b7ed374..002cfb3 100644 --- a/scicms-bundle-devel-wildfly/pom.xml +++ b/scicms-bundle-devel-wildfly/pom.xml @@ -326,7 +326,7 @@ false ${project.basedir}/wildfly.properties - -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8787 -Xmx24G + -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8787 @@ -344,6 +344,7 @@ -agentlib:jdwp=transport=dt_socket,server=y,suspend=${libreccm.debug.suspend},address=${libreccm.debug.port} + -Xmx16G -Dorg.wildfly.datasources.postgresql.database=${libreccm.database.name}