diff --git a/sci-publications/src/main/java/org/scientificcms/publications/InProceedings.java b/sci-publications/src/main/java/org/scientificcms/publications/InProceedings.java index 6b0b5fd..c1830a4 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/InProceedings.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/InProceedings.java @@ -112,12 +112,12 @@ public class InProceedings extends Publication { return super.toString( String.format( "proceedings = %s, " - + "startPage = %d, " - + "endPage = %d%s", - Objects.toString(proceedings), - startPage, - endPage, - data + + "startPage = %d, " + + "endPage = %d%s", + Objects.toString(proceedings), + startPage, + endPage, + data ) ); } diff --git a/sci-publications/src/main/java/org/scientificcms/publications/Proceedings.java b/sci-publications/src/main/java/org/scientificcms/publications/Proceedings.java index 55abbda..1da79ea 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/Proceedings.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/Proceedings.java @@ -11,6 +11,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; import javax.persistence.Column; import javax.persistence.Entity; @@ -174,20 +175,33 @@ public class Proceedings extends PublicationWithPublisher { @Override public String toString(final String data) { + final String papers = this.papers + .stream() + .map( + paper -> String.format( + "{ uuid = %s, title = %s}", + paper.getUuid(), + Objects.toString(paper.getTitle()) + ) + ) + .collect(Collectors.joining(", ")); - return super.toString(String.format("nameOfConference = \"%s\", " - + "placeOfConference = \"%s\", " - + "startDate = \"%s\", " - + "endDate = \"%s\", " - + "organizer = %s, " - + "papers = %s%s", - nameOfConference, - placeOfConference, - Objects.toString(startDate), - Objects.toString(endDate), - Objects.toString(organizer), - Objects.toString(papers), - data) + return super.toString( + String.format( + "nameOfConference = \"%s\", " + + "placeOfConference = \"%s\", " + + "startDate = \"%s\", " + + "endDate = \"%s\", " + + "organizer = %s, " + + "papers = %s%s", + nameOfConference, + placeOfConference, + Objects.toString(startDate), + Objects.toString(endDate), + Objects.toString(organizer), + papers, + data + ) ); } diff --git a/scicms-bundle-devel-wildfly/set-transaction-timeout.cli b/scicms-bundle-devel-wildfly/set-transaction-timeout.cli index 79aaf03..268ea86 100644 --- a/scicms-bundle-devel-wildfly/set-transaction-timeout.cli +++ b/scicms-bundle-devel-wildfly/set-transaction-timeout.cli @@ -1 +1 @@ -/subsystem=transactions:write-attribute(name=default-timeout,value=7200) +/subsystem=transactions:write-attribute(name=default-timeout,value=14400)