From b6af917296a7c8164ffc6c81476eac9e388bc708 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Thu, 12 Mar 2020 12:11:31 +0100 Subject: [PATCH 01/92] Fixed several potential lazy init execeptions in forms for MPA --- .../MultiPartArticleEditForm.java | 8 +- .../MultiPartArticleForm.java | 9 ++- .../MultiPartArticleFormController.java | 65 +++++++++++++++- ...MultiPartArticleSectionStepController.java | 74 ++++++++++++++++++- .../MultiPartArticleSectionsStep.java | 11 ++- .../multipartarticle/SectionDeleteForm.java | 10 ++- .../multipartarticle/SectionEditForm.java | 36 ++++++--- .../multipartarticle/SectionTableModel.java | 16 +++- 8 files changed, 198 insertions(+), 31 deletions(-) diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleEditForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleEditForm.java index dee3e4cb3..a7c7fa2db 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleEditForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleEditForm.java @@ -129,15 +129,15 @@ public class MultiPartArticleEditForm extends MultiPartArticleForm .selectedLocale(state, selectedLanguageParam); final String newName = (String) data.get(MultiPartArticleForm.NAME); - final String oldName = article.getName().getValue(selectedLocale); + final MultiPartArticleFormController controller = CdiUtil + .createCdiUtil() + .findBean(MultiPartArticleFormController.class); + final String oldName = controller.getName(article, selectedLocale); final boolean valid; if (newName.equalsIgnoreCase(oldName)) { valid = true; } else { - final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final MultiPartArticleFormController controller = cdiUtil - .findBean(MultiPartArticleFormController.class); final Optional folder = controller.getArticleFolder(article); if (folder.isPresent()) { valid = validateNameUniqueness(folder.get(), event); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleForm.java index 4edcdd0a3..966c17a3d 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleForm.java @@ -233,14 +233,17 @@ public abstract class MultiPartArticleForm final Locale selectedLocale = SelectedLanguageUtil .selectedLocale(state, selectedLanguageParam); + final MultiPartArticleFormController controller = CdiUtil + .createCdiUtil() + .findBean(MultiPartArticleFormController.class); if (article != null) { - data.put(NAME, article.getName().getValue(selectedLocale)); - data.put(TITLE, article.getTitle().getValue(selectedLocale)); + data.put(NAME, controller.getName(article, selectedLocale)); + data.put(TITLE, controller.getTitle(article, selectedLocale)); if (!CMSConfig.getConfig().isHideLaunchDate()) { data.put(LAUNCH_DATE, article.getLaunchDate()); } - data.put(SUMMARY, article.getSummary().getValue(selectedLocale)); + data.put(SUMMARY, controller.getSummary(article, selectedLocale)); } return article; diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleFormController.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleFormController.java index 803a91461..001fecdac 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleFormController.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleFormController.java @@ -24,6 +24,8 @@ import org.librecms.contentsection.ContentItemRepository; import org.librecms.contentsection.Folder; import org.librecms.contenttypes.MultiPartArticle; +import java.util.Locale; +import java.util.Objects; import java.util.Optional; import javax.enterprise.context.RequestScoped; @@ -46,8 +48,9 @@ public class MultiPartArticleFormController { @Transactional(Transactional.TxType.REQUIRED) protected Optional getArticleFolder(final MultiPartArticle article) { - final Optional mpa = itemRepo - .findById(article.getObjectId()); + final Optional mpa = itemRepo.findById( + article.getObjectId() + ); if (mpa.isPresent()) { return itemManager.getItemFolder(mpa.get()); @@ -56,4 +59,62 @@ public class MultiPartArticleFormController { } } + @Transactional(Transactional.TxType.REQUIRED) + public String getName( + final MultiPartArticle fromMpa, final Locale forLocale + ) { + Objects.requireNonNull(fromMpa); + Objects.requireNonNull(forLocale); + final MultiPartArticle mpa = itemRepo + .findById(fromMpa.getObjectId(), MultiPartArticle.class) + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No MultiPartArticle with ID %d available", + fromMpa.getObjectId() + ) + ) + ); + return mpa.getName().getValue(forLocale); + } + + @Transactional(Transactional.TxType.REQUIRED) + public String getTitle( + final MultiPartArticle fromMpa, final Locale forLocale + ) { + Objects.requireNonNull(fromMpa); + Objects.requireNonNull(forLocale); + final MultiPartArticle mpa = itemRepo + .findById(fromMpa.getObjectId(), MultiPartArticle.class) + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No MultiPartArticle with ID %d available", + fromMpa.getObjectId() + ) + ) + ); + + return mpa.getTitle().getValue(forLocale); + } + + @Transactional(Transactional.TxType.REQUIRED) + public String getSummary( + final MultiPartArticle fromMpa, final Locale forLocale + ) { + Objects.requireNonNull(fromMpa); + Objects.requireNonNull(forLocale); + final MultiPartArticle mpa = itemRepo + .findById(fromMpa.getObjectId(), MultiPartArticle.class) + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No MultiPartArticle with ID %d available", + fromMpa.getObjectId() + ) + ) + ); + return mpa.getSummary().getValue(forLocale); + } + } diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleSectionStepController.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleSectionStepController.java index c9b8b7a78..bae2e3915 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleSectionStepController.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleSectionStepController.java @@ -25,6 +25,8 @@ import org.librecms.contenttypes.MultiPartArticleSectionManager; import org.librecms.contenttypes.MultiPartArticleSectionRepository; import java.util.List; +import java.util.Locale; +import java.util.Objects; import java.util.stream.Collectors; import javax.enterprise.context.RequestScoped; @@ -127,15 +129,81 @@ class MultiPartArticleSectionStepController { protected void moveAfter(final MultiPartArticle article, final MultiPartArticleSection section, final MultiPartArticleSection after) { - + final MultiPartArticle theArticle = itemRepo .findById(article.getObjectId(), MultiPartArticle.class) .orElseThrow(() -> new IllegalArgumentException(String.format( "No MultiPartArticle with ID %d in the database.", article.getObjectId()))); - + sectionManager.moveSectionAfter(theArticle, section, after); } - + + @Transactional(Transactional.TxType.REQUIRED) + public String getSectionTitle( + final MultiPartArticleSection ofSection, final Locale forLocale + ) { + Objects.requireNonNull(ofSection); + Objects.requireNonNull(forLocale); + + final MultiPartArticleSection section = sectionRepo + .findById(ofSection.getSectionId()) + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No section with ID %d available.", ofSection + .getSectionId() + ) + ) + ); + return section.getTitle().getValue(forLocale); + } + + @Transactional(Transactional.TxType.REQUIRED) + public String getSectionText( + final MultiPartArticleSection ofSection, final Locale forLocale + ) { + Objects.requireNonNull(ofSection); + Objects.requireNonNull(forLocale); + + final MultiPartArticleSection section = sectionRepo + .findById(ofSection.getSectionId()) + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No section with ID %d available.", ofSection + .getSectionId() + ) + ) + ); + return section.getText().getValue(forLocale); + } + + @Transactional(Transactional.TxType.REQUIRED) + public void updateSection( + final MultiPartArticleSection section, + final String title, + final String text, + final boolean pageBreak, + final Locale locale + ) { + Objects.requireNonNull(section); + Objects.requireNonNull(locale); + + final MultiPartArticleSection update = sectionRepo + .findById(section.getSectionId()) + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No section with ID %d available.", + section.getSectionId() + ) + ) + ); + update.getTitle().addValue(locale, title); + update.getText().addValue(locale, title); + update.setPageBreak(pageBreak); + } + } diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleSectionsStep.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleSectionsStep.java index e7e0318aa..b4ff8fff1 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleSectionsStep.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleSectionsStep.java @@ -158,11 +158,16 @@ public class MultiPartArticleSectionsStep extends ResettableContainer { final Locale selectedLocale = SelectedLanguageUtil .selectedLocale(state, selectedLanguageParam); + final MultiPartArticleSectionStepController controller = CdiUtil + .createCdiUtil() + .findBean(MultiPartArticleSectionStepController.class); + final Object[] parameterObj = { + controller.getSectionTitle( moveSectionModel - .getSelectedSection(state) - .getTitle() - .getValue(selectedLocale) + .getSelectedSection(state), + selectedLocale + ) }; target.setLabel(new GlobalizedMessage( diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionDeleteForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionDeleteForm.java index ca9cde32f..b5707bdd5 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionDeleteForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionDeleteForm.java @@ -35,7 +35,6 @@ import com.arsdigita.globalization.GlobalizedMessage; import org.librecms.contenttypes.MultiPartArticle; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.libreccm.cdi.utils.CdiUtil; @@ -110,9 +109,14 @@ public class SectionDeleteForm extends Form final Locale selectedLocale = SelectedLanguageUtil .selectedLocale(state, selectedLanguageParam); + final MultiPartArticleSectionStepController controller = CdiUtil + .createCdiUtil() + .findBean(MultiPartArticleSectionStepController.class); + sectionNameLabel.setLabel( - section.getTitle().getValue(selectedLocale), - state); + controller.getSectionTitle(section, selectedLocale), + state + ); } } diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionEditForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionEditForm.java index c27afce4d..2eec3eb52 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionEditForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionEditForm.java @@ -198,12 +198,19 @@ public class SectionEditForm extends Form { final Locale selectedLocale = SelectedLanguageUtil .selectedLocale(state, selectedLanguageParam); + final MultiPartArticleSectionStepController controller = CdiUtil + .createCdiUtil() + .findBean(MultiPartArticleSectionStepController.class); final MultiPartArticleSection section = selectedSectionModel .getSelectedSection(state); - data.put(TITLE, section.getTitle().getValue(selectedLocale)); - data.put(TEXT, section.getText().getValue(selectedLocale)); + data.put( + TITLE, controller.getSectionTitle(section, selectedLocale) + ); + data.put( + TEXT, controller.getSectionText(section, selectedLocale) + ); if (section.isPageBreak()) { data.put(PAGE_BREAK, new Object[]{"true"}); @@ -281,9 +288,8 @@ public class SectionEditForm extends Form { section = selectedSectionModel.getSelectedSection(state); } - section.getTitle().addValue(selectedLocale, - (String) data.get(TITLE)); - +// section.getTitle().addValue(selectedLocale, +// (String) data.get(TITLE)); final Object[] pageBreakVal = (Object[]) data.get(PAGE_BREAK); final boolean pageBreak; if (pageBreakVal == null @@ -293,7 +299,7 @@ public class SectionEditForm extends Form { } else { pageBreak = true; } - section.setPageBreak(pageBreak); +// section.setPageBreak(pageBreak); final String text; if (data.get(TEXT) == null) { @@ -301,12 +307,24 @@ public class SectionEditForm extends Form { } else { text = (String) data.get(TEXT); } - section.getText().addValue(selectedLocale, text); - - sectionRepo.save(section); +// section.getText().addValue(selectedLocale, text); +// sectionRepo.save(section); if (selectedSectionModel.getSelectedKey(state) == null) { + section.getTitle().addValue(selectedLocale, + (String) data.get(TITLE)); + section.setPageBreak(pageBreak); + section.getText().addValue(selectedLocale, text); + controller.addSection(article, section); + } else { + controller.updateSection( + section, + (String) data.get(TITLE), + text, + pageBreak, + selectedLocale + ); } if (sectionsStep != null) { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionTableModel.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionTableModel.java index 621a2820b..de8084d7a 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionTableModel.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionTableModel.java @@ -34,6 +34,7 @@ import org.librecms.contenttypes.MultiPartArticleSection; import java.util.Iterator; import java.util.List; +import java.util.Locale; class SectionTableModel implements TableModel { @@ -109,13 +110,20 @@ class SectionTableModel implements TableModel { if (columnModel == null) { return null; } + + final MultiPartArticleSectionStepController controller = CdiUtil + .createCdiUtil() + .findBean(MultiPartArticleSectionStepController.class); switch (columnIndex) { case SectionTable.COL_INDEX_TITLE: - return currentSection - .getTitle() - .getValue(SelectedLanguageUtil - .selectedLocale(pageState, selectedLanguageParam)); + return controller.getSectionTitle( + currentSection, + SelectedLanguageUtil.selectedLocale( + pageState, selectedLanguageParam + ) + ) + ; case SectionTable.COL_PAGE_BREAK: if (currentSection.isPageBreak()) { return new Label( From 2dc8b41b794e9575677bf540a7b0a3e26e692f26 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Thu, 12 Mar 2020 12:19:27 +0100 Subject: [PATCH 02/92] Fixed another potenial lazy init problem. --- .../categorization/CategoryTreeModelLite.java | 7 ++--- .../CategoryTreeModelLiteController.java | 29 +++++++++++++++++-- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryTreeModelLite.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryTreeModelLite.java index 8418c2c51..2b18331ef 100755 --- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryTreeModelLite.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryTreeModelLite.java @@ -142,10 +142,9 @@ public class CategoryTreeModelLite implements TreeModel { return category.getName(); } else { final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final GlobalizationHelper globalizationHelper = cdiUtil - .findBean(GlobalizationHelper.class); - return globalizationHelper - .getValueFromLocalizedString(category.getTitle()); + final CategoryTreeModelLiteController controller = cdiUtil + .findBean(CategoryTreeModelLiteController.class); + return controller.getTitle(category); } } diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryTreeModelLiteController.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryTreeModelLiteController.java index 33a953c61..193c7b20f 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryTreeModelLiteController.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryTreeModelLiteController.java @@ -18,8 +18,11 @@ */ package org.libreccm.categorization; +import org.libreccm.l10n.GlobalizationHelper; + import java.util.ArrayList; import java.util.List; +import java.util.Objects; import javax.enterprise.context.RequestScoped; import javax.inject.Inject; @@ -38,6 +41,9 @@ class CategoryTreeModelLiteController { @Inject private CategoryRepository categoryRepo; + @Inject + private GlobalizationHelper globalizationHelper; + @Transactional(Transactional.TxType.REQUIRED) protected boolean hasSubCategories(final long categoryId) { @@ -50,7 +56,7 @@ class CategoryTreeModelLiteController { return categoryManager.hasSubCategories(category); } - @Transactional + @Transactional(Transactional.TxType.REQUIRED) protected List findSubCategories(final long categoryId) { final Category category = categoryRepo @@ -58,8 +64,27 @@ class CategoryTreeModelLiteController { .orElseThrow(() -> new IllegalArgumentException(String .format("No Category with ID %d in the database.", categoryId))); - + return new ArrayList<>(category.getSubCategories()); } + @Transactional(Transactional.TxType.REQUIRED) + protected String getTitle(final Category ofCategory) { + Objects.requireNonNull(ofCategory); + + final Category category = categoryRepo + .findById(ofCategory.getObjectId()) + .orElseThrow( + () -> new IllegalArgumentException( + String.format( + "No Category with ID %d available.", + ofCategory.getObjectId() + ) + ) + ); + return globalizationHelper.getValueFromLocalizedString( + category.getTitle() + ); + } + } From 6a60575b7583b81c43bd0d22ba6aeaf77d804016 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Thu, 11 Jun 2020 17:06:11 +0200 Subject: [PATCH 03/92] * Fixed ContentSectionSetup (now sets UUIDs for Workflow and LifecycleDefinition) * Added UUID to Lifecycle and LifecycleDefinition * All setUuid method are now public --- .../contentsection/ContentSectionSetup.java | 2 + .../org/librecms/lifecycle/Lifecycle.java | 70 +++++++++++++------ .../lifecycle/LifecycleDefinition.java | 23 +++++- .../LifecycleDefinitionRepository.java | 10 +++ .../lifecycle/LifecycleRepository.java | 10 +++ .../categorization/Categorization.java | 2 +- .../categorization/DomainOwnership.java | 2 +- .../java/org/libreccm/core/ResourceType.java | 2 +- .../libreccm/pagemodel/ComponentModel.java | 2 +- .../libreccm/pagemodel/ContainerModel.java | 2 +- .../org/libreccm/pagemodel/PageModel.java | 2 +- .../libreccm/security/GroupMembership.java | 2 +- .../java/org/libreccm/security/Party.java | 2 +- .../org/libreccm/security/Permission.java | 2 +- .../main/java/org/libreccm/security/Role.java | 2 +- .../org/libreccm/security/RoleMembership.java | 2 +- .../java/org/libreccm/theming/db/Theme.java | 2 +- .../org/libreccm/theming/db/ThemeFile.java | 2 +- .../main/java/org/libreccm/workflow/Task.java | 2 +- .../org/libreccm/workflow/TaskAssignment.java | 2 +- .../org/libreccm/workflow/TaskComment.java | 2 +- .../org/libreccm/workflow/TaskDependency.java | 2 +- .../java/org/libreccm/workflow/Workflow.java | 2 +- 23 files changed, 108 insertions(+), 43 deletions(-) diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionSetup.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionSetup.java index f49abb8b1..38d529a39 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionSetup.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionSetup.java @@ -268,9 +268,11 @@ public class ContentSectionSetup extends AbstractCcmApplicationSetup { section.addRole(contentReader); final LifecycleDefinition lifecycleDefinition = new LifecycleDefinition(); + lifecycleDefinition.setUuid(UUID.randomUUID().toString()); lifecycleDefinition.getLabel().addValue(Locale.ENGLISH, "Standard"); final Workflow workflow = new Workflow(); + workflow.setUuid(UUID.randomUUID().toString()); workflow.setAbstractWorkflow(true); workflow.getName().addValue(Locale.ENGLISH, "Standard"); diff --git a/ccm-cms/src/main/java/org/librecms/lifecycle/Lifecycle.java b/ccm-cms/src/main/java/org/librecms/lifecycle/Lifecycle.java index f7e7cbcf5..03d00a657 100644 --- a/ccm-cms/src/main/java/org/librecms/lifecycle/Lifecycle.java +++ b/ccm-cms/src/main/java/org/librecms/lifecycle/Lifecycle.java @@ -18,6 +18,9 @@ */ package org.librecms.lifecycle; +import org.hibernate.search.annotations.Field; +import org.libreccm.core.Identifiable; + import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; @@ -36,6 +39,8 @@ import javax.persistence.OneToOne; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import javax.validation.constraints.NotNull; +import javax.xml.bind.annotation.XmlElement; import static org.librecms.CmsConstants.*; @@ -45,43 +50,52 @@ import static org.librecms.CmsConstants.*; */ @Entity @Table(name = "LIFECYCLES", schema = DB_SCHEMA) -public class Lifecycle implements Serializable { +public class Lifecycle implements Identifiable, Serializable { private static final long serialVersionUID = 184357562249530038L; - + @Id @GeneratedValue(strategy = GenerationType.AUTO) @Column(name = "LIFECYCLE_ID") private long lifecycleId; - + + /** + * + */ + @Column(name = "UUID", unique = true) + @NotNull + @Field + @XmlElement(name = "uuid") + private String uuid; + @Column(name = "START_DATE_TIME") @Temporal(TemporalType.DATE) private Date startDateTime; - + @Column(name = "END_DATE_TIME") @Temporal(TemporalType.DATE) private Date endDateTime; - + @Column(name = "LISTENER", length = 1024) private String listener; - + @Column(name = "STARTED") private boolean started; - + @Column(name = "FINISHED") private boolean finished; - + @OneToOne @JoinColumn(name = "DEFINITION_ID") private LifecycleDefinition definition; - + @OneToMany(mappedBy = "lifecycle") private List phases; public Lifecycle() { phases = new ArrayList<>(); } - + public long getLifecycleId() { return lifecycleId; } @@ -90,6 +104,15 @@ public class Lifecycle implements Serializable { this.lifecycleId = lifecycleId; } + @Override + public String getUuid() { + return uuid; + } + + public void setUuid(final String uuid) { + this.uuid = uuid; + } + public Date getStartDateTime() { return new Date(startDateTime.getTime()); } @@ -145,11 +168,11 @@ public class Lifecycle implements Serializable { protected void setPhases(final List phases) { this.phases = new ArrayList<>(phases); } - + public void addPhase(final Phase phase) { phases.add(phase); } - + public void removePhase(final Phase phase) { phases.remove(phase); } @@ -202,26 +225,26 @@ public class Lifecycle implements Serializable { } return Objects.equals(definition, other.getDefinition()); } - + public boolean canEqual(final Object obj) { return obj instanceof Lifecycle; } - + @Override public final String toString() { return toString(""); } - + public String toString(final String data) { return String.format("%s{ " - + "lifecycleId = %d, " - + "startDateTime = %tF % { + private static final long serialVersionUID = 1L; + @Override public Class getEntityClass() { return Lifecycle.class; @@ -50,4 +54,10 @@ public class LifecycleRepository return lifecycle.getLifecycleId() == 0; } + @Override + protected void initNewEntity(final Lifecycle entity) { + super.initNewEntity(entity); + entity.setUuid(UUID.randomUUID().toString()); + } + } diff --git a/ccm-core/src/main/java/org/libreccm/categorization/Categorization.java b/ccm-core/src/main/java/org/libreccm/categorization/Categorization.java index ee2ae9ba5..5b8b0f528 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/Categorization.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/Categorization.java @@ -180,7 +180,7 @@ public class Categorization implements Serializable, Relation, Exportable { return uuid; } - protected void setUuid(final String uuid) { + public void setUuid(final String uuid) { this.uuid = uuid; } diff --git a/ccm-core/src/main/java/org/libreccm/categorization/DomainOwnership.java b/ccm-core/src/main/java/org/libreccm/categorization/DomainOwnership.java index 887fffbed..db2a9ff65 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/DomainOwnership.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/DomainOwnership.java @@ -129,7 +129,7 @@ public class DomainOwnership implements Serializable, Exportable { return uuid; } - protected void setUuid(final String uuid) { + public void setUuid(final String uuid) { this.uuid = uuid; } diff --git a/ccm-core/src/main/java/org/libreccm/core/ResourceType.java b/ccm-core/src/main/java/org/libreccm/core/ResourceType.java index 5cd73bc91..3e7160c96 100644 --- a/ccm-core/src/main/java/org/libreccm/core/ResourceType.java +++ b/ccm-core/src/main/java/org/libreccm/core/ResourceType.java @@ -125,7 +125,7 @@ public class ResourceType implements Serializable, Exportable { return uuid; } - protected void setUuid(final String uuid) { + public void setUuid(final String uuid) { this.uuid = uuid; } diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModel.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModel.java index af8248378..71999fce5 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModel.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModel.java @@ -132,7 +132,7 @@ public class ComponentModel implements Serializable { return uuid; } - protected void setUuid(final String uuid) { + public void setUuid(final String uuid) { this.uuid = uuid; } diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ContainerModel.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ContainerModel.java index 2b18e1280..1b517ef38 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ContainerModel.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ContainerModel.java @@ -140,7 +140,7 @@ public class ContainerModel implements Serializable { return uuid; } - protected void setUuid(final String uuid) { + public void setUuid(final String uuid) { this.uuid = uuid; } diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModel.java b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModel.java index a594baf6a..242a30037 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModel.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModel.java @@ -289,7 +289,7 @@ public class PageModel implements Serializable { return uuid; } - protected void setUuid(final String uuid) { + public void setUuid(final String uuid) { this.uuid = uuid; } diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupMembership.java b/ccm-core/src/main/java/org/libreccm/security/GroupMembership.java index fe18e4c81..0d897f9e0 100644 --- a/ccm-core/src/main/java/org/libreccm/security/GroupMembership.java +++ b/ccm-core/src/main/java/org/libreccm/security/GroupMembership.java @@ -104,7 +104,7 @@ public class GroupMembership implements Serializable, Exportable { return uuid; } - protected void setUuid(final String uuid) { + public void setUuid(final String uuid) { this.uuid = uuid; } diff --git a/ccm-core/src/main/java/org/libreccm/security/Party.java b/ccm-core/src/main/java/org/libreccm/security/Party.java index 0cad09b9c..a90081bcb 100644 --- a/ccm-core/src/main/java/org/libreccm/security/Party.java +++ b/ccm-core/src/main/java/org/libreccm/security/Party.java @@ -141,7 +141,7 @@ public class Party implements Serializable { return uuid; } - protected void setUuid(final String uuid) { + public void setUuid(final String uuid) { this.uuid = uuid; } diff --git a/ccm-core/src/main/java/org/libreccm/security/Permission.java b/ccm-core/src/main/java/org/libreccm/security/Permission.java index 6d2b8991b..a692ccf1f 100644 --- a/ccm-core/src/main/java/org/libreccm/security/Permission.java +++ b/ccm-core/src/main/java/org/libreccm/security/Permission.java @@ -220,7 +220,7 @@ public class Permission implements Serializable, Exportable { return uuid; } - protected void setUuid(final String uuid) { + public void setUuid(final String uuid) { this.uuid = uuid; } diff --git a/ccm-core/src/main/java/org/libreccm/security/Role.java b/ccm-core/src/main/java/org/libreccm/security/Role.java index c1b56f900..7cb3eac16 100644 --- a/ccm-core/src/main/java/org/libreccm/security/Role.java +++ b/ccm-core/src/main/java/org/libreccm/security/Role.java @@ -233,7 +233,7 @@ public class Role implements Serializable, Exportable { return uuid; } - protected void setUuid(final String uuid) { + public void setUuid(final String uuid) { this.uuid = uuid; } diff --git a/ccm-core/src/main/java/org/libreccm/security/RoleMembership.java b/ccm-core/src/main/java/org/libreccm/security/RoleMembership.java index acea95f50..6aebd8d9c 100644 --- a/ccm-core/src/main/java/org/libreccm/security/RoleMembership.java +++ b/ccm-core/src/main/java/org/libreccm/security/RoleMembership.java @@ -104,7 +104,7 @@ public class RoleMembership implements Serializable, Exportable { return uuid; } - protected void setUuid(final String uuid) { + public void setUuid(final String uuid) { this.uuid = uuid; } diff --git a/ccm-core/src/main/java/org/libreccm/theming/db/Theme.java b/ccm-core/src/main/java/org/libreccm/theming/db/Theme.java index 48929d5d3..8a7cb3ec8 100644 --- a/ccm-core/src/main/java/org/libreccm/theming/db/Theme.java +++ b/ccm-core/src/main/java/org/libreccm/theming/db/Theme.java @@ -100,7 +100,7 @@ public class Theme implements Serializable { return uuid; } - protected void setUuid(final String uuid) { + public void setUuid(final String uuid) { this.uuid = uuid; } diff --git a/ccm-core/src/main/java/org/libreccm/theming/db/ThemeFile.java b/ccm-core/src/main/java/org/libreccm/theming/db/ThemeFile.java index f6f7f53bb..818b1ddb7 100644 --- a/ccm-core/src/main/java/org/libreccm/theming/db/ThemeFile.java +++ b/ccm-core/src/main/java/org/libreccm/theming/db/ThemeFile.java @@ -125,7 +125,7 @@ public class ThemeFile implements Serializable { return uuid; } - protected void setUuid(final String uuid) { + public void setUuid(final String uuid) { this.uuid = uuid; } diff --git a/ccm-core/src/main/java/org/libreccm/workflow/Task.java b/ccm-core/src/main/java/org/libreccm/workflow/Task.java index 6ba16680b..edf674783 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/Task.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/Task.java @@ -240,7 +240,7 @@ public class Task implements Identifiable, Serializable { return uuid; } - protected void setUuid(final String uuid) { + public void setUuid(final String uuid) { this.uuid = uuid; } diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignment.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignment.java index 5fc891841..2e4092f45 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignment.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignment.java @@ -92,7 +92,7 @@ public class TaskAssignment implements Serializable, Exportable { return uuid; } - protected void setUuid(final String uuid) { + public void setUuid(final String uuid) { this.uuid = uuid; } diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskComment.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskComment.java index dcc2907fb..156554794 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/TaskComment.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskComment.java @@ -110,7 +110,7 @@ public class TaskComment implements Identifiable, Serializable, Exportable { return uuid; } - protected void setUuid(final String uuid) { + public void setUuid(final String uuid) { this.uuid = uuid; } diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskDependency.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskDependency.java index effbb6ad3..7ad0b67d3 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/TaskDependency.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskDependency.java @@ -79,7 +79,7 @@ public class TaskDependency implements Serializable, Exportable { return uuid; } - protected void setUuid(final String uuid) { + public void setUuid(final String uuid) { this.uuid = uuid; } diff --git a/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java b/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java index 6f3b3e734..c722edf5b 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java @@ -196,7 +196,7 @@ public class Workflow implements Identifiable, Serializable, Exportable { return uuid; } - protected void setUuid(final String uuid) { + public void setUuid(final String uuid) { this.uuid = uuid; } From e2fcd17b1962eba0f33e318e4bc681cc0b685d5b Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Fri, 12 Jun 2020 13:37:38 +0200 Subject: [PATCH 04/92] DB-Migration for lifecycle UUIDs --- .../V7_0_0_24__add_lifecycle_uuid.java | 150 ++++++++++ .../scripts/002_create_ccm_cms_tables.sql | 14 +- .../scripts/002_create_ccm_cms_tables.sql | 14 +- .../002_create_ccm_cms_tables.sql | 266 +++++++++++++++++- 4 files changed, 437 insertions(+), 7 deletions(-) create mode 100644 ccm-cms/src/main/java/db/migrations/org/libreccm/ccm_cms/V7_0_0_24__add_lifecycle_uuid.java diff --git a/ccm-cms/src/main/java/db/migrations/org/libreccm/ccm_cms/V7_0_0_24__add_lifecycle_uuid.java b/ccm-cms/src/main/java/db/migrations/org/libreccm/ccm_cms/V7_0_0_24__add_lifecycle_uuid.java new file mode 100644 index 000000000..fc0925ddb --- /dev/null +++ b/ccm-cms/src/main/java/db/migrations/org/libreccm/ccm_cms/V7_0_0_24__add_lifecycle_uuid.java @@ -0,0 +1,150 @@ +package db.migrations.org.libreccm.ccm_cms; + +import org.flywaydb.core.api.migration.BaseJavaMigration; +import org.flywaydb.core.api.migration.Context; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + * + * @author Jens Pelzetter + */ +public class V7_0_0_24__add_lifecycle_uuid extends BaseJavaMigration { + + @Override + public void migrate(final Context context) throws Exception { + + final Connection connection = context.getConnection(); + + final List lifecycleIds = retrieveLifecycleIds(connection); + final List definitionIds = retrieveDefinitionIds( + connection + ); + + addLifecycleUuidCol(connection); + addDefinitionLifecycleCol(connection); + + setLifecycleUuid(connection, lifecycleIds); + setDefinitionUuid(connection, definitionIds); + + addLifecycleUniqueConstraint(connection); + addDefinitionUniqueConstraint(connection); + + } + + private List retrieveLifecycleIds(final Connection connection) + throws Exception { + final List result = new ArrayList<>(); + try (PreparedStatement stmt = connection + .prepareStatement("select LIFECYCLE_ID from LIFECYCLES"); + ResultSet resultSet = stmt.executeQuery()) { + + while (resultSet.next()) { + result.add(resultSet.getLong("LIFECYCLE_ID")); + } + + } + + return result; + } + + private List retrieveDefinitionIds(final Connection connection) + throws Exception { + final List result = new ArrayList<>(); + try (PreparedStatement stmt = connection + .prepareStatement( + "select LIFECYCLE_DEFINITION_ID " + + "from LIFECYLE_DEFINITIONS" + ); + ResultSet resultSet = stmt.executeQuery()) { + + while (resultSet.next()) { + result.add(resultSet.getLong("LIFECYCLE_ID")); + } + + } + + return result; + } + + private void addLifecycleUuidCol(final Connection connection) + throws Exception { + try (PreparedStatement stmt = connection.prepareStatement( + "alter table LIFECYCLES add column UUID varchar(255)" + )) { + stmt.execute(); + } + } + + private void addDefinitionLifecycleCol(final Connection connection) + throws Exception { + try (PreparedStatement stmt = connection.prepareStatement( + "alter table LIFECYCLE_DEFINITIONS " + + "add column UUID varchar(255)" + )) { + stmt.execute(); + } + } + + private void setLifecycleUuid( + final Connection connection, final List lifecycleIds + ) throws Exception { + try (PreparedStatement stmt = connection.prepareStatement( + "update LIFECYCLES set UUID = ? where LIFECYCLE_ID = ?" + )) { + for (final Long lifecycleId : lifecycleIds) { + stmt.setString(1, UUID.randomUUID().toString()); + stmt.setLong(2, lifecycleId); + stmt.executeUpdate(); + stmt.clearParameters(); + } + } + } + + private void setDefinitionUuid( + final Connection connection, final List definitionIds + ) throws Exception { + try (PreparedStatement stmt = connection.prepareStatement( + "update LIFECYCLE_DEFINITIONS set UUID = ? " + + "where LIFECYCLE_DEFINITION_ID = ?" + )) { + for (final Long lifecycleId : definitionIds) { + stmt.setString(1, UUID.randomUUID().toString()); + stmt.setLong(2, lifecycleId); + stmt.executeUpdate(); + stmt.clearParameters(); + } + } + + } + + private void addLifecycleUniqueConstraint( + final Connection connection + ) throws Exception { + try (PreparedStatement stmt = connection.prepareStatement( + "alter table LIFECYCLES " + + "add constraint UK_40o4njo54m8c4xlwq6ctnsimd " + + "unique (UUID)" + )) { + stmt.execute(); + } + } + + private void addDefinitionUniqueConstraint( + final Connection connection + ) throws Exception { +try (PreparedStatement stmt = connection.prepareStatement( + "alter table LIFECYCLE_DEFINITIONS " + + "add constraint UK_n6ki3s5im2k2nccpocuctqqe3 " + + "unique (UUID)" + )) { + stmt.execute(); + } + } + +} diff --git a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/002_create_ccm_cms_tables.sql b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/002_create_ccm_cms_tables.sql index 0504ce2c1..7bebb982b 100644 --- a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/002_create_ccm_cms_tables.sql +++ b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/002_create_ccm_cms_tables.sql @@ -736,6 +736,7 @@ LISTENER varchar(1024), START_DATE_TIME date, STARTED boolean, + UUID varchar(255), DEFINITION_ID bigint, primary key (LIFECYCLE_ID) ); @@ -743,6 +744,7 @@ create table CCM_CMS.LIFECYLE_DEFINITIONS ( LIFECYCLE_DEFINITION_ID bigint not null, DEFAULT_LISTENER varchar(1024), + UUID varchar(255), primary key (LIFECYCLE_DEFINITION_ID) ); @@ -1040,6 +1042,12 @@ alter table CCM_CMS.CONTENT_SECTION_WORKFLOW_TEMPLATES add constraint UK_goj42ghwu4tf1akfb2r6ensns unique (WORKFLOW_TEMPLATE_ID); + alter table CCM_CMS.LIFECYCLES + add constraint UK_40o4njo54m8c4xlwq6ctnsimd unique (UUID); + + alter table CCM_CMS.LIFECYLE_DEFINITIONS + add constraint UK_n6ki3s5im2k2nccpocuctqqe3 unique (UUID); + create table CCM_CORE.APPLICATIONS ( APPLICATION_TYPE varchar(1024) not null, PRIMARY_URL varchar(1024) not null, @@ -1584,11 +1592,11 @@ SETTING_ID bigint not null, CONFIGURATION_CLASS varchar(512) not null, NAME varchar(512) not null, - SETTING_VALUE_LONG bigint, SETTING_VALUE_BIG_DECIMAL decimal(19,2), - SETTING_VALUE_DOUBLE double, - SETTING_VALUE_STRING varchar(1024), SETTING_VALUE_BOOLEAN boolean, + SETTING_VALUE_LONG bigint, + SETTING_VALUE_STRING varchar(1024), + SETTING_VALUE_DOUBLE double, primary key (SETTING_ID) ); diff --git a/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_cms_tables.sql b/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_cms_tables.sql index 615bbcd45..cb0531a2e 100644 --- a/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_cms_tables.sql +++ b/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_cms_tables.sql @@ -736,6 +736,7 @@ LISTENER varchar(1024), START_DATE_TIME date, STARTED boolean, + UUID varchar(255), DEFINITION_ID int8, primary key (LIFECYCLE_ID) ); @@ -743,6 +744,7 @@ create table CCM_CMS.LIFECYLE_DEFINITIONS ( LIFECYCLE_DEFINITION_ID int8 not null, DEFAULT_LISTENER varchar(1024), + UUID varchar(255), primary key (LIFECYCLE_DEFINITION_ID) ); @@ -1040,6 +1042,12 @@ alter table CCM_CMS.CONTENT_SECTION_WORKFLOW_TEMPLATES add constraint UK_goj42ghwu4tf1akfb2r6ensns unique (WORKFLOW_TEMPLATE_ID); + alter table CCM_CMS.LIFECYCLES + add constraint UK_40o4njo54m8c4xlwq6ctnsimd unique (UUID); + + alter table CCM_CMS.LIFECYLE_DEFINITIONS + add constraint UK_n6ki3s5im2k2nccpocuctqqe3 unique (UUID); + create table CCM_CORE.APPLICATIONS ( APPLICATION_TYPE varchar(1024) not null, PRIMARY_URL varchar(1024) not null, @@ -1584,11 +1592,11 @@ SETTING_ID int8 not null, CONFIGURATION_CLASS varchar(512) not null, NAME varchar(512) not null, - SETTING_VALUE_LONG int8, SETTING_VALUE_BIG_DECIMAL numeric(19, 2), - SETTING_VALUE_DOUBLE float8, - SETTING_VALUE_STRING varchar(1024), SETTING_VALUE_BOOLEAN boolean, + SETTING_VALUE_LONG int8, + SETTING_VALUE_STRING varchar(1024), + SETTING_VALUE_DOUBLE float8, primary key (SETTING_ID) ); diff --git a/ccm-cms/src/test/resources/scripts/datasets-test/002_create_ccm_cms_tables.sql b/ccm-cms/src/test/resources/scripts/datasets-test/002_create_ccm_cms_tables.sql index 38fa156d6..7bebb982b 100644 --- a/ccm-cms/src/test/resources/scripts/datasets-test/002_create_ccm_cms_tables.sql +++ b/ccm-cms/src/test/resources/scripts/datasets-test/002_create_ccm_cms_tables.sql @@ -221,6 +221,80 @@ primary key (COMPONENT_MODEL_ID) ); + create table CCM_CMS.CONTACT_ENTRIES ( + CONTACT_ENTRY_ID bigint not null, + ENTRY_ORDER bigint, + ENTRY_VALUE varchar(4096), + CONTACT_ENTRY_KEY_ID bigint, + CONTACTABLE_ID bigint, + primary key (CONTACT_ENTRY_ID) + ); + + create table CCM_CMS.CONTACT_ENTRIES_AUD ( + CONTACT_ENTRY_ID bigint not null, + REV integer not null, + REVTYPE tinyint, + REVEND integer, + ENTRY_ORDER bigint, + ENTRY_VALUE varchar(4096), + CONTACT_ENTRY_KEY_ID bigint, + primary key (CONTACT_ENTRY_ID, REV) + ); + + create table CCM_CMS.CONTACT_ENTRY_KEY_LABELS ( + KEY_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (KEY_ID, LOCALE) + ); + + create table CCM_CMS.CONTACT_ENTRY_KEY_LABELS_AUD ( + REV integer not null, + KEY_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647) not null, + LOCALE varchar(255) not null, + REVTYPE tinyint, + REVEND integer, + primary key (REV, KEY_ID, LOCALIZED_VALUE, LOCALE) + ); + + create table CCM_CMS.CONTACT_ENTRY_KEYS ( + KEY_ID bigint not null, + ENTRY_KEY varchar(255), + primary key (KEY_ID) + ); + + create table CCM_CMS.CONTACT_ENTRY_KEYS_AUD ( + KEY_ID bigint not null, + REV integer not null, + REVTYPE tinyint, + REVEND integer, + ENTRY_KEY varchar(255), + primary key (KEY_ID, REV) + ); + + create table CCM_CMS.CONTACTABLE_ENTITIES ( + OBJECT_ID bigint not null, + POSTAL_ADDRESS_ID bigint, + primary key (OBJECT_ID) + ); + + create table CCM_CMS.CONTACTABLE_ENTITIES_AUD ( + OBJECT_ID bigint not null, + REV integer not null, + POSTAL_ADDRESS_ID bigint, + primary key (OBJECT_ID, REV) + ); + + create table CCM_CMS.ContactableEntity_ContactEntry_AUD ( + REV integer not null, + CONTACTABLE_ID bigint not null, + CONTACT_ENTRY_ID bigint not null, + REVTYPE tinyint, + REVEND integer, + primary key (REV, CONTACTABLE_ID, CONTACT_ENTRY_ID) + ); + create table CCM_CMS.CONTENT_ITEM_COMPONENTS ( MODE varchar(255), COMPONENT_MODEL_ID bigint not null, @@ -662,6 +736,7 @@ LISTENER varchar(1024), START_DATE_TIME date, STARTED boolean, + UUID varchar(255), DEFINITION_ID bigint, primary key (LIFECYCLE_ID) ); @@ -669,6 +744,7 @@ create table CCM_CMS.LIFECYLE_DEFINITIONS ( LIFECYCLE_DEFINITION_ID bigint not null, DEFAULT_LISTENER varchar(1024), + UUID varchar(255), primary key (LIFECYCLE_DEFINITION_ID) ); @@ -805,6 +881,19 @@ primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE) ); + create table CCM_CMS.ORGANIZATIONS ( + NAME varchar(1024), + OBJECT_ID bigint not null, + primary key (OBJECT_ID) + ); + + create table CCM_CMS.ORGANIZATIONS_AUD ( + OBJECT_ID bigint not null, + REV integer not null, + NAME varchar(1024), + primary key (OBJECT_ID, REV) + ); + create table CCM_CMS.PAGE_THEME_CONFIGURATIONS ( PAGE_ID bigint not null, INDEX_PAGE_TEMPLATE varchar(255), @@ -827,6 +916,60 @@ primary key (OBJECT_ID) ); + create table CCM_CMS.PERSON_NAMES ( + PERSON_ID bigint not null, + GIVEN_NAME varchar(255), + NAME_PREFIX varchar(255), + SUFFIX varchar(255), + SURNAME varchar(255) + ); + + create table CCM_CMS.PERSON_NAMES_AUD ( + REV integer not null, + REVTYPE tinyint not null, + PERSON_ID bigint not null, + REVEND integer, + SURNAME varchar(255), + NAME_PREFIX varchar(255), + GIVEN_NAME varchar(255), + SUFFIX varchar(255), + primary key (REV, REVTYPE, PERSON_ID) + ); + + create table CCM_CMS.PERSONS ( + BIRTHDATE date, + OBJECT_ID bigint not null, + primary key (OBJECT_ID) + ); + + create table CCM_CMS.PERSONS_AUD ( + OBJECT_ID bigint not null, + REV integer not null, + BIRTHDATE date, + primary key (OBJECT_ID, REV) + ); + + create table CCM_CMS.POSTAL_ADDRESSES ( + ADDRESS varchar(2048), + CITY varchar(512), + ISO_COUNTRY_CODE varchar(10), + POSTAL_CODE varchar(255), + ADDRESS_STATE varchar(255), + OBJECT_ID bigint not null, + primary key (OBJECT_ID) + ); + + create table CCM_CMS.POSTAL_ADDRESSES_AUD ( + OBJECT_ID bigint not null, + REV integer not null, + ADDRESS varchar(2048), + CITY varchar(512), + ISO_COUNTRY_CODE varchar(10), + POSTAL_CODE varchar(255), + ADDRESS_STATE varchar(255), + primary key (OBJECT_ID, REV) + ); + create table CCM_CMS.RELATED_LINKS ( OBJECT_ID bigint not null, BOOKMARK_ID bigint, @@ -899,6 +1042,12 @@ alter table CCM_CMS.CONTENT_SECTION_WORKFLOW_TEMPLATES add constraint UK_goj42ghwu4tf1akfb2r6ensns unique (WORKFLOW_TEMPLATE_ID); + alter table CCM_CMS.LIFECYCLES + add constraint UK_40o4njo54m8c4xlwq6ctnsimd unique (UUID); + + alter table CCM_CMS.LIFECYLE_DEFINITIONS + add constraint UK_n6ki3s5im2k2nccpocuctqqe3 unique (UUID); + create table CCM_CORE.APPLICATIONS ( APPLICATION_TYPE varchar(1024) not null, PRIMARY_URL varchar(1024) not null, @@ -1444,10 +1593,10 @@ CONFIGURATION_CLASS varchar(512) not null, NAME varchar(512) not null, SETTING_VALUE_BIG_DECIMAL decimal(19,2), - SETTING_VALUE_DOUBLE double, SETTING_VALUE_BOOLEAN boolean, SETTING_VALUE_LONG bigint, SETTING_VALUE_STRING varchar(1024), + SETTING_VALUE_DOUBLE double, primary key (SETTING_ID) ); @@ -1917,6 +2066,76 @@ create sequence hibernate_sequence start with 1 increment by 1; foreign key (COMPONENT_MODEL_ID) references CCM_CORE.PAGE_MODEL_COMPONENT_MODELS; + alter table CCM_CMS.CONTACT_ENTRIES + add constraint FKirtfj8sm4y5myworl5hvs1l78 + foreign key (CONTACT_ENTRY_KEY_ID) + references CCM_CMS.CONTACT_ENTRY_KEYS; + + alter table CCM_CMS.CONTACT_ENTRIES + add constraint FKljrrfco44damal9eaqrnfam0m + foreign key (CONTACTABLE_ID) + references CCM_CMS.CONTACTABLE_ENTITIES; + + alter table CCM_CMS.CONTACT_ENTRIES_AUD + add constraint FKib8xp3ab8kdkc0six36f99e2g + foreign key (REV) + references CCM_CORE.CCM_REVISIONS; + + alter table CCM_CMS.CONTACT_ENTRIES_AUD + add constraint FKrse7ibjqsfnny5t1b2tqqs3pt + foreign key (REVEND) + references CCM_CORE.CCM_REVISIONS; + + alter table CCM_CMS.CONTACT_ENTRY_KEY_LABELS + add constraint FK243nk3buqm0pskkr5ifjqfxn5 + foreign key (KEY_ID) + references CCM_CMS.CONTACT_ENTRY_KEYS; + + alter table CCM_CMS.CONTACT_ENTRY_KEY_LABELS_AUD + add constraint FK6n995k5gao6v63gfcga3yaxcw + foreign key (REV) + references CCM_CORE.CCM_REVISIONS; + + alter table CCM_CMS.CONTACT_ENTRY_KEY_LABELS_AUD + add constraint FKdr8ujdpn1ej8l6omlxq8bsxbd + foreign key (REVEND) + references CCM_CORE.CCM_REVISIONS; + + alter table CCM_CMS.CONTACT_ENTRY_KEYS_AUD + add constraint FKcvn2b1h1d4uvvmtbf4qf81l0y + foreign key (REV) + references CCM_CORE.CCM_REVISIONS; + + alter table CCM_CMS.CONTACT_ENTRY_KEYS_AUD + add constraint FKkyy4v3tax8w5htnpkmmt8aec1 + foreign key (REVEND) + references CCM_CORE.CCM_REVISIONS; + + alter table CCM_CMS.CONTACTABLE_ENTITIES + add constraint FKqefwowr9adclj3xvpfje9rddr + foreign key (POSTAL_ADDRESS_ID) + references CCM_CMS.POSTAL_ADDRESSES; + + alter table CCM_CMS.CONTACTABLE_ENTITIES + add constraint FKhdwlhf3jp8wf5wxjkoynrcspj + foreign key (OBJECT_ID) + references CCM_CMS.ASSETS; + + alter table CCM_CMS.CONTACTABLE_ENTITIES_AUD + add constraint FKjx8trfvt96fkdn6bafnh839id + foreign key (OBJECT_ID, REV) + references CCM_CMS.ASSETS_AUD; + + alter table CCM_CMS.ContactableEntity_ContactEntry_AUD + add constraint FKs5tfdp1auj9ocgvfa9ivec517 + foreign key (REV) + references CCM_CORE.CCM_REVISIONS; + + alter table CCM_CMS.ContactableEntity_ContactEntry_AUD + add constraint FKskn2ovg24tnnnwd2o8y0biyje + foreign key (REVEND) + references CCM_CORE.CCM_REVISIONS; + alter table CCM_CMS.CONTENT_ITEM_COMPONENTS add constraint FKp83o82kxo2ipa0xo03wxp4dcr foreign key (COMPONENT_MODEL_ID) @@ -2447,6 +2666,16 @@ create sequence hibernate_sequence start with 1 increment by 1; foreign key (REVEND) references CCM_CORE.CCM_REVISIONS; + alter table CCM_CMS.ORGANIZATIONS + add constraint FK77ig0to48xrlfx8qsc0vlfsp6 + foreign key (OBJECT_ID) + references CCM_CMS.CONTACTABLE_ENTITIES; + + alter table CCM_CMS.ORGANIZATIONS_AUD + add constraint FKp0k3bf008pih96sguio80siql + foreign key (OBJECT_ID, REV) + references CCM_CMS.CONTACTABLE_ENTITIES_AUD; + alter table CCM_CMS.PAGE_THEME_CONFIGURATIONS add constraint FK6l6xp6ex6sh2uuxfmeekf6ckn foreign key (PAGE_ID) @@ -2477,6 +2706,41 @@ create sequence hibernate_sequence start with 1 increment by 1; foreign key (OBJECT_ID) references CCM_CORE.SITE_AWARE_APPLICATIONS; + alter table CCM_CMS.PERSON_NAMES + add constraint FK2yluyhmpuhwxafcbna6u8txrt + foreign key (PERSON_ID) + references CCM_CMS.PERSONS; + + alter table CCM_CMS.PERSON_NAMES_AUD + add constraint FKtqtlwx8pa9ydh009sudtpfxie + foreign key (REV) + references CCM_CORE.CCM_REVISIONS; + + alter table CCM_CMS.PERSON_NAMES_AUD + add constraint FKs6m8tgbp8agrd5q3klwbtcujg + foreign key (REVEND) + references CCM_CORE.CCM_REVISIONS; + + alter table CCM_CMS.PERSONS + add constraint FKiv4ydysjekfx64pkb5v4vd9yj + foreign key (OBJECT_ID) + references CCM_CMS.CONTACTABLE_ENTITIES; + + alter table CCM_CMS.PERSONS_AUD + add constraint FKpup1q3295qkuovaptq8aj5lxp + foreign key (OBJECT_ID, REV) + references CCM_CMS.CONTACTABLE_ENTITIES_AUD; + + alter table CCM_CMS.POSTAL_ADDRESSES + add constraint FK4vajjjjo8ro0wns58t8f3i782 + foreign key (OBJECT_ID) + references CCM_CMS.ASSETS; + + alter table CCM_CMS.POSTAL_ADDRESSES_AUD + add constraint FKcrxgaot6kcp9rbxlg8gpp4grg + foreign key (OBJECT_ID, REV) + references CCM_CMS.ASSETS_AUD; + alter table CCM_CMS.RELATED_LINKS add constraint FKb517dnfj56oby2s34jp1omuim foreign key (BOOKMARK_ID) From 074cc6af67c2314e522f17ad5edba5bff663da61 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 13 Jun 2020 18:57:40 +0200 Subject: [PATCH 05/92] Bugfixes --- .../V7_0_0_24__add_lifecycle_uuid.java | 8 +++---- .../h2/V7_0_0_24__add_lifecycle_uuid.java | 22 +++++++++++++++++++ .../pgsql/V7_0_0_24__add_lifecycle_uuid.java | 22 +++++++++++++++++++ .../scripts/001_create_schema.sql | 5 ++--- .../main/java/org/libreccm/core/CcmCore.java | 1 - .../scripts/001_create_schema.sql | 2 +- .../scripts/create_ccm_docrepo_schema.sql | 4 ++-- .../scripts/create_ccm_shortcuts_schema.sql | 4 ++-- 8 files changed, 55 insertions(+), 13 deletions(-) rename ccm-cms/src/main/java/db/migrations/org/{libreccm => librecms}/ccm_cms/V7_0_0_24__add_lifecycle_uuid.java (95%) create mode 100644 ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_24__add_lifecycle_uuid.java create mode 100644 ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_24__add_lifecycle_uuid.java diff --git a/ccm-cms/src/main/java/db/migrations/org/libreccm/ccm_cms/V7_0_0_24__add_lifecycle_uuid.java b/ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/V7_0_0_24__add_lifecycle_uuid.java similarity index 95% rename from ccm-cms/src/main/java/db/migrations/org/libreccm/ccm_cms/V7_0_0_24__add_lifecycle_uuid.java rename to ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/V7_0_0_24__add_lifecycle_uuid.java index fc0925ddb..bcb9026f3 100644 --- a/ccm-cms/src/main/java/db/migrations/org/libreccm/ccm_cms/V7_0_0_24__add_lifecycle_uuid.java +++ b/ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/V7_0_0_24__add_lifecycle_uuid.java @@ -1,4 +1,4 @@ -package db.migrations.org.libreccm.ccm_cms; +package db.migrations.org.librecms.ccm_cms; import org.flywaydb.core.api.migration.BaseJavaMigration; import org.flywaydb.core.api.migration.Context; @@ -84,7 +84,7 @@ public class V7_0_0_24__add_lifecycle_uuid extends BaseJavaMigration { private void addDefinitionLifecycleCol(final Connection connection) throws Exception { try (PreparedStatement stmt = connection.prepareStatement( - "alter table LIFECYCLE_DEFINITIONS " + "alter table lifecyle_definitions " + "add column UUID varchar(255)" )) { stmt.execute(); @@ -110,7 +110,7 @@ public class V7_0_0_24__add_lifecycle_uuid extends BaseJavaMigration { final Connection connection, final List definitionIds ) throws Exception { try (PreparedStatement stmt = connection.prepareStatement( - "update LIFECYCLE_DEFINITIONS set UUID = ? " + "update LIFECYLE_DEFINITIONS set UUID = ? " + "where LIFECYCLE_DEFINITION_ID = ?" )) { for (final Long lifecycleId : definitionIds) { @@ -139,7 +139,7 @@ public class V7_0_0_24__add_lifecycle_uuid extends BaseJavaMigration { final Connection connection ) throws Exception { try (PreparedStatement stmt = connection.prepareStatement( - "alter table LIFECYCLE_DEFINITIONS " + "alter table LIFECYLE_DEFINITIONS " + "add constraint UK_n6ki3s5im2k2nccpocuctqqe3 " + "unique (UUID)" )) { diff --git a/ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_24__add_lifecycle_uuid.java b/ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_24__add_lifecycle_uuid.java new file mode 100644 index 000000000..0a5aed475 --- /dev/null +++ b/ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_24__add_lifecycle_uuid.java @@ -0,0 +1,22 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package db.migrations.org.librecms.ccm_cms.h2; + +import org.flywaydb.core.api.migration.Context; + +/** + * + * @author Jens Pelzetter + */ +public class V7_0_0_24__add_lifecycle_uuid + extends db.migrations.org.librecms.ccm_cms.V7_0_0_24__add_lifecycle_uuid { + + @Override + public void migrate(final Context context) throws Exception { + super.migrate(context); + } + +} diff --git a/ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_24__add_lifecycle_uuid.java b/ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_24__add_lifecycle_uuid.java new file mode 100644 index 000000000..62b12dc3e --- /dev/null +++ b/ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_24__add_lifecycle_uuid.java @@ -0,0 +1,22 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package db.migrations.org.librecms.ccm_cms.pgsql; + +import org.flywaydb.core.api.migration.Context; + +/** + * + * @author Jens Pelzetter + */ +public class V7_0_0_24__add_lifecycle_uuid + extends db.migrations.org.librecms.ccm_cms.V7_0_0_24__add_lifecycle_uuid { + + @Override + public void migrate(final Context context) throws Exception { + super.migrate(context); + } + +} diff --git a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql index 8f5613b9e..7fd77d983 100644 --- a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql +++ b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql @@ -1,9 +1,8 @@ -drop schema if exists CCM_CMS; -drop schema if exists CCM_CORE; +drop schema if exists CCM_CMS CASCADE; +drop schema if exists CCM_CORE CASCADE; drop sequence if exists HIBERNATE_SEQUENCE; - create schema CCM_CMS; create schema CCM_CORE; diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmCore.java b/ccm-core/src/main/java/org/libreccm/core/CcmCore.java index 684047481..c74208d6b 100644 --- a/ccm-core/src/main/java/org/libreccm/core/CcmCore.java +++ b/ccm-core/src/main/java/org/libreccm/core/CcmCore.java @@ -47,7 +47,6 @@ import java.io.IOException; import java.io.InputStream; import java.util.Properties; -import javax.transaction.Transactional; /** diff --git a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql b/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql index 643d210ad..520144928 100644 --- a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql +++ b/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql @@ -1,4 +1,4 @@ -drop schema if exists CCM_CORE; +drop schema if exists CCM_CORE CASCADE; drop sequence if exists HIBERNATE_SEQUENCE; diff --git a/ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_docrepo_schema.sql b/ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_docrepo_schema.sql index 1e6174e67..7e6be987a 100644 --- a/ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_docrepo_schema.sql +++ b/ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_docrepo_schema.sql @@ -1,5 +1,5 @@ -DROP SCHEMA IF EXISTS ccm_docrepo; -DROP SCHEMA IF EXISTS ccm_core; +DROP SCHEMA IF EXISTS ccm_docrepo CASCADE; +DROP SCHEMA IF EXISTS ccm_core CASCADE; DROP SEQUENCE IF EXISTS hibernate_sequence; diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_shortcuts_schema.sql b/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_shortcuts_schema.sql index 8719e64a2..a783ef6fd 100644 --- a/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_shortcuts_schema.sql +++ b/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_shortcuts_schema.sql @@ -1,5 +1,5 @@ -DROP SCHEMA IF EXISTS ccm_shortcuts; -DROP SCHEMA IF EXISTS ccm_core; +DROP SCHEMA IF EXISTS ccm_shortcuts CASCADE; +DROP SCHEMA IF EXISTS ccm_core CASCADE; DROP SEQUENCE IF EXISTS hibernate_sequence; From 707ba15ac126aa5cb9e03de264833649d99df656 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sun, 14 Jun 2020 12:54:43 +0200 Subject: [PATCH 06/92] Added wildfly-maven-plugin to poms --- ccm-bundle-devel-wildfly-web/pom.xml | 101 +++++++++++++++++++++++++-- pom.xml | 12 +++- 2 files changed, 106 insertions(+), 7 deletions(-) diff --git a/ccm-bundle-devel-wildfly-web/pom.xml b/ccm-bundle-devel-wildfly-web/pom.xml index 821c5b196..280cd2476 100644 --- a/ccm-bundle-devel-wildfly-web/pom.xml +++ b/ccm-bundle-devel-wildfly-web/pom.xml @@ -3,6 +3,9 @@ UTF-8 + jdbc:postgresql://localhost:5432/ccm-devel + ccm + ccm 4.0.0 @@ -21,7 +24,7 @@ LibreCCM Devel Bundle Web for Wildfly http://www.libreccm.org/modules/web/wildfly - + org.webjars @@ -121,7 +124,7 @@ link @librecms/ccm-cms-pagemodelseditor - + + + + run-with-wildfly + + + org.postgresql + postgresql + + + + + + org.wildfly.plugins + wildfly-maven-plugin + + + undeploy + clean + + undeploy + + + true + + + + start + package + + start + + + + deploy-jdbc-driver + package + + org.postgresql + postgresql + postgresql.jar + + + deploy-artifact + + + + add-datasource + install + +
subsystem=datasources,data-source=ccm-devel
+ + ${wildfly.datasource.connectionUrl} + java:/comp/env/jdbc/libreccm/db + true + ${wildfly.datasource.username} + ${wildfly.datasource.password} + false + + + + add-resource + + + + + + + + + + diff --git a/pom.xml b/pom.xml index f3cbc5039..9a2264509 100644 --- a/pom.xml +++ b/pom.xml @@ -329,7 +329,7 @@ org.wildfly.plugins wildfly-maven-plugin - 2.0.1.Final + 2.0.2.Final @@ -358,13 +358,13 @@ - + org.codehaus.mojo @@ -437,6 +437,12 @@ 5.3.15.Final + + org.postgresql + postgresql + 42.2.13 + + From 9c1af3188334429a01974d112f4b5e5c936bcab8 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sun, 14 Jun 2020 18:49:08 +0200 Subject: [PATCH 07/92] Added wildfly-maven-plugin to ccm-bundle-devel-wildfly-web --- ccm-bundle-devel-wildfly-web/pom.xml | 54 ++++++++++++++++++++-------- pom.xml | 2 +- 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/ccm-bundle-devel-wildfly-web/pom.xml b/ccm-bundle-devel-wildfly-web/pom.xml index 280cd2476..db6b2455a 100644 --- a/ccm-bundle-devel-wildfly-web/pom.xml +++ b/ccm-bundle-devel-wildfly-web/pom.xml @@ -222,7 +222,9 @@ org.wildfly.plugins wildfly-maven-plugin - true + + /subsystem=datasources/data-source=ccm-devel:add(driver-name=postgresql,jndi-name="java:/comp/env/jdbc/libreccm/db",connection-url="${wildfly.datasource.connectionUrl}",user-name="${wildfly.datasource.username}",password="${wildfly.datasource.password}",use-ccm="false") + --> @@ -243,7 +245,7 @@ org.wildfly.plugins wildfly-maven-plugin - + start package start + + System.out + deploy-jdbc-driver @@ -274,22 +279,41 @@ add-datasource - install + package
subsystem=datasources,data-source=ccm-devel
- - ${wildfly.datasource.connectionUrl} - java:/comp/env/jdbc/libreccm/db - true - ${wildfly.datasource.username} - ${wildfly.datasource.password} - false - + + + + + ${wildfly.datasource.connectionUrl} + java:/comp/env/jdbc/libreccm/db + true + ${wildfly.datasource.username} + ${wildfly.datasource.password} + false + postgresql.jar + + + + add-resource + - + + + org.wildfly.plugins + wildfly-maven-plugin + + false + + + + start + + start + + + System.out + + + + deploy-jdbc-driver + + org.postgresql + postgresql + postgresql.jar + + + deploy-artifact + + + + add-datasource + +
subsystem=datasources,data-source=ccm-devel
+ + + + + ${wildfly.datasource.connectionUrl} + java:/comp/env/jdbc/libreccm/db + true + ${wildfly.datasource.username} + ${wildfly.datasource.password} + false + postgresql.jar + + + + + + + add-resource + + + + shutdown + + shutdown + + + + - run-with-wildfly + prepare-wildfly org.postgresql @@ -244,6 +334,9 @@ org.wildfly.plugins wildfly-maven-plugin + + false + - + + + shutdown package - start + shutdown - --> + diff --git a/pom.xml b/pom.xml index 2430a0755..7ed296253 100644 --- a/pom.xml +++ b/pom.xml @@ -155,6 +155,11 @@ maven-assembly-plugin 3.1.1 + + org.apache.maven.plugins + maven-clean-plugin + 3.1.0 + org.apache.maven.plugins maven-compiler-plugin @@ -330,6 +335,9 @@ org.wildfly.plugins wildfly-maven-plugin 2.1.0.Beta1 + + true + From 45351ade0ea1ad359a22be5aa06dce975bb2155d Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Thu, 18 Jun 2020 08:21:20 +0200 Subject: [PATCH 09/92] Keep the staging directory of the project site in parent project. --- pom.xml | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f3cbc5039..1070773f1 100644 --- a/pom.xml +++ b/pom.xml @@ -155,6 +155,11 @@ maven-assembly-plugin 3.1.1 + + org.apache.maven.plugins + maven-clean-plugin + 3.1.0 + org.apache.maven.plugins maven-compiler-plugin @@ -246,7 +251,7 @@ org.apache.maven.plugins maven-site-plugin - 3.7.1 + 3.9.0 org.apache.maven.plugins @@ -335,6 +340,22 @@ + + org.apache.maven.plugins + maven-clean-plugin + 3.1.0 + + true + + + ${project.build.directory} + + staging/** + + + + + org.apache.maven.plugins maven-enforcer-plugin @@ -382,6 +403,11 @@ https://svn.libreccm.org/ccm/ccm_ng-releases + + + org.apache.maven.plugins + maven-site-plugin + org.apache.maven.plugins @@ -841,4 +867,4 @@ - \ No newline at end of file + From 24e252881b38ea1232e2a718b633309c23907096 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Fri, 19 Jun 2020 12:24:29 +0200 Subject: [PATCH 10/92] Wildfly plugin configuration --- ccm-bundle-devel-wildfly-web/.gitignore | 2 + ccm-bundle-devel-wildfly-web/README.md | 43 +++- .../datasource.example.properties | 3 + ccm-bundle-devel-wildfly-web/pom.xml | 196 +++++++----------- .../src/main/webapp/WEB-INF/jboss-web.xml | 4 + .../wildfly.example.properties | 12 ++ pom.xml | 7 +- 7 files changed, 138 insertions(+), 129 deletions(-) create mode 100644 ccm-bundle-devel-wildfly-web/.gitignore create mode 100644 ccm-bundle-devel-wildfly-web/datasource.example.properties create mode 100644 ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/jboss-web.xml create mode 100644 ccm-bundle-devel-wildfly-web/wildfly.example.properties diff --git a/ccm-bundle-devel-wildfly-web/.gitignore b/ccm-bundle-devel-wildfly-web/.gitignore new file mode 100644 index 000000000..ee3de53b9 --- /dev/null +++ b/ccm-bundle-devel-wildfly-web/.gitignore @@ -0,0 +1,2 @@ +datasource.properties +wildfly.properties diff --git a/ccm-bundle-devel-wildfly-web/README.md b/ccm-bundle-devel-wildfly-web/README.md index 9efaa9761..c2db0a5b2 100644 --- a/ccm-bundle-devel-wildfly-web/README.md +++ b/ccm-bundle-devel-wildfly-web/README.md @@ -1,7 +1,42 @@ -## Prepare Wildfly: +# ccm-bundle-devel-wildfly README -mvn -pl ccm-bundle-devel-wildfly-web wildfly:start wildfly:deploy-artifact@deploy-jdbc-driver wildfly:add-resource@add-datasource wildfly:shutdown +This module creates a WAR which can be deployed to a Wildfly Application +Server. For testing, the module also provides an runtime environment +and the setup. The runtime is managed using the +[wildfly-maven-plugin](https://docs.jboss.org/wildfly/plugins/maven/latest/). + +At the moment the runtime only supports PostgreSQL as database. + +To use these runtime some prepration steps are necessary. + +1. Create the configuration files. The runtime is configured using two files: + * wildfly.properties allows it to configure the ports used by the Wildfly server + * datasource.properties provides the configuration data for datasource used by + LibreCCM. + + For both files examples are provided (`datasource.example.properties`, + `wildfly.example.properties`). Copy the example files and customize + the settings is necessary. + +2. Run a build using the `setup-runtime` profile. It is important to add the + `package` goal, otherwise the WAR file which is deployed in this step is + not build correctly: + + ``` + mvn package -Psetup-runtime -pl ccm-bundle-devel-wildfly -am + ``` + + During the `package` phase of the this module Wildfly will be downloaded, + unpackaged into the `target` directory, the PostgreSQL driver will be + deployed, a datasource will be generated and the WAR file will be deployed. + +To run LibreCCM in this environment, use the `enable-runtime` profile and the `wildfly:start` +goal: + + mvn -Penable-runtime -pl ccm-bundle-devel-wildfly wildfly:start + +To shutdown the server: + + mvn -Penable-runtime -pl ccm-bundle-devel-wildfly wildfly:shutdown -## Running -mvn -pl ccm-bundle-devel-wildfly-web -am wildfly:run diff --git a/ccm-bundle-devel-wildfly-web/datasource.example.properties b/ccm-bundle-devel-wildfly-web/datasource.example.properties new file mode 100644 index 000000000..2ce5dd016 --- /dev/null +++ b/ccm-bundle-devel-wildfly-web/datasource.example.properties @@ -0,0 +1,3 @@ +libreccm.datasource.connectionUrl=jdbc:postgresql://localhost:5432/ccm-devel-beta +libreccm.datasource.username=ccm +libreccm.datasource.password=ccm diff --git a/ccm-bundle-devel-wildfly-web/pom.xml b/ccm-bundle-devel-wildfly-web/pom.xml index 7ab045e69..4bb2c0b93 100644 --- a/ccm-bundle-devel-wildfly-web/pom.xml +++ b/ccm-bundle-devel-wildfly-web/pom.xml @@ -3,9 +3,7 @@ UTF-8 - jdbc:postgresql://localhost:5432/ccm-devel - ccm - ccm + 4.0.0 @@ -62,11 +60,11 @@ ${project.parent.version} - + @@ -232,158 +230,95 @@ ${project.build.directory} - - classes/ - generated-resources/ - libreccm-web-wildfly/ - libreccm-web-wildfly.war - maven-archiver/ - test-classes/ - war/ - - wildfly* + wildfly*/** - - - - org.wildfly.plugins - wildfly-maven-plugin - - false - - - - start - - start - - - System.out - - - - deploy-jdbc-driver - - org.postgresql - postgresql - postgresql.jar - - - deploy-artifact - - - - add-datasource - -
subsystem=datasources,data-source=ccm-devel
- - - - - ${wildfly.datasource.connectionUrl} - java:/comp/env/jdbc/libreccm/db - true - ${wildfly.datasource.username} - ${wildfly.datasource.password} - false - postgresql.jar - - - - - - - add-resource - - - - shutdown - - shutdown - - - - - prepare-wildfly + setup-runtime + org.postgresql postgresql + provided + + org.codehaus.mojo + properties-maven-plugin + + + read-datasource-properties + initialize + + read-project-properties + + + + ${project.basedir}/datasource.properties + + + + + org.wildfly.plugins wildfly-maven-plugin false + ${project.basedir}/wildfly.properties - - start - package + start-for-prepare start + package System.out deploy-jdbc-driver - package org.postgresql postgresql postgresql.jar + true + package deploy-artifact add-datasource - package
subsystem=datasources,data-source=ccm-devel
+ true - - ${wildfly.datasource.connectionUrl} + ${libreccm.datasource.connectionUrl} java:/comp/env/jdbc/libreccm/db true - ${wildfly.datasource.username} - ${wildfly.datasource.password} + ${libreccm.datasource.username} + ${libreccm.datasource.password} false postgresql.jar @@ -391,38 +326,23 @@ + package add-resource - - - + - shutdown + shutdown-after-deploy package shutdown @@ -433,5 +353,33 @@ + + + enable-runtime + + localhost + 127.0.0.1 + 8180 + 8543 + + + + + org.wildfly.plugins + wildfly-maven-plugin + + false + ${project.basedir}/wildfly.properties + + + + + + + diff --git a/ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/jboss-web.xml b/ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/jboss-web.xml new file mode 100644 index 000000000..3b2f84d32 --- /dev/null +++ b/ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/jboss-web.xml @@ -0,0 +1,4 @@ + + + /libreccm + diff --git a/ccm-bundle-devel-wildfly-web/wildfly.example.properties b/ccm-bundle-devel-wildfly-web/wildfly.example.properties new file mode 100644 index 000000000..e986880c6 --- /dev/null +++ b/ccm-bundle-devel-wildfly-web/wildfly.example.properties @@ -0,0 +1,12 @@ +# Configuration for Wildfly, primarly ports on which Wildfly will listen + +# Ports for Undertow (Servlet Container). These are the ports which you are +# using the access your application +jboss.http.port=8080 +jboss.https.port=8443 + +# Ports for Wildfly's Management Interface +jboss.management.http.port=9990 +jboss.management.https.port=9993 + + diff --git a/pom.xml b/pom.xml index e2121c3c2..3ed2054f8 100644 --- a/pom.xml +++ b/pom.xml @@ -321,6 +321,11 @@ + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + org.codehaus.mojo versions-maven-plugin @@ -382,7 +387,7 @@ - - ear - - LibreCCM Devel Bundle for Wildfly - http://www.libreccm.org/bundles/devel/wildfly - - - - org.libreccm - ccm-bundle-devel-wildfly-web - ${project.parent.version} - war - - - - - libreccm-devel-${project.version} - - - - org.apache.maven.plugins - maven-ear-plugin - - - 7 - - lib - no-version - - - org.libreccm - ccm-bundle-devel-wildfly-web - /libreccm - - - - - - - - - - - - - - h2 - - - - - org.wildfly.plugins - wildfly-maven-plugin - - - ${wildfly.version} - - false - - - - - admin - admin123 - - - - - - - data-source add --jndi-name=java:/comp/env/jdbc/libreccm/db --name=ccm-devel --connection-url=jdbc:h2:${project.build.directory}/libreccm-db;DB_CLOSE_ON_EXIT=FALSE --driver-name=h2 --driver-class=org.h2.Driver --user-name=sa --password=sa - - - - - -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8787 - - - - - - - - - - - - pgsql - - - - org.postgresql - postgresql - 9.4.1208 - - - - - - - org.wildfly.plugins - wildfly-maven-plugin - - - ${wildfly.version} - - false - - - - - admin - admin1234 - - - - - - - - module add --name=org.postgres --resources=${project.build.directory}/${project.build.finalName}/lib/postgresql.jar --dependencies=javax.api,javax.transaction.api - /subsystem=datasources/jdbc-driver=postgres:add(driver-name="postgres",driver-module-name="org.postgres",driver-class-name=org.postgresql.Driver) - data-source add --jndi-name=java:/comp/env/jdbc/libreccm/db --name=libreccm-devel --connection-url=jdbc:postgresql://localhost:5432/libreccm-devel --driver-name=postgres --driver-class=org.postgresql.Driver --user-name=ccm --password=ccm47web - - - - - -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8787 - - - - - - - - - - - - generic - - - - - org.wildfly.plugins - wildfly-maven-plugin - - - ${wildfly.version} - - false - 120 - - - -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8787 - - - - - - - - - - diff --git a/ccm-bundle-devel-wildfly/pom.xml.releaseBackup b/ccm-bundle-devel-wildfly/pom.xml.releaseBackup deleted file mode 100644 index 2fff1b822..000000000 --- a/ccm-bundle-devel-wildfly/pom.xml.releaseBackup +++ /dev/null @@ -1,205 +0,0 @@ - - - - - UTF-8 - 10.0.0.Final - - - 4.0.0 - - - org.libreccm - libreccm-parent - 7.0.0-SNAPSHOT - - - org.libreccm - ccm-bundle-devel-wildfly - - ear - - LibreCCM Devel Bundle for Wildfly - http://www.libreccm.org/bundles/devel/wildfly - - - - org.libreccm - ccm-bundle-devel-wildfly-web - ${project.parent.version} - war - - - - - libreccm-devel-${project.version} - - - - org.apache.maven.plugins - maven-ear-plugin - - - 7 - - lib - no-version - - - org.libreccm - ccm-bundle-devel-wildfly-web - /libreccm - - - - - - - - - - - - - - h2 - - - - - org.wildfly.plugins - wildfly-maven-plugin - - - ${wildfly.version} - - false - - - - - admin - admin123 - - - - - - - data-source add --jndi-name=java:/comp/env/jdbc/libreccm/db --name=ccm-devel --connection-url=jdbc:h2:${project.build.directory}/libreccm-db;DB_CLOSE_ON_EXIT=FALSE --driver-name=h2 --driver-class=org.h2.Driver --user-name=sa --password=sa - - - - - -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8787 - - - - - - - - - - - - pgsql - - - - org.postgresql - postgresql - 9.4.1208 - - - - - - - org.wildfly.plugins - wildfly-maven-plugin - - - ${wildfly.version} - - false - - - - - admin - admin1234 - - - - - - - - module add --name=org.postgres --resources=${project.build.directory}/${project.build.finalName}/lib/postgresql.jar --dependencies=javax.api,javax.transaction.api - /subsystem=datasources/jdbc-driver=postgres:add(driver-name="postgres",driver-module-name="org.postgres",driver-class-name=org.postgresql.Driver) - data-source add --jndi-name=java:/comp/env/jdbc/libreccm/db --name=libreccm-devel --connection-url=jdbc:postgresql://localhost:5432/libreccm-devel --driver-name=postgres --driver-class=org.postgresql.Driver --user-name=ccm --password=ccm47web - - - - - -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8787 - - - - - - - - - - - - generic - - - - - org.wildfly.plugins - wildfly-maven-plugin - - - ${wildfly.version} - - false - 120 - - - -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8787 - - - - - - - - - - diff --git a/ccm-bundle-devel-wildfly/src/site/apt/index.apt b/ccm-bundle-devel-wildfly/src/site/apt/index.apt deleted file mode 100644 index 21efc60eb..000000000 --- a/ccm-bundle-devel-wildfly/src/site/apt/index.apt +++ /dev/null @@ -1,63 +0,0 @@ - -------------- - Overview - -------------- - Jens Pelzetter - -------------- - 2016-06-03 - -------------- - -LibreCCM Bundle for Wildfly - - This module provides the LibreCCM development bundle for the Wildfly - application server. - - This bundle is not meant for production use as its contains most of the - available modules. - - Developers can run this LibreCCM directly from Maven. Three profiles are - provided: - - [h2] Uses a H2 database located in the project build directory. This means - that the database is deleted every time <<>>. - - [pgsql] Uses an PostgresSQL database with a generic configuration. The - PostgreSQL server must run on localhost and the standard port and there - must be a database called with <<>> which is accessible - for the user <<>> using the password <<>>. - - [generic] Uses an existing Wildfly installation. The datasource for the - database which is used by LibreCCM has to be configured by the user for this - profile. Also, Maven or more exactly the wildfly-maven-plugin has to know - the location of the Wildfly instance to use. The location of the Wildfly - instance can either be provided on the command line when invoking Maven - or by setting the <<>> environment variable. - - When using the <<

>> it is not necessary to install a Wildfly application - server first. The will download the Wildfly - application server and extract the server into the <<>> directory. - - The <<

>> and the <<>> profile add a user to the Wildfly server - with the username <<>> and the password <<>> which allow - the developer to access the management web UI of the Wildfly server. - -* Run examples - - ** Profile h2 - - To run the LibreCCM bundle using a H2 database: - - mvn package wildfly:run -pl ccm-bundle-devel-wildfly -am -Ph2 - - ** Profile pgsql - - mvn package wildfly:run -pl ccm-bundle-devel-wildfly -am -Ppgsql - - ** Profile generic - - mvn -Djboss-as.home=/home/mustermann/java-ee-servers/wildfly/wildfly-10.0.0.Final package wildfly:run -pl ccm-bundle-devel-wildfly -am -Pgeneric - - ** Additional options - - The <<>> goal of the provides several - other options. For a complete list please refer to the documentation of the - {{{https://docs.jboss.org/wildfly/plugins/maven/latest/run-mojo.html}run goal}}. \ No newline at end of file diff --git a/ccm-bundle-devel-wildfly/src/site/site.xml b/ccm-bundle-devel-wildfly/src/site/site.xml deleted file mode 100644 index c862aebae..000000000 --- a/ccm-bundle-devel-wildfly/src/site/site.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - From e3b72125232687407a44771bdeddb05f1c56f0f6 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Fri, 19 Jun 2020 12:28:08 +0200 Subject: [PATCH 12/92] Renamed ccm-bundle-devel-wildfly-web to ccm-bundle-devel-wildfly --- ccm-bundle-devel-wildfly-web/nb-configuration.xml | 12 ------------ .../.gitignore | 0 .../README.md | 0 .../datasource.example.properties | 0 .../package-lock.json | 0 .../package.json | 0 .../pom.xml | 2 +- .../pom.xml.releaseBackup | 0 .../src/main/resources/log4j2.xml | 0 .../main/resources/scripts/ccm-cms/tinymce-loader.js | 0 .../src/main/resources/shiro.ini | 0 .../src/main/resources/stylesheet-paths.txt | 0 .../src/main/resources/systeminformation.properties | 0 .../src/main/typescript/ccm-cms-pagemodelseditor.ts | 0 .../src/main/typescript/ccm-cms-tinymce.ts.off | 0 .../src/main/typescript/ccm-cms.ts | 0 .../tinymce.off/ccm-cms-tinymce-loader.ts.off | 0 .../src/main/webapp/WEB-INF/beans.xml | 0 .../webapp/WEB-INF/classes/META-INF/persistence.xml | 0 .../webapp/WEB-INF/conf/registry/registry.properties | 0 .../src/main/webapp/WEB-INF/faces-config.xml | 0 .../src/main/webapp/WEB-INF/jboss-web.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../src/main/webapp/ccm-editor/ccm-editor-loader.js | 0 .../src/main/webapp/test-index.xhtml | 0 .../src/site/apt/index.apt | 0 .../src/site/site.xml | 0 .../tsconfig.json | 0 .../tslint.json | 0 .../webpack.config.js | 0 .../wildfly.example.properties | 0 pom.xml | 1 - 32 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 ccm-bundle-devel-wildfly-web/nb-configuration.xml rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/.gitignore (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/README.md (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/datasource.example.properties (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/package-lock.json (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/package.json (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/pom.xml (99%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/pom.xml.releaseBackup (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/src/main/resources/log4j2.xml (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/src/main/resources/scripts/ccm-cms/tinymce-loader.js (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/src/main/resources/shiro.ini (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/src/main/resources/stylesheet-paths.txt (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/src/main/resources/systeminformation.properties (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/src/main/typescript/ccm-cms-pagemodelseditor.ts (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/src/main/typescript/ccm-cms-tinymce.ts.off (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/src/main/typescript/ccm-cms.ts (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/src/main/typescript/tinymce.off/ccm-cms-tinymce-loader.ts.off (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/src/main/webapp/WEB-INF/beans.xml (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/src/main/webapp/WEB-INF/conf/registry/registry.properties (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/src/main/webapp/WEB-INF/faces-config.xml (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/src/main/webapp/WEB-INF/jboss-web.xml (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/src/main/webapp/WEB-INF/web.xml (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/src/main/webapp/ccm-editor/ccm-editor-loader.js (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/src/main/webapp/test-index.xhtml (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/src/site/apt/index.apt (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/src/site/site.xml (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/tsconfig.json (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/tslint.json (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/webpack.config.js (100%) rename {ccm-bundle-devel-wildfly-web => ccm-bundle-devel-wildfly}/wildfly.example.properties (100%) diff --git a/ccm-bundle-devel-wildfly-web/nb-configuration.xml b/ccm-bundle-devel-wildfly-web/nb-configuration.xml deleted file mode 100644 index d6dddb53c..000000000 --- a/ccm-bundle-devel-wildfly-web/nb-configuration.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - libreccm - - diff --git a/ccm-bundle-devel-wildfly-web/.gitignore b/ccm-bundle-devel-wildfly/.gitignore similarity index 100% rename from ccm-bundle-devel-wildfly-web/.gitignore rename to ccm-bundle-devel-wildfly/.gitignore diff --git a/ccm-bundle-devel-wildfly-web/README.md b/ccm-bundle-devel-wildfly/README.md similarity index 100% rename from ccm-bundle-devel-wildfly-web/README.md rename to ccm-bundle-devel-wildfly/README.md diff --git a/ccm-bundle-devel-wildfly-web/datasource.example.properties b/ccm-bundle-devel-wildfly/datasource.example.properties similarity index 100% rename from ccm-bundle-devel-wildfly-web/datasource.example.properties rename to ccm-bundle-devel-wildfly/datasource.example.properties diff --git a/ccm-bundle-devel-wildfly-web/package-lock.json b/ccm-bundle-devel-wildfly/package-lock.json similarity index 100% rename from ccm-bundle-devel-wildfly-web/package-lock.json rename to ccm-bundle-devel-wildfly/package-lock.json diff --git a/ccm-bundle-devel-wildfly-web/package.json b/ccm-bundle-devel-wildfly/package.json similarity index 100% rename from ccm-bundle-devel-wildfly-web/package.json rename to ccm-bundle-devel-wildfly/package.json diff --git a/ccm-bundle-devel-wildfly-web/pom.xml b/ccm-bundle-devel-wildfly/pom.xml similarity index 99% rename from ccm-bundle-devel-wildfly-web/pom.xml rename to ccm-bundle-devel-wildfly/pom.xml index 4bb2c0b93..b57e97c17 100644 --- a/ccm-bundle-devel-wildfly-web/pom.xml +++ b/ccm-bundle-devel-wildfly/pom.xml @@ -16,7 +16,7 @@ org.libreccm - ccm-bundle-devel-wildfly-web + ccm-bundle-devel-wildfly war diff --git a/ccm-bundle-devel-wildfly-web/pom.xml.releaseBackup b/ccm-bundle-devel-wildfly/pom.xml.releaseBackup similarity index 100% rename from ccm-bundle-devel-wildfly-web/pom.xml.releaseBackup rename to ccm-bundle-devel-wildfly/pom.xml.releaseBackup diff --git a/ccm-bundle-devel-wildfly-web/src/main/resources/log4j2.xml b/ccm-bundle-devel-wildfly/src/main/resources/log4j2.xml similarity index 100% rename from ccm-bundle-devel-wildfly-web/src/main/resources/log4j2.xml rename to ccm-bundle-devel-wildfly/src/main/resources/log4j2.xml diff --git a/ccm-bundle-devel-wildfly-web/src/main/resources/scripts/ccm-cms/tinymce-loader.js b/ccm-bundle-devel-wildfly/src/main/resources/scripts/ccm-cms/tinymce-loader.js similarity index 100% rename from ccm-bundle-devel-wildfly-web/src/main/resources/scripts/ccm-cms/tinymce-loader.js rename to ccm-bundle-devel-wildfly/src/main/resources/scripts/ccm-cms/tinymce-loader.js diff --git a/ccm-bundle-devel-wildfly-web/src/main/resources/shiro.ini b/ccm-bundle-devel-wildfly/src/main/resources/shiro.ini similarity index 100% rename from ccm-bundle-devel-wildfly-web/src/main/resources/shiro.ini rename to ccm-bundle-devel-wildfly/src/main/resources/shiro.ini diff --git a/ccm-bundle-devel-wildfly-web/src/main/resources/stylesheet-paths.txt b/ccm-bundle-devel-wildfly/src/main/resources/stylesheet-paths.txt similarity index 100% rename from ccm-bundle-devel-wildfly-web/src/main/resources/stylesheet-paths.txt rename to ccm-bundle-devel-wildfly/src/main/resources/stylesheet-paths.txt diff --git a/ccm-bundle-devel-wildfly-web/src/main/resources/systeminformation.properties b/ccm-bundle-devel-wildfly/src/main/resources/systeminformation.properties similarity index 100% rename from ccm-bundle-devel-wildfly-web/src/main/resources/systeminformation.properties rename to ccm-bundle-devel-wildfly/src/main/resources/systeminformation.properties diff --git a/ccm-bundle-devel-wildfly-web/src/main/typescript/ccm-cms-pagemodelseditor.ts b/ccm-bundle-devel-wildfly/src/main/typescript/ccm-cms-pagemodelseditor.ts similarity index 100% rename from ccm-bundle-devel-wildfly-web/src/main/typescript/ccm-cms-pagemodelseditor.ts rename to ccm-bundle-devel-wildfly/src/main/typescript/ccm-cms-pagemodelseditor.ts diff --git a/ccm-bundle-devel-wildfly-web/src/main/typescript/ccm-cms-tinymce.ts.off b/ccm-bundle-devel-wildfly/src/main/typescript/ccm-cms-tinymce.ts.off similarity index 100% rename from ccm-bundle-devel-wildfly-web/src/main/typescript/ccm-cms-tinymce.ts.off rename to ccm-bundle-devel-wildfly/src/main/typescript/ccm-cms-tinymce.ts.off diff --git a/ccm-bundle-devel-wildfly-web/src/main/typescript/ccm-cms.ts b/ccm-bundle-devel-wildfly/src/main/typescript/ccm-cms.ts similarity index 100% rename from ccm-bundle-devel-wildfly-web/src/main/typescript/ccm-cms.ts rename to ccm-bundle-devel-wildfly/src/main/typescript/ccm-cms.ts diff --git a/ccm-bundle-devel-wildfly-web/src/main/typescript/tinymce.off/ccm-cms-tinymce-loader.ts.off b/ccm-bundle-devel-wildfly/src/main/typescript/tinymce.off/ccm-cms-tinymce-loader.ts.off similarity index 100% rename from ccm-bundle-devel-wildfly-web/src/main/typescript/tinymce.off/ccm-cms-tinymce-loader.ts.off rename to ccm-bundle-devel-wildfly/src/main/typescript/tinymce.off/ccm-cms-tinymce-loader.ts.off diff --git a/ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/beans.xml b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/beans.xml similarity index 100% rename from ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/beans.xml rename to ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/beans.xml diff --git a/ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml similarity index 100% rename from ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml rename to ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml diff --git a/ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/conf/registry/registry.properties b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/conf/registry/registry.properties similarity index 100% rename from ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/conf/registry/registry.properties rename to ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/conf/registry/registry.properties diff --git a/ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/faces-config.xml b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/faces-config.xml similarity index 100% rename from ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/faces-config.xml rename to ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/faces-config.xml diff --git a/ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/jboss-web.xml b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/jboss-web.xml similarity index 100% rename from ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/jboss-web.xml rename to ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/jboss-web.xml diff --git a/ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/web.xml b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/web.xml rename to ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/web.xml diff --git a/ccm-bundle-devel-wildfly-web/src/main/webapp/ccm-editor/ccm-editor-loader.js b/ccm-bundle-devel-wildfly/src/main/webapp/ccm-editor/ccm-editor-loader.js similarity index 100% rename from ccm-bundle-devel-wildfly-web/src/main/webapp/ccm-editor/ccm-editor-loader.js rename to ccm-bundle-devel-wildfly/src/main/webapp/ccm-editor/ccm-editor-loader.js diff --git a/ccm-bundle-devel-wildfly-web/src/main/webapp/test-index.xhtml b/ccm-bundle-devel-wildfly/src/main/webapp/test-index.xhtml similarity index 100% rename from ccm-bundle-devel-wildfly-web/src/main/webapp/test-index.xhtml rename to ccm-bundle-devel-wildfly/src/main/webapp/test-index.xhtml diff --git a/ccm-bundle-devel-wildfly-web/src/site/apt/index.apt b/ccm-bundle-devel-wildfly/src/site/apt/index.apt similarity index 100% rename from ccm-bundle-devel-wildfly-web/src/site/apt/index.apt rename to ccm-bundle-devel-wildfly/src/site/apt/index.apt diff --git a/ccm-bundle-devel-wildfly-web/src/site/site.xml b/ccm-bundle-devel-wildfly/src/site/site.xml similarity index 100% rename from ccm-bundle-devel-wildfly-web/src/site/site.xml rename to ccm-bundle-devel-wildfly/src/site/site.xml diff --git a/ccm-bundle-devel-wildfly-web/tsconfig.json b/ccm-bundle-devel-wildfly/tsconfig.json similarity index 100% rename from ccm-bundle-devel-wildfly-web/tsconfig.json rename to ccm-bundle-devel-wildfly/tsconfig.json diff --git a/ccm-bundle-devel-wildfly-web/tslint.json b/ccm-bundle-devel-wildfly/tslint.json similarity index 100% rename from ccm-bundle-devel-wildfly-web/tslint.json rename to ccm-bundle-devel-wildfly/tslint.json diff --git a/ccm-bundle-devel-wildfly-web/webpack.config.js b/ccm-bundle-devel-wildfly/webpack.config.js similarity index 100% rename from ccm-bundle-devel-wildfly-web/webpack.config.js rename to ccm-bundle-devel-wildfly/webpack.config.js diff --git a/ccm-bundle-devel-wildfly-web/wildfly.example.properties b/ccm-bundle-devel-wildfly/wildfly.example.properties similarity index 100% rename from ccm-bundle-devel-wildfly-web/wildfly.example.properties rename to ccm-bundle-devel-wildfly/wildfly.example.properties diff --git a/pom.xml b/pom.xml index 3ed2054f8..b4c0c7429 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,6 @@ ccm-bundle-devel - ccm-bundle-devel-wildfly-web ccm-bundle-devel-wildfly ccm-bundle-devel-thorntail From e4d8689d3e9796094a335ff3ab516d2f3a0c216c Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Fri, 19 Jun 2020 12:28:46 +0200 Subject: [PATCH 13/92] Better name for bundle --- ccm-bundle-devel-wildfly/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccm-bundle-devel-wildfly/pom.xml b/ccm-bundle-devel-wildfly/pom.xml index b57e97c17..26b9e582a 100644 --- a/ccm-bundle-devel-wildfly/pom.xml +++ b/ccm-bundle-devel-wildfly/pom.xml @@ -20,7 +20,7 @@ war - LibreCCM Devel Bundle Web for Wildfly + LibreCCM Devel Bundle for Wildfly http://www.libreccm.org/modules/web/wildfly From ecff915daddf75b222e15ce226c53a3e802f1950 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Fri, 19 Jun 2020 12:30:10 +0200 Subject: [PATCH 14/92] Removed unused properties --- ccm-bundle-devel-wildfly/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ccm-bundle-devel-wildfly/pom.xml b/ccm-bundle-devel-wildfly/pom.xml index 26b9e582a..a4115f00e 100644 --- a/ccm-bundle-devel-wildfly/pom.xml +++ b/ccm-bundle-devel-wildfly/pom.xml @@ -356,12 +356,6 @@ enable-runtime - - localhost - 127.0.0.1 - 8180 - 8543 - From df5539b676fca84741c145f3ad84121402108406 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Fri, 19 Jun 2020 13:02:22 +0200 Subject: [PATCH 15/92] Simplified start procedure for Wildfly runtime --- ccm-bundle-devel-wildfly/README.md | 4 ++-- ccm-bundle-devel-wildfly/pom.xml | 35 ++++++++++-------------------- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/ccm-bundle-devel-wildfly/README.md b/ccm-bundle-devel-wildfly/README.md index c2db0a5b2..8f7efd49b 100644 --- a/ccm-bundle-devel-wildfly/README.md +++ b/ccm-bundle-devel-wildfly/README.md @@ -33,10 +33,10 @@ To use these runtime some prepration steps are necessary. To run LibreCCM in this environment, use the `enable-runtime` profile and the `wildfly:start` goal: - mvn -Penable-runtime -pl ccm-bundle-devel-wildfly wildfly:start + mvn -pl ccm-bundle-devel-wildfly wildfly:start To shutdown the server: - mvn -Penable-runtime -pl ccm-bundle-devel-wildfly wildfly:shutdown + mvn -pl ccm-bundle-devel-wildfly wildfly:shutdown diff --git a/ccm-bundle-devel-wildfly/pom.xml b/ccm-bundle-devel-wildfly/pom.xml index a4115f00e..9d770cbe7 100644 --- a/ccm-bundle-devel-wildfly/pom.xml +++ b/ccm-bundle-devel-wildfly/pom.xml @@ -237,13 +237,23 @@ + + + org.wildfly.plugins + wildfly-maven-plugin + + false + ${project.basedir}/wildfly.properties + + + setup-runtime - - - - - - - + From e4a400b254f5b1ba7540aafb354d57db418bac3b Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Mon, 22 Jun 2020 07:51:27 +0200 Subject: [PATCH 16/92] Updated maven-assembly-plugin to 3.3.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1070773f1..be6853b2b 100644 --- a/pom.xml +++ b/pom.xml @@ -153,7 +153,7 @@ org.apache.maven.plugins maven-assembly-plugin - 3.1.1 + 3.3.0 org.apache.maven.plugins From fe80552c258a996c6c8832c86bbe1d967ac39f71 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Mon, 22 Jun 2020 08:06:24 +0200 Subject: [PATCH 17/92] Updated maven-compiler-plugin to 3.8.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index be6853b2b..397f4deb4 100644 --- a/pom.xml +++ b/pom.xml @@ -163,7 +163,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.8.1 1.8 1.8 From 49e8c36f839fdb30742f800fcbefb9ae620c6863 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Mon, 22 Jun 2020 10:02:33 +0200 Subject: [PATCH 18/92] Updated maven-javadoc-plugin to 3.2.0 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 397f4deb4..9667841fc 100644 --- a/pom.xml +++ b/pom.xml @@ -180,22 +180,22 @@ org.apache.maven.plugins maven-ear-plugin - 3.0.1 + 3.0.2 org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M2 + 3.0.0-M3 org.apache.maven.plugins maven-jar-plugin - 3.1.1 + 3.2.0 org.apache.maven.plugins maven-javadoc-plugin - 3.1.0 + 3.2.0 org.apache.maven.plugins From 89c0e0ab80147dff4abda7821737b07871605b1b Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Mon, 22 Jun 2020 10:53:04 +0200 Subject: [PATCH 19/92] Updated maven-pmd-plugin to 3.13.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9667841fc..049c611d6 100644 --- a/pom.xml +++ b/pom.xml @@ -200,7 +200,7 @@ org.apache.maven.plugins maven-pmd-plugin - 3.11.0 + 3.13.0 true utf-8 From ea73f04e861dd0623aff6ec9de49f42f76d99fd2 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Mon, 22 Jun 2020 12:43:41 +0200 Subject: [PATCH 20/92] Updated maven-project-info-reports-plugin to 3.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 049c611d6..bac9adfae 100644 --- a/pom.xml +++ b/pom.xml @@ -236,7 +236,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.0 org.apache.maven.plugins From 46a917c73091cba9fea8e4ecd66db273d55564f5 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Mon, 22 Jun 2020 12:44:05 +0200 Subject: [PATCH 21/92] Updated maven-release-plugin to 3.0.0-M1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bac9adfae..c8e96e54d 100644 --- a/pom.xml +++ b/pom.xml @@ -241,7 +241,7 @@ org.apache.maven.plugins maven-release-plugin - 2.5.3 + 3.0.0-M1 org.apache.maven.plugins From 4c8d8dca6ed022735716fd0cbdad543b60bd1be7 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Mon, 22 Jun 2020 13:33:34 +0200 Subject: [PATCH 22/92] Updated maven-surefire-plugin to 3.0.0-M4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c8e96e54d..f5651b744 100644 --- a/pom.xml +++ b/pom.xml @@ -246,7 +246,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M3 + 3.0.0-M4 org.apache.maven.plugins From 7bc740b27ca39b41189c4ff260126e236d2ccadb Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Mon, 22 Jun 2020 14:02:27 +0200 Subject: [PATCH 23/92] Updated maven-war-plugin to 3.3.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f5651b744..158eda849 100644 --- a/pom.xml +++ b/pom.xml @@ -256,7 +256,7 @@ org.apache.maven.plugins maven-war-plugin - 3.2.2 + 3.3.0 - org.libreccm ccm-bundle-devel @@ -142,17 +136,14 @@ org.webjars font-awesome - 4.7.0 org.webjars requirejs - 2.3.6 org.webjars requirejs-domready - 2.0.1-2 diff --git a/ccm-bundle-devel-wildfly-web/pom.xml b/ccm-bundle-devel-wildfly-web/pom.xml index 821c5b196..fc67502c2 100644 --- a/ccm-bundle-devel-wildfly-web/pom.xml +++ b/ccm-bundle-devel-wildfly-web/pom.xml @@ -26,28 +26,19 @@ org.webjars font-awesome - org.webjars requirejs - org.webjars requirejs-domready - org.webjars.npm tinymce - - org.librecms ccm-cms-pagemodelseditor @@ -103,15 +94,6 @@ v8.11.4 - npm link @librecms/ccm-cms-pagemodelseditor diff --git a/ccm-bundle-devel-wildfly/pom.xml b/ccm-bundle-devel-wildfly/pom.xml index 879f9eedc..6f3826c43 100644 --- a/ccm-bundle-devel-wildfly/pom.xml +++ b/ccm-bundle-devel-wildfly/pom.xml @@ -121,7 +121,6 @@ org.postgresql postgresql - 9.4.1208 diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index 8c09637e8..c40da9151 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -215,7 +215,6 @@ org.reflections reflections - org.apache.openejb tomee-webservices - 4.0.0 org.apache.openejb tomee-jaxrs - 1.7.3 com.h2database @@ -709,12 +703,10 @@ org.apache.openejb arquillian-tomee-remote - 1.7.3 org.apache.openejb apache-tomee - 1.7.3 plus zip diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml index de138394d..36c3a5208 100644 --- a/ccm-docrepo/pom.xml +++ b/ccm-docrepo/pom.xml @@ -270,12 +270,10 @@ org.apache.maven.plugins maven-project-info-reports-plugin - diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml index 317ac9b3d..fdff0bc6e 100644 --- a/ccm-shortcuts/pom.xml +++ b/ccm-shortcuts/pom.xml @@ -314,7 +314,6 @@ org.apache.maven.plugins diff --git a/pom.xml b/pom.xml index 1ebe1e7c9..bfddab27f 100644 --- a/pom.xml +++ b/pom.xml @@ -728,6 +728,13 @@ woodstox-core-asl 4.4.1 + + + + org.postgresql + postgresql + 42.2.14 + From 4e7f7f37374b8014ded08917874856ab4eb2f6bc Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Tue, 23 Jun 2020 07:27:43 +0200 Subject: [PATCH 35/92] Updated io.thorntail.bom to 2.7.0.Final --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bfddab27f..fe104eacf 100644 --- a/pom.xml +++ b/pom.xml @@ -418,7 +418,7 @@ io.thorntail bom - 2.4.0.Final + 2.7.0.Final import pom From 007af91c126a0e9e0fad2b68500cfe7f171f6186 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Tue, 23 Jun 2020 11:19:00 +0200 Subject: [PATCH 36/92] Updated Hibernate to 5.3.17.Final --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fe104eacf..3d7f6ba62 100644 --- a/pom.xml +++ b/pom.xml @@ -432,7 +432,7 @@ org.hibernate hibernate-core - 5.3.15.Final + 5.3.17.Final - org.hibernate + org.hibernate.validator hibernate-validator - 6.0.18.Final + 6.1.5.Final - org.hibernate + org.hibernate.validator hibernate-validator-cdi - 6.0.18.Final + 6.1.5.Final + javax.el javax.el-api From 05c289d377980809cdc7e62f7f85f8701bf2150a Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Tue, 23 Jun 2020 13:35:19 +0200 Subject: [PATCH 38/92] Updated hibernate-search to 5.11.5.Final --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3309f6ad0..3cea09988 100644 --- a/pom.xml +++ b/pom.xml @@ -477,7 +477,7 @@ org.hibernate hibernate-search-orm - 5.10.7.Final + 5.11.5.Final From 332a4a8b8b887343afafd426adfd8dd32218216f Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Tue, 23 Jun 2020 16:38:47 +0200 Subject: [PATCH 41/92] Updated io.jsonwebtoken libs to 0.11.2 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 93eab6284..a5e8c6511 100644 --- a/pom.xml +++ b/pom.xml @@ -520,17 +520,17 @@ io.jsonwebtoken jjwt-api - 0.10.6 + 0.11.2 io.jsonwebtoken jjwt-impl - 0.10.6 + 0.11.2 io.jsonwebtoken jjwt-jackson - 0.10.6 + 0.11.2 - org.codehaus.woodstox - woodstox-core-asl - com.fasterxml.jackson.dataformat jackson-dataformat-csv diff --git a/pom.xml b/pom.xml index 554152af2..05005a056 100644 --- a/pom.xml +++ b/pom.xml @@ -718,17 +718,10 @@ com.fasterxml.jackson jackson-bom - 2.9.8 + 2.11.0 import pom - - - - org.codehaus.woodstox - woodstox-core-asl - 4.4.1 - From 9a43678e8f32fca7b65b9232f1dd79f28c7b1a06 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Thu, 25 Jun 2020 11:10:21 +0200 Subject: [PATCH 55/92] Updated Arquillian to 1.6.0, and org.jboss.arquillian.extension.arquillian-jacoco to 1.1.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 05005a056..b49fadd9f 100644 --- a/pom.xml +++ b/pom.xml @@ -749,7 +749,7 @@ org.jboss.arquillian arquillian-bom - 1.4.1.Final + 1.6.0.Final import pom @@ -766,7 +766,7 @@ org.jboss.arquillian.extension arquillian-jacoco - 1.0.0.Alpha10 + 1.1.0 org.wildfly.arquillian From 267b30c8f4cce67f14ff46126a61e16f4e52afe2 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Thu, 25 Jun 2020 11:11:22 +0200 Subject: [PATCH 56/92] Updated Arquillian drivers for TomEE to 1.7.5 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b49fadd9f..0cf1024e1 100644 --- a/pom.xml +++ b/pom.xml @@ -784,13 +784,13 @@ org.apache.openejb arquillian-tomee-embedded - 1.7.3 + 1.7.5 org.apache.openejb tomee-embedded - 1.7.3 + 1.7.5 From 50cb38ea2cdc281f197cdfc4fc463b22a60d4380 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Thu, 25 Jun 2020 11:21:00 +0200 Subject: [PATCH 57/92] Updated org.jboss.logmanager.jboss-logmanager to 2.1.16 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0cf1024e1..3576eb4f8 100644 --- a/pom.xml +++ b/pom.xml @@ -796,7 +796,7 @@ org.jboss.logmanager jboss-logmanager - 2.0.3.Final + 2.1.16.Final test From ea3be80cb65a9d1443ed720ca7f005c51a9a2dd6 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Thu, 25 Jun 2020 11:47:30 +0200 Subject: [PATCH 58/92] Updated org.apache.openejb.tomee-jaxrs to 1.7.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3576eb4f8..459e70d0f 100644 --- a/pom.xml +++ b/pom.xml @@ -808,7 +808,7 @@ org.apache.openejb tomee-jaxrs - 1.7.3 + 1.7.5 From 88f0afe7e2a36032e0e0c93b3e41b59b40454f33 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Thu, 25 Jun 2020 11:53:35 +0200 Subject: [PATCH 59/92] Updated TomEE modules for Arquillian to 1.7.5 --- pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 459e70d0f..580923a89 100644 --- a/pom.xml +++ b/pom.xml @@ -812,15 +812,15 @@ - org.apache.openejb - arquillian-tomee-remote - 1.7.3 - - - org.apache.openejb - apache-tomee - 1.7.3 - + org.apache.openejb + arquillian-tomee-remote + 1.7.5 + + + org.apache.openejb + apache-tomee + 1.7.5 + - 3.1.9 + 3.4 From daacb627a48fa2557aef4043bbe551ca73476c43 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Thu, 25 Jun 2020 13:52:55 +0200 Subject: [PATCH 63/92] Updated com.h2.database.h2 to 1.4.200 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 49874fcb2..3b938b54f 100644 --- a/pom.xml +++ b/pom.xml @@ -863,7 +863,7 @@ com.h2database h2 - 1.4.199 + 1.4.200 From 65bf4fbd967087cb8c81e06a1b7ca48f59352c17 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Thu, 25 Jun 2020 16:38:08 +0200 Subject: [PATCH 64/92] Removed obsolete FindBugs plugin (superseeded by SpotBugs) --- .../main/resources/archetype-resources/pom.xml | 5 ----- .../main/resources/archetype-resources/pom.xml | 5 ----- ccm-cms-profile/pom.xml | 4 ---- ccm-cms-types-agenda/pom.xml | 6 +----- ccm-cms-types-bookmark/pom.xml | 4 ---- ccm-cms-types-decisiontree/pom.xml | 4 ---- ccm-cms-types-externallink/pom.xml | 4 ---- ccm-cms-types-faqitem/pom.xml | 4 ---- ccm-cms-types-glossaryitem/pom.xml | 6 +----- ccm-cms-types-minutes/pom.xml | 4 ---- ccm-cms/pom.xml | 7 ------- ccm-core/pom.xml | 11 ++--------- ...indbugs-exclude.xml => spotbugs-exclude.xml} | 0 ccm-docrepo/pom.xml | 4 ---- ccm-shortcuts/pom.xml | 7 ------- ccm-xafilesystemadapter/pom.xml | 7 ------- pom.xml | 17 ----------------- 17 files changed, 4 insertions(+), 95 deletions(-) rename ccm-core/{findbugs-exclude.xml => spotbugs-exclude.xml} (100%) diff --git a/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml b/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml index 3aa8c284b..22b4300ff 100644 --- a/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml +++ b/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml @@ -228,11 +228,6 @@ jacoco-maven-plugin 0.7.5.201505241946 - - org.codehaus.mojo - findbugs-maven-plugin - 3.0.1 - org.apache.maven.plugins diff --git a/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml b/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml index 349ee9d5d..78f0d8565 100644 --- a/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml +++ b/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml @@ -236,11 +236,6 @@ jacoco-maven-plugin 0.7.5.201505241946 - - org.codehaus.mojo - findbugs-maven-plugin - 3.0.1 - org.apache.maven.plugins diff --git a/ccm-cms-profile/pom.xml b/ccm-cms-profile/pom.xml index 5593e0d0c..68bd8de80 100644 --- a/ccm-cms-profile/pom.xml +++ b/ccm-cms-profile/pom.xml @@ -255,10 +255,6 @@ org.jacoco jacoco-maven-plugin - - org.codehaus.mojo - findbugs-maven-plugin - org.apache.maven.plugins diff --git a/ccm-cms-types-agenda/pom.xml b/ccm-cms-types-agenda/pom.xml index de964cfac..219f09afa 100644 --- a/ccm-cms-types-agenda/pom.xml +++ b/ccm-cms-types-agenda/pom.xml @@ -252,11 +252,7 @@ org.jacoco jacoco-maven-plugin - - org.codehaus.mojo - findbugs-maven-plugin - - + org.apache.maven.plugins maven-pmd-plugin diff --git a/ccm-cms-types-bookmark/pom.xml b/ccm-cms-types-bookmark/pom.xml index ec1ae219a..8b2864abf 100644 --- a/ccm-cms-types-bookmark/pom.xml +++ b/ccm-cms-types-bookmark/pom.xml @@ -251,10 +251,6 @@ org.jacoco jacoco-maven-plugin - - org.codehaus.mojo - findbugs-maven-plugin - org.apache.maven.plugins diff --git a/ccm-cms-types-decisiontree/pom.xml b/ccm-cms-types-decisiontree/pom.xml index 879d5de9e..9f6d92b69 100644 --- a/ccm-cms-types-decisiontree/pom.xml +++ b/ccm-cms-types-decisiontree/pom.xml @@ -252,10 +252,6 @@ org.jacoco jacoco-maven-plugin - - org.codehaus.mojo - findbugs-maven-plugin - org.apache.maven.plugins diff --git a/ccm-cms-types-externallink/pom.xml b/ccm-cms-types-externallink/pom.xml index b90f5da16..a8abc8176 100644 --- a/ccm-cms-types-externallink/pom.xml +++ b/ccm-cms-types-externallink/pom.xml @@ -251,10 +251,6 @@ org.jacoco jacoco-maven-plugin - - org.codehaus.mojo - findbugs-maven-plugin - org.apache.maven.plugins diff --git a/ccm-cms-types-faqitem/pom.xml b/ccm-cms-types-faqitem/pom.xml index 9ee819fe0..e00e7566d 100644 --- a/ccm-cms-types-faqitem/pom.xml +++ b/ccm-cms-types-faqitem/pom.xml @@ -251,10 +251,6 @@ org.jacoco jacoco-maven-plugin - - org.codehaus.mojo - findbugs-maven-plugin - org.apache.maven.plugins diff --git a/ccm-cms-types-glossaryitem/pom.xml b/ccm-cms-types-glossaryitem/pom.xml index 70800ed1c..b03b61df9 100644 --- a/ccm-cms-types-glossaryitem/pom.xml +++ b/ccm-cms-types-glossaryitem/pom.xml @@ -251,11 +251,7 @@ org.jacoco jacoco-maven-plugin - - org.codehaus.mojo - findbugs-maven-plugin - - + org.apache.maven.plugins maven-pmd-plugin diff --git a/ccm-cms-types-minutes/pom.xml b/ccm-cms-types-minutes/pom.xml index 0584016e9..38113079b 100644 --- a/ccm-cms-types-minutes/pom.xml +++ b/ccm-cms-types-minutes/pom.xml @@ -252,10 +252,6 @@ org.jacoco jacoco-maven-plugin - - org.codehaus.mojo - findbugs-maven-plugin - org.apache.maven.plugins diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml index 9ebefea4d..dd99ce800 100644 --- a/ccm-cms/pom.xml +++ b/ccm-cms/pom.xml @@ -294,16 +294,9 @@ jacoco-maven-plugin - - org.codehaus.mojo - findbugs-maven-plugin - com.github.spotbugs spotbugs-maven-plugin - diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index 8c09637e8..4832d8742 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -414,19 +414,12 @@ false - - - org.codehaus.mojo - findbugs-maven-plugin - - findbugs-exclude.xml - - + com.github.spotbugs spotbugs-maven-plugin - findbugs-exclude.xml + spotbugs-exclude.xml diff --git a/ccm-core/findbugs-exclude.xml b/ccm-core/spotbugs-exclude.xml similarity index 100% rename from ccm-core/findbugs-exclude.xml rename to ccm-core/spotbugs-exclude.xml diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml index de138394d..9be30402a 100644 --- a/ccm-docrepo/pom.xml +++ b/ccm-docrepo/pom.xml @@ -235,10 +235,6 @@ org.jacoco jacoco-maven-plugin - - org.codehaus.mojo - findbugs-maven-plugin - org.apache.maven.plugins maven-pmd-plugin diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml index 317ac9b3d..2b41dd67f 100644 --- a/ccm-shortcuts/pom.xml +++ b/ccm-shortcuts/pom.xml @@ -271,16 +271,9 @@ jacoco-maven-plugin - - org.codehaus.mojo - findbugs-maven-plugin - com.github.spotbugs spotbugs-maven-plugin - diff --git a/ccm-xafilesystemadapter/pom.xml b/ccm-xafilesystemadapter/pom.xml index bf64f6b4c..63499272a 100644 --- a/ccm-xafilesystemadapter/pom.xml +++ b/ccm-xafilesystemadapter/pom.xml @@ -157,13 +157,6 @@ org.jacoco jacoco-maven-plugin - - org.codehaus.mojo - findbugs-maven-plugin - - org.apache.maven.plugins maven-pmd-plugin diff --git a/pom.xml b/pom.xml index 1070773f1..5962be573 100644 --- a/pom.xml +++ b/pom.xml @@ -304,23 +304,6 @@ build-helper-maven-plugin 3.0.0 - - org.codehaus.mojo - findbugs-maven-plugin - 3.0.5 - - true - true - - - - package - - findbugs - - - - org.codehaus.mojo versions-maven-plugin From c75346bbc98d0ba3ae27bff225a854a9ab9bd46a Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sun, 12 Jul 2020 10:22:26 +0200 Subject: [PATCH 65/92] Profile for starting Wildfly prior to integration tests --- ccm-bundle-devel-wildfly/pom.xml | 5 -- ccm-core/pom.xml | 118 +++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 5 deletions(-) diff --git a/ccm-bundle-devel-wildfly/pom.xml b/ccm-bundle-devel-wildfly/pom.xml index 9d770cbe7..e48cc9fa4 100644 --- a/ccm-bundle-devel-wildfly/pom.xml +++ b/ccm-bundle-devel-wildfly/pom.xml @@ -253,11 +253,6 @@ setup-runtime - org.postgresql diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index 8c09637e8..85083180e 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -936,6 +936,124 @@ + + + test-with-wildfly + + + org.wildfly.arquillian + wildfly-arquillian-container-remote + test + + + net.sf.saxon + Saxon-HE + + + + + + + src/test/resources + + + src/test/resources-wildfly-remote-h2-mem + + + ${project.build.directory}/generated-resources + + + + + + + de.jpdigital + hibernate53-ddl-maven-plugin + + + h2 + postgresql9 + + + org.libreccm + + true + + + + + gen-ddl + + process-classes + + + + + org.apache.maven.plugins + maven-surefire-plugin + + always + 999 + true + + org.jboss.logmanager.LogManager + + false + + org.libreccm.tests.categories.UnitTest, + org.libreccm.tests.categories.IntegrationTest + + false + + + + org.wildfly.plugins + wildfly-maven-plugin + + false + + + + start-test-env + + start + + pre-integration-test + + System.out + + + + prepare-test-env + + add-resource + + pre-integration-test + +
subsystem=datasources,data-source=ccm-core-testdb-h2-mem
+ true + + + + + jdbc:h2:mem:ccm-core-testdb + jndi-name="java:/comp/env/jdbc/org/libreccm/ccm-core/h2-mem + true + sa + sa + false + h2 + + + + + + + + + + + wildfly-remote-h2-mem From eb4ecf8b1a48dc7dab2e723ec3a9f3f1851610a0 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Mon, 13 Jul 2020 21:12:45 +0200 Subject: [PATCH 66/92] Started migration of integration tests to maven-failsafe-plugin --- ccm-core/pom.xml | 24 ++- .../categorization/CategoryTreeModelLite.java | 1 - .../kernel/security/SecurityConfigTest.java | 154 ------------------ ...anagerTest.java => CategoryManagerIT.java} | 8 +- ...oryTest.java => CategoryRepositoryIT.java} | 9 +- ...rTest.java => ConfigurationManagerIT.java} | 9 +- ...ryTest.java => CcmObjectRepositoryIT.java} | 10 +- ...roupImportTest.java => GroupImportIT.java} | 10 +- ...Test.java => GroupMembershipImportIT.java} | 8 +- ...{UserImportTest.java => UserImportIT.java} | 8 +- pom.xml | 5 + 11 files changed, 39 insertions(+), 207 deletions(-) delete mode 100644 ccm-core/src/test/java/com/arsdigita/kernel/security/SecurityConfigTest.java rename ccm-core/src/test/java/org/libreccm/categorization/{CategoryManagerTest.java => CategoryManagerIT.java} (98%) rename ccm-core/src/test/java/org/libreccm/categorization/{CategoryRepositoryTest.java => CategoryRepositoryIT.java} (97%) rename ccm-core/src/test/java/org/libreccm/configuration/{ConfigurationManagerTest.java => ConfigurationManagerIT.java} (96%) rename ccm-core/src/test/java/org/libreccm/core/{CcmObjectRepositoryTest.java => CcmObjectRepositoryIT.java} (97%) rename ccm-core/src/test/java/org/libreccm/imexport/{GroupImportTest.java => GroupImportIT.java} (97%) rename ccm-core/src/test/java/org/libreccm/imexport/{GroupMembershipImportTest.java => GroupMembershipImportIT.java} (97%) rename ccm-core/src/test/java/org/libreccm/imexport/{UserImportTest.java => UserImportIT.java} (97%) diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index 85083180e..b23d24c57 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -990,7 +990,15 @@ org.apache.maven.plugins - maven-surefire-plugin + maven-failsafe-plugin + + + + integration-test + verify + + + always 999 @@ -999,10 +1007,6 @@ org.jboss.logmanager.LogManager false - - org.libreccm.tests.categories.UnitTest, - org.libreccm.tests.categories.IntegrationTest - false @@ -1033,11 +1037,10 @@
subsystem=datasources,data-source=ccm-core-testdb-h2-mem
true - jdbc:h2:mem:ccm-core-testdb - jndi-name="java:/comp/env/jdbc/org/libreccm/ccm-core/h2-mem + java:/comp/env/jdbc/org/libreccm/ccm-core/h2-mem true sa sa @@ -1048,6 +1051,13 @@ + + shutdown-test-env + + shutdown + + post-integration-test + diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryTreeModelLite.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryTreeModelLite.java index 2b18331ef..eac08056f 100755 --- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryTreeModelLite.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryTreeModelLite.java @@ -25,7 +25,6 @@ import com.arsdigita.bebop.tree.TreeNode; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.libreccm.cdi.utils.CdiUtil; -import org.libreccm.l10n.GlobalizationHelper; import java.util.Iterator; import java.util.Objects; diff --git a/ccm-core/src/test/java/com/arsdigita/kernel/security/SecurityConfigTest.java b/ccm-core/src/test/java/com/arsdigita/kernel/security/SecurityConfigTest.java deleted file mode 100644 index 4092ef135..000000000 --- a/ccm-core/src/test/java/com/arsdigita/kernel/security/SecurityConfigTest.java +++ /dev/null @@ -1,154 +0,0 @@ -/* - * Copyright (C) 2015 LibreCCM Foundation. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA - */ -package com.arsdigita.kernel.security; - -import com.arsdigita.util.JavaPropertyReader; -import com.arsdigita.util.parameter.AbstractParameter; -import com.arsdigita.web.CCMApplicationContextListener; -import com.arsdigita.xml.XML; -import com.arsdigita.xml.formatters.DateFormatter; - -import static org.hamcrest.Matchers.*; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.After; -import org.junit.AfterClass; - -import static org.junit.Assert.*; - -import static org.libreccm.testutils.DependenciesHelpers.*; - -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.libreccm.categorization.Categorization; -import org.libreccm.core.CcmObject; -import org.libreccm.jpa.EntityManagerProducer; -import org.libreccm.jpa.utils.UriConverter; -import org.libreccm.l10n.LocalizedString; -import org.libreccm.security.PermissionChecker; -import org.libreccm.tests.categories.IntegrationTest; -import org.libreccm.web.ApplicationRepository; -import org.libreccm.workflow.Workflow; - -import java.util.List; - -/** - * - * @author Jens Pelzetter - */ -@RunWith(Arquillian.class) -//@Category(IntegrationTest.class) -public class SecurityConfigTest { - - public SecurityConfigTest() { - - } - - @BeforeClass - public static void setUpClass() { - } - - @AfterClass - public static void tearDownClass() { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - - @Deployment - public static WebArchive createDeployment() { - return ShrinkWrap - .create(WebArchive.class, - "LibreCCM-com.arsdigita.kernel.security.SecurityConfigTest.war") - .addPackage(CcmObject.class.getPackage()) - .addPackage(Categorization.class.getPackage()) - .addPackage(PermissionChecker.class.getPackage()) - .addPackage(LocalizedString.class.getPackage()) - .addPackage(Workflow.class.getPackage()) - .addPackage(UriConverter.class.getPackage()) - .addPackage(ApplicationRepository.class.getPackage()) - .addPackage(EntityManagerProducer.class.getPackage()) - .addPackage(SecurityConfig.class.getPackage()) - .addPackage(AbstractParameter.class.getPackage()) - .addPackage(JavaPropertyReader.class.getPackage()) - .addPackage(CCMApplicationContextListener.class.getPackage()) - .addPackage(XML.class.getPackage()) - .addPackage(DateFormatter.class.getPackage()) - .addPackage(IntegrationTest.class.getPackage()) - .addAsLibraries(getModuleDependencies()) - .addAsResource( - "configs/com/arsdigita/kernel/security/SecurityConfigTest/ccm-core.config", - "ccm-core.config") - .addAsWebInfResource( - "configs/com/arsdigita/kernel/security/SecurityConfigTest/registry.properties", - "conf/registry/registry.properties") - .addAsWebInfResource( - "configs/com/arsdigita/kernel/security/SecurityConfigTest/kernel.properties", - "conf/registry/ccm-core/kernel.properties") - .addAsWebInfResource( - "configs/com/arsdigita/kernel/security/SecurityConfigTest/security.properties", - "conf/registry/ccm-core/security.properties") - .addAsResource( - "com/arsdigita/kernel/KernelConfig_parameter.properties", - "com/arsdigita/kernel/KernelConfig_parameter.properties") - .addAsResource( - "com/arsdigita/kernel/security/SecurityConfig_parameter.properties", - "com/arsdigita/kernel/security/SecurityConfig_parameter.properties") - .addAsResource("test-persistence.xml", - "META-INF/persistence.xml") - .addAsWebInfResource("test-web.xml", "WEB-INF/web.xml") - .addAsResource("configs/shiro.ini", "shiro.ini") - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); - } - - @Test - public void verifySecurityConfig() { - final SecurityConfig securityConfig = SecurityConfig.getConfig(); - - final List excludedExtensions = securityConfig - .getExcludedExtensions(); - assertThat(excludedExtensions.size(), is(4)); - assertThat(excludedExtensions.get(0), is(equalTo(".jpg"))); - assertThat(excludedExtensions.get(1), is(equalTo(".gif"))); - assertThat(excludedExtensions.get(2), is(equalTo(".png"))); - assertThat(excludedExtensions.get(3), is(equalTo(".pdf"))); - - assertThat(securityConfig.isAutoRegistrationEnabled(), is(false)); - - assertThat(securityConfig.isPasswordRecoveryEnabled(), is(true)); - - assertThat(securityConfig.getHashAlgorithm(), is(equalTo("SHA-512"))); - - assertThat(securityConfig.getSaltLength(), is(256)); - - assertThat(securityConfig.getHashIterations(), is(50000)); - } - -} diff --git a/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java b/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerIT.java similarity index 98% rename from ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java rename to ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerIT.java index a2521c6d5..4a3d68c22 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerIT.java @@ -42,7 +42,6 @@ import org.junit.runner.RunWith; import org.libreccm.core.CcmObject; import org.libreccm.core.CcmObjectRepository; import org.libreccm.security.Shiro; -import org.libreccm.tests.categories.IntegrationTest; import java.util.List; import java.util.Map; @@ -66,7 +65,6 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; * * @author Jens Pelzetter */ -@org.junit.experimental.categories.Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) @@ -75,7 +73,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class CategoryManagerTest { +public class CategoryManagerIT { @Inject private CategoryRepository categoryRepo; @@ -101,7 +99,7 @@ public class CategoryManagerTest { @PersistenceContext(name = "LibreCCM") private EntityManager entityManager; - public CategoryManagerTest() { + public CategoryManagerIT() { } @BeforeClass @@ -139,8 +137,6 @@ public class CategoryManagerTest { .getPackage()) .addPackage(org.libreccm.testutils.EqualsVerifier.class .getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) diff --git a/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryIT.java similarity index 97% rename from ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java rename to ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryIT.java index 88e0d38c7..037dd89a5 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryIT.java @@ -45,7 +45,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.libreccm.security.Shiro; -import org.libreccm.tests.categories.IntegrationTest; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; @@ -55,13 +54,13 @@ import static org.libreccm.testutils.DependenciesHelpers.*; import org.jboss.arquillian.persistence.CleanupUsingScript; import java.util.Optional; + import org.jboss.arquillian.persistence.TestExecutionPhase; /** * * @author Jens Pelzetter */ -@org.junit.experimental.categories.Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) @@ -70,7 +69,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class CategoryRepositoryTest { +public class CategoryRepositoryIT { @Inject private CategoryRepository categoryRepo; @@ -87,7 +86,7 @@ public class CategoryRepositoryTest { @PersistenceContext(name = "LibreCCM") private EntityManager entityManager; - public CategoryRepositoryTest() { + public CategoryRepositoryIT() { } @BeforeClass @@ -125,8 +124,6 @@ public class CategoryRepositoryTest { .getPackage()) .addPackage(org.libreccm.testutils.EqualsVerifier.class .getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) diff --git a/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java b/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerIT.java similarity index 96% rename from ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java rename to ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerIT.java index ce623b11a..03aa83484 100644 --- a/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerIT.java @@ -40,10 +40,8 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.libreccm.security.Shiro; -import org.libreccm.tests.categories.IntegrationTest; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; @@ -58,7 +56,6 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) @@ -67,7 +64,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class ConfigurationManagerTest { +public class ConfigurationManagerIT { @Inject private ConfigurationManager configurationManager; @@ -75,7 +72,7 @@ public class ConfigurationManagerTest { @Inject private Shiro shiro; - public ConfigurationManagerTest() { + public ConfigurationManagerIT() { } @@ -115,8 +112,6 @@ public class ConfigurationManagerTest { .addPackage(org.libreccm.security.Permission.class.getPackage()) .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) .addPackage(org.libreccm.testutils.EqualsVerifier.class. getPackage()) .addClass(com.example.TestConfiguration.class) diff --git a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryIT.java similarity index 97% rename from ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java rename to ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryIT.java index 4a91e29f7..2517d05b8 100644 --- a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryIT.java @@ -38,9 +38,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.libreccm.tests.categories.IntegrationTest; import java.util.List; @@ -55,6 +53,7 @@ import static org.libreccm.testutils.DependenciesHelpers.*; import org.jboss.arquillian.persistence.CleanupUsingScript; import java.util.Optional; + import org.jboss.arquillian.persistence.TestExecutionPhase; /** @@ -63,7 +62,6 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) @@ -72,7 +70,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class CcmObjectRepositoryTest { +public class CcmObjectRepositoryIT { @Inject private CcmObjectRepository ccmObjectRepository; @@ -80,7 +78,7 @@ public class CcmObjectRepositoryTest { @PersistenceContext(name = "LibreCCM") private EntityManager entityManager; - public CcmObjectRepositoryTest() { + public CcmObjectRepositoryIT() { } @BeforeClass @@ -127,8 +125,6 @@ public class CcmObjectRepositoryTest { .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) .addPackage(org.libreccm.testutils.EqualsVerifier.class. getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) .addPackage(com.arsdigita.kernel.security.SecurityConfig.class diff --git a/ccm-core/src/test/java/org/libreccm/imexport/GroupImportTest.java b/ccm-core/src/test/java/org/libreccm/imexport/GroupImportIT.java similarity index 97% rename from ccm-core/src/test/java/org/libreccm/imexport/GroupImportTest.java rename to ccm-core/src/test/java/org/libreccm/imexport/GroupImportIT.java index bfdaaa20c..478f19318 100644 --- a/ccm-core/src/test/java/org/libreccm/imexport/GroupImportTest.java +++ b/ccm-core/src/test/java/org/libreccm/imexport/GroupImportIT.java @@ -44,7 +44,6 @@ import org.libreccm.configuration.ConfigurationManager; import org.libreccm.core.UnexpectedErrorException; import org.libreccm.files.CcmFilesConfiguration; import org.libreccm.security.Shiro; -import org.libreccm.tests.categories.IntegrationTest; import java.io.FileOutputStream; import java.io.IOException; @@ -68,7 +67,6 @@ import static org.junit.Assert.*; * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) @@ -77,7 +75,7 @@ import static org.junit.Assert.*; "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class GroupImportTest { +public class GroupImportIT { private static final String IMPORT_MANIFEST_SOURCE = "/imports" + "/org.libreccm.imexport.GroupImportTest" @@ -108,7 +106,7 @@ public class GroupImportTest { @Inject private Shiro shiro; - public GroupImportTest() { + public GroupImportIT() { } @@ -135,7 +133,7 @@ public class GroupImportTest { if (Files.exists(ccmTestsDirPath)) { Files.walkFileTree(ccmTestsDirPath, - new GroupImportTest.DeleteDirectoryVisitor()); + new GroupImportIT.DeleteDirectoryVisitor()); } Files.createDirectory(ccmTestsDirPath); @@ -229,8 +227,6 @@ public class GroupImportTest { .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) .addPackage(org.libreccm.testutils.EqualsVerifier.class .getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) .addClass(com.arsdigita.kernel.security.SecurityConfig.class) .addClass(com.arsdigita.kernel.KernelConfig.class) .addAsLibraries(getModuleDependencies()) diff --git a/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportTest.java b/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportIT.java similarity index 97% rename from ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportTest.java rename to ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportIT.java index 50da38183..2698e374b 100644 --- a/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportTest.java +++ b/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportIT.java @@ -44,7 +44,6 @@ import org.libreccm.configuration.ConfigurationManager; import org.libreccm.core.UnexpectedErrorException; import org.libreccm.files.CcmFilesConfiguration; import org.libreccm.security.Shiro; -import org.libreccm.tests.categories.IntegrationTest; import java.io.FileOutputStream; import java.io.IOException; @@ -68,7 +67,6 @@ import static org.junit.Assert.*; * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) @@ -77,7 +75,7 @@ import static org.junit.Assert.*; "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class GroupMembershipImportTest { +public class GroupMembershipImportIT { private static final String IMPORT_MANIFEST_SOURCE = "/imports" + "/org.libreccm.imexport.GroupMembershipImportTest" @@ -109,7 +107,7 @@ public class GroupMembershipImportTest { @Inject private Shiro shiro; - public GroupMembershipImportTest() { + public GroupMembershipImportIT() { } @@ -233,8 +231,6 @@ public class GroupMembershipImportTest { .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) .addPackage(org.libreccm.testutils.EqualsVerifier.class .getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) .addClass(com.arsdigita.kernel.security.SecurityConfig.class) .addClass(com.arsdigita.kernel.KernelConfig.class) .addAsLibraries(getModuleDependencies()) diff --git a/ccm-core/src/test/java/org/libreccm/imexport/UserImportTest.java b/ccm-core/src/test/java/org/libreccm/imexport/UserImportIT.java similarity index 97% rename from ccm-core/src/test/java/org/libreccm/imexport/UserImportTest.java rename to ccm-core/src/test/java/org/libreccm/imexport/UserImportIT.java index 0d6f828a8..692066f08 100644 --- a/ccm-core/src/test/java/org/libreccm/imexport/UserImportTest.java +++ b/ccm-core/src/test/java/org/libreccm/imexport/UserImportIT.java @@ -44,7 +44,6 @@ import org.libreccm.configuration.ConfigurationManager; import org.libreccm.core.UnexpectedErrorException; import org.libreccm.files.CcmFilesConfiguration; import org.libreccm.security.Shiro; -import org.libreccm.tests.categories.IntegrationTest; import java.io.FileOutputStream; import java.io.IOException; @@ -68,7 +67,6 @@ import static org.junit.Assert.*; * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) @@ -77,7 +75,7 @@ import static org.junit.Assert.*; "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class UserImportTest { +public class UserImportIT { private static final String IMPORT_MANIFEST_SOURCE = "/imports" + "/org.libreccm.imexport.UserImportTest" @@ -108,7 +106,7 @@ public class UserImportTest { @Inject private Shiro shiro; - public UserImportTest() { + public UserImportIT() { } @@ -228,8 +226,6 @@ public class UserImportTest { .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) .addPackage(org.libreccm.testutils.EqualsVerifier.class .getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) .addClass(com.arsdigita.kernel.security.SecurityConfig.class) .addClass(com.arsdigita.kernel.KernelConfig.class) .addAsLibraries(getModuleDependencies()) diff --git a/pom.xml b/pom.xml index b4c0c7429..d051b2c04 100644 --- a/pom.xml +++ b/pom.xml @@ -242,6 +242,11 @@ maven-release-plugin 2.5.3 + + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0-M5 + org.apache.maven.plugins maven-surefire-plugin From a69c9ab0b8dff16f8ee306e85fab4471439b0649 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Tue, 14 Jul 2020 22:04:22 +0200 Subject: [PATCH 67/92] Migrated all integration tests in ccm-core to run with the Maven Failsafe Plugin --- .../java/org/libreccm/files/CcmFiles.java | 4 +- .../categorization/CategoryManagerIT.java | 33 +--- .../categorization/CategoryRepositoryIT.java | 33 +--- .../configuration/ConfigurationManagerIT.java | 41 ++--- .../libreccm/core/CcmObjectRepositoryIT.java | 46 ++---- .../org/libreccm/imexport/GroupImportIT.java | 22 +-- .../imexport/GroupMembershipImportIT.java | 22 +-- .../org/libreccm/imexport/UserImportIT.java | 22 +-- ...erTest.java => ConfigurationLoaderIT.java} | 21 +-- ...java => DependencyTreeManagerCycleIT.java} | 34 +--- ...Test.java => DependencyTreeManagerIT.java} | 35 +--- .../portation/CoreDataImportTest.java.off | 5 - ...t.java => AuthorizationInterceptorIT.java} | 43 +---- ...nagerTest.java => ChallengeManagerIT.java} | 38 +---- ...upManagerTest.java => GroupManagerIT.java} | 32 +--- ...sitoryTest.java => GroupRepositoryIT.java} | 27 +-- ...gerTest.java => OneTimeAuthManagerIT.java} | 95 ++++------- ...sitoryTest.java => PartyRepositoryIT.java} | 38 +---- ...ckerTest.java => PermissionCheckerIT.java} | 155 ++++++++---------- ...agerTest.java => PermissionManagerIT.java} | 33 +--- ...oleManagerTest.java => RoleManagerIT.java} | 35 +--- ...ositoryTest.java => RoleRepositoryIT.java} | 26 +-- ...tionTest.java => SecuredCollectionIT.java} | 39 ++--- ...eratorTest.java => SecuredIteratorIT.java} | 36 +--- .../security/{ShiroTest.java => ShiroIT.java} | 9 +- ...serManagerTest.java => UserManagerIT.java} | 41 +---- ...ositoryTest.java => UserRepositoryIT.java} | 44 ++--- .../security/authorization/LabBean.java | 4 +- 28 files changed, 236 insertions(+), 777 deletions(-) rename ccm-core/src/test/java/org/libreccm/modules/{ConfigurationLoaderTest.java => ConfigurationLoaderIT.java} (79%) rename ccm-core/src/test/java/org/libreccm/modules/{DependencyTreeManagerCycleTest.java => DependencyTreeManagerCycleIT.java} (72%) rename ccm-core/src/test/java/org/libreccm/modules/{DependencyTreeManagerTest.java => DependencyTreeManagerIT.java} (74%) rename ccm-core/src/test/java/org/libreccm/security/{AuthorizationInterceptorTest.java => AuthorizationInterceptorIT.java} (75%) rename ccm-core/src/test/java/org/libreccm/security/{ChallengeManagerTest.java => ChallengeManagerIT.java} (89%) rename ccm-core/src/test/java/org/libreccm/security/{GroupManagerTest.java => GroupManagerIT.java} (84%) rename ccm-core/src/test/java/org/libreccm/security/{GroupRepositoryTest.java => GroupRepositoryIT.java} (86%) rename ccm-core/src/test/java/org/libreccm/security/{OneTimeAuthManagerTest.java => OneTimeAuthManagerIT.java} (80%) rename ccm-core/src/test/java/org/libreccm/security/{PartyRepositoryTest.java => PartyRepositoryIT.java} (85%) rename ccm-core/src/test/java/org/libreccm/security/{PermissionCheckerTest.java => PermissionCheckerIT.java} (87%) rename ccm-core/src/test/java/org/libreccm/security/{PermissionManagerTest.java => PermissionManagerIT.java} (94%) rename ccm-core/src/test/java/org/libreccm/security/{RoleManagerTest.java => RoleManagerIT.java} (83%) rename ccm-core/src/test/java/org/libreccm/security/{RoleRepositoryTest.java => RoleRepositoryIT.java} (90%) rename ccm-core/src/test/java/org/libreccm/security/{SecuredCollectionTest.java => SecuredCollectionIT.java} (92%) rename ccm-core/src/test/java/org/libreccm/security/{SecuredIteratorTest.java => SecuredIteratorIT.java} (87%) rename ccm-core/src/test/java/org/libreccm/security/{ShiroTest.java => ShiroIT.java} (97%) rename ccm-core/src/test/java/org/libreccm/security/{UserManagerTest.java => UserManagerIT.java} (80%) rename ccm-core/src/test/java/org/libreccm/security/{UserRepositoryTest.java => UserRepositoryIT.java} (87%) diff --git a/ccm-core/src/main/java/org/libreccm/files/CcmFiles.java b/ccm-core/src/main/java/org/libreccm/files/CcmFiles.java index b2a71a868..33a130516 100644 --- a/ccm-core/src/main/java/org/libreccm/files/CcmFiles.java +++ b/ccm-core/src/main/java/org/libreccm/files/CcmFiles.java @@ -24,8 +24,8 @@ import org.libreccm.configuration.ConfigurationManager; import org.libreccm.core.UnexpectedErrorException; import javax.enterprise.inject.Instance; -import javax.faces.bean.RequestScoped; import javax.inject.Inject; + import java.io.InputStream; import java.io.OutputStream; import java.io.Reader; @@ -33,6 +33,8 @@ import java.io.Writer; import java.util.ArrayList; import java.util.List; +import javax.enterprise.context.RequestScoped; + /** * This class provides access to the (local) file system. If available an * implementation of the {@link FileSystemAdapter} interface is used. The diff --git a/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerIT.java b/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerIT.java index 4a3d68c22..ac8590c72 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerIT.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerIT.java @@ -68,8 +68,8 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"001_create_schema.sql", - "002_create_ccm_core_tables.sql", +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) @@ -122,27 +122,9 @@ public class CategoryManagerIT { public static WebArchive createDeployment() { return ShrinkWrap .create(WebArchive.class, - "LibreCCM-org.libreccm.categorization.CategoryManagerTest.war") - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.configuration.Configuration.class - .getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) - .addPackage(org.libreccm.security.PermissionChecker.class - .getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class - .getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addClass(org.libreccm.imexport.Exportable.class) - .addClass(com.arsdigita.kernel.KernelConfig.class) - .addClass(com.arsdigita.kernel.security.SecurityConfig.class) + "LibreCCM-org.libreccm.categorization.CategoryManagerTest.war" + ) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", @@ -393,8 +375,7 @@ public class CategoryManagerIT { @UsingDataSet("datasets/org/libreccm/categorization/CategoryManagerTest" + "/data.yml") @ShouldMatchDataSet( - excludeColumns = { - }, + excludeColumns = {}, value = "datasets/org/libreccm/categorization/CategoryManagerTest" + "/after-remove-obj-from-category.yml" ) @@ -747,7 +728,7 @@ public class CategoryManagerIT { /** * Tries to retrieve the index object from several categories and verifies * that the expected object is returned by null null null null null null - * null null {@link CategoryManager#getIndexObject(org.libreccm.categorization.Category). + * null null null null null {@link CategoryManager#getIndexObject(org.libreccm.categorization.Category). */ @Test @UsingDataSet( diff --git a/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryIT.java b/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryIT.java index 037dd89a5..5b54c866c 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryIT.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryIT.java @@ -64,8 +64,8 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"001_create_schema.sql", - "002_create_ccm_core_tables.sql", +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) @@ -108,28 +108,11 @@ public class CategoryRepositoryIT { @Deployment public static WebArchive createDeployment() { return ShrinkWrap - .create(WebArchive.class, - "LibreCCM-org.libreccm.categorization.CategoryRepositoryTest.war") - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.configuration.Configuration.class - .getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) - .addPackage(org.libreccm.security.PermissionChecker.class - .getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class - .getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addClass(com.arsdigita.kernel.KernelConfig.class) - .addClass(com.arsdigita.kernel.security.SecurityConfig.class) - .addClass(org.libreccm.imexport.Exportable.class) + .create( + WebArchive.class, + "LibreCCM-org.libreccm.categorization.CategoryRepositoryTest.war" + ) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", @@ -247,7 +230,7 @@ public class CategoryRepositoryIT { final Domain domain = domainRepo.findByDomainKey("test").get(); final Optional doesNotExist = categoryRepo.findByPath(domain, - "/does/not/exist"); + "/does/not/exist"); assertThat(doesNotExist.isPresent(), is(false)); } diff --git a/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerIT.java b/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerIT.java index 03aa83484..f070be635 100644 --- a/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerIT.java +++ b/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerIT.java @@ -59,8 +59,8 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"001_create_schema.sql", - "002_create_ccm_core_tables.sql", +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) @@ -95,38 +95,21 @@ public class ConfigurationManagerIT { @Deployment public static WebArchive createDeployment() { return ShrinkWrap - .create(WebArchive.class, - "LibreCCM-org.libreccm.configuration." - + "ConfigurationManagerTest.war") - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.configuration.Configuration.class - .getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class - .getPackage()) - .addPackage(org.libreccm.security.Permission.class.getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class. - getPackage()) - .addClass(com.example.TestConfiguration.class) - .addClass(com.arsdigita.kernel.KernelConfig.class) - .addClass(com.arsdigita.kernel.security.SecurityConfig.class) - .addClass(org.libreccm.imexport.Exportable.class) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .create( + WebArchive.class, + "LibreCCM-org.libreccm.configuration.ConfigurationManagerTest.war" + ) + .addPackages(true, "com.arsdigita", "org.libreccm", "com.example") .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") - .addAsResource("test-persistence.xml", - "META-INF/persistence.xml") + .addAsResource( + "test-persistence.xml", "META-INF/persistence.xml" + ) .addAsResource( "configs/org/libreccm/configuration/ConfigurationManagerTest/" + "log4j2.xml", - "log4j2.xml") + "log4j2.xml" + ) .addAsWebInfResource("test-web.xml", "web.xml") .addAsWebInfResource("META-INF/beans.xml", "beans.xml"); } diff --git a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryIT.java b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryIT.java index 2517d05b8..ae6682fd3 100644 --- a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryIT.java +++ b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryIT.java @@ -65,8 +65,8 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"001_create_schema.sql", - "002_create_ccm_core_tables.sql", +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) @@ -100,38 +100,15 @@ public class CcmObjectRepositoryIT { @Deployment public static WebArchive createDeployment() { return ShrinkWrap - .create(WebArchive.class, - "LibreCCM-org.libreccm.core.CcmObjectRepositoryTest.war") - .addPackage(org.libreccm.auditing.CcmRevision.class.getPackage()) - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.configuration.Configuration.class. - getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) - .addClass(org.libreccm.modules.CcmModule.class) - .addClass(org.libreccm.modules.ModuleEvent.class) - .addClass(org.libreccm.modules.InitEvent.class) - .addClass(org.libreccm.modules.InstallEvent.class) - .addClass(org.libreccm.modules.UnInstallEvent.class) - .addClass(org.libreccm.modules.ShutdownEvent.class) - .addClass(org.libreccm.imexport.Exportable.class) - .addPackage(org.libreccm.security.PermissionChecker.class - .getPackage()) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class. - getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(com.arsdigita.kernel.security.SecurityConfig.class - .getPackage()) + .create( + WebArchive.class, + "LibreCCM-org.libreccm.core.CcmObjectRepositoryTest.war" + ) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) - .addAsResource("test-persistence.xml", - "META-INF/persistence.xml") + .addAsResource( + "test-persistence.xml", "META-INF/persistence.xml" + ) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsWebInfResource("test-web.xml", "web.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml"); @@ -354,7 +331,8 @@ public class CcmObjectRepositoryIT { @Test(expected = NullPointerException.class) @ShouldThrowException(NullPointerException.class) @UsingDataSet("datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml") - @ShouldMatchDataSet("datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml") + @ShouldMatchDataSet( + "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml") @InSequence(700) public void deleteNullValue() { ccmObjectRepository.delete(null); diff --git a/ccm-core/src/test/java/org/libreccm/imexport/GroupImportIT.java b/ccm-core/src/test/java/org/libreccm/imexport/GroupImportIT.java index 478f19318..a9d2aed1f 100644 --- a/ccm-core/src/test/java/org/libreccm/imexport/GroupImportIT.java +++ b/ccm-core/src/test/java/org/libreccm/imexport/GroupImportIT.java @@ -38,7 +38,6 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.libreccm.configuration.ConfigurationManager; import org.libreccm.core.UnexpectedErrorException; @@ -209,26 +208,7 @@ public class GroupImportIT { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.imexport.GroupImportTest.war") - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.configuration.Configuration.class - .getPackage()) - .addPackage(org.libreccm.files.CcmFiles.class.getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) - .addPackage(org.libreccm.imexport.Exportable.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.security.Group.class.getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class - .getPackage()) - .addClass(com.arsdigita.kernel.security.SecurityConfig.class) - .addClass(com.arsdigita.kernel.KernelConfig.class) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("imports", "imports") diff --git a/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportIT.java b/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportIT.java index 2698e374b..fc1db7c1c 100644 --- a/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportIT.java +++ b/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportIT.java @@ -38,7 +38,6 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.libreccm.configuration.ConfigurationManager; import org.libreccm.core.UnexpectedErrorException; @@ -213,26 +212,7 @@ public class GroupMembershipImportIT { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.imexport.GroupImportTest.war") - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.configuration.Configuration.class - .getPackage()) - .addPackage(org.libreccm.files.CcmFiles.class.getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) - .addPackage(org.libreccm.imexport.Exportable.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.security.Group.class.getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class - .getPackage()) - .addClass(com.arsdigita.kernel.security.SecurityConfig.class) - .addClass(com.arsdigita.kernel.KernelConfig.class) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("imports", "imports") diff --git a/ccm-core/src/test/java/org/libreccm/imexport/UserImportIT.java b/ccm-core/src/test/java/org/libreccm/imexport/UserImportIT.java index 692066f08..fb9b352c8 100644 --- a/ccm-core/src/test/java/org/libreccm/imexport/UserImportIT.java +++ b/ccm-core/src/test/java/org/libreccm/imexport/UserImportIT.java @@ -38,7 +38,6 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.libreccm.configuration.ConfigurationManager; import org.libreccm.core.UnexpectedErrorException; @@ -208,26 +207,7 @@ public class UserImportIT { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.imexport.UserImportTest.war") - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.configuration.Configuration.class - .getPackage()) - .addPackage(org.libreccm.files.CcmFiles.class.getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) - .addPackage(org.libreccm.imexport.Exportable.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.security.User.class.getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class - .getPackage()) - .addClass(com.arsdigita.kernel.security.SecurityConfig.class) - .addClass(com.arsdigita.kernel.KernelConfig.class) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("imports", "imports") diff --git a/ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderTest.java b/ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderIT.java similarity index 79% rename from ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderTest.java rename to ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderIT.java index 488a5d3a0..f865f80b0 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderIT.java @@ -33,10 +33,8 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.libreccm.configuration.ExampleConfiguration; -import org.libreccm.tests.categories.IntegrationTest; import javax.inject.Inject; import javax.persistence.EntityManager; @@ -51,7 +49,6 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) @@ -60,12 +57,12 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class ConfigurationLoaderTest { +public class ConfigurationLoaderIT { @Inject private EntityManager entityManager; - public ConfigurationLoaderTest() { + public ConfigurationLoaderIT() { } @BeforeClass @@ -89,19 +86,7 @@ public class ConfigurationLoaderTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.modules.ConfigurationLoaderTest.war") - .addPackage(org.libreccm.configuration.Configuration.class - .getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) - .addClass(org.libreccm.modules.ConfigurationLoader.class) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class. - getPackage()) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleTest.java b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleIT.java similarity index 72% rename from ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleTest.java rename to ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleIT.java index 892a8778f..da544e68d 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleIT.java @@ -34,13 +34,11 @@ import static org.junit.Assert.*; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.libreccm.modules.dependencytree.test.cycle.TestModuleA; import org.libreccm.modules.dependencytree.test.cycle.TestModuleB; import org.libreccm.modules.dependencytree.test.cycle.TestModuleC; import org.libreccm.modules.dependencytree.test.cycle.TestModuleRoot; -import org.libreccm.tests.categories.IntegrationTest; import java.util.ArrayList; import java.util.List; @@ -51,13 +49,12 @@ import static org.libreccm.testutils.DependenciesHelpers.*; * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) -public class DependencyTreeManagerCycleTest { +public class DependencyTreeManagerCycleIT { private Iterable modules; - public DependencyTreeManagerCycleTest() { + public DependencyTreeManagerCycleIT() { } @BeforeClass @@ -87,32 +84,7 @@ public class DependencyTreeManagerCycleTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.modules.dependencytree.DependencyTreeManagerCycleTest.war") - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) - .addClass(org.libreccm.modules.DependencyTreeManager.class) - .addClass(org.libreccm.modules.DependencyException.class) - .addClass(org.libreccm.modules.IntegrationException.class) - .addClass(TreeNode.class) - .addClass(org.libreccm.modules.CcmModule.class) - .addClass(org.libreccm.modules.ModuleEvent.class) - .addClass(org.libreccm.modules.ModuleInfo.class) - .addClass(org.libreccm.modules.ModuleStatus.class) - .addClass(org.libreccm.modules.Module.class) - .addClass(org.libreccm.modules.RequiredModule.class) - .addClass(org.libreccm.modules.InitEvent.class) - .addClass(org.libreccm.modules.InstallEvent.class) - .addClass(org.libreccm.modules.ShutdownEvent.class) - .addClass(org.libreccm.modules.UnInstallEvent.class) - .addClass( - org.libreccm.modules.dependencytree.test.cycle.TestModuleRoot.class) - .addClass( - org.libreccm.modules.dependencytree.test.cycle.TestModuleA.class) - .addClass( - org.libreccm.modules.dependencytree.test.cycle.TestModuleB.class) - .addClass( - org.libreccm.modules.dependencytree.test.cycle.TestModuleC.class) - .addPackage(org.libreccm.pagemodel.PageModel.class.getPackage()) - .addClass(org.libreccm.web.ApplicationType.class) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource( diff --git a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerTest.java b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerIT.java similarity index 74% rename from ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerTest.java rename to ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerIT.java index 7bf0df080..291cd1349 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerIT.java @@ -38,9 +38,7 @@ import static org.junit.Assert.*; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.libreccm.tests.categories.IntegrationTest; import java.util.ArrayList; import java.util.List; @@ -51,13 +49,12 @@ import static org.libreccm.testutils.DependenciesHelpers.*; * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) -public class DependencyTreeManagerTest { +public class DependencyTreeManagerIT { private Iterable modules; - public DependencyTreeManagerTest() { + public DependencyTreeManagerIT() { } @BeforeClass @@ -100,33 +97,7 @@ public class DependencyTreeManagerTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.modules.dependencytree.DependencyTreeManagerTest.war") - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) - .addClass(org.libreccm.modules.DependencyTreeManager.class) - .addClass(org.libreccm.modules.DependencyException.class) - .addClass(org.libreccm.modules.IntegrationException.class) - .addClass(org.libreccm.modules.TreeNode.class) - .addClass(org.libreccm.modules.CcmModule.class) - .addClass(org.libreccm.modules.ModuleEvent.class) - .addClass(org.libreccm.modules.ModuleInfo.class) - .addClass(org.libreccm.modules.ModuleStatus.class) - .addClass(org.libreccm.modules.Module.class) - .addClass(org.libreccm.modules.RequiredModule.class) - .addClass(org.libreccm.modules.InitEvent.class) - .addClass(org.libreccm.modules.InstallEvent.class) - .addClass(org.libreccm.modules.ShutdownEvent.class) - .addClass(org.libreccm.modules.UnInstallEvent.class) - .addClass( - org.libreccm.modules.dependencytree.test.valid.TestModuleRoot.class) - .addClass( - org.libreccm.modules.dependencytree.test.valid.TestModuleA.class) - .addClass( - org.libreccm.modules.dependencytree.test.valid.TestModuleB.class) - .addClass( - org.libreccm.modules.dependencytree.test.valid.TestModuleC.class) -// .addClass(org.libreccm.portation.Portable.class) - .addPackage(org.libreccm.pagemodel.PageModel.class.getPackage()) - .addClass(org.libreccm.web.ApplicationType.class) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource( diff --git a/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java.off b/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java.off index 244008885..589e51ef1 100644 --- a/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java.off +++ b/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java.off @@ -36,9 +36,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.libreccm.tests.categories.IntegrationTest; import javax.inject.Inject; import java.io.IOException; @@ -63,7 +61,6 @@ import static org.libreccm.testutils.DependenciesHelpers.getModuleDependencies; * @author Tobias Osmers * @version created on 12/1/16 */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) @@ -170,8 +167,6 @@ public class CoreDataImportTest { .class.getPackage()) .addPackage(org.libreccm.web.CcmApplication .class.getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest - .class.getPackage()) .addPackage(org.libreccm.testutils.EqualsVerifier .class.getPackage()) .addAsLibraries(getModuleDependencies()) diff --git a/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java b/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorIT.java similarity index 75% rename from ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java rename to ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorIT.java index 184343c09..786791c01 100644 --- a/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorIT.java @@ -37,12 +37,10 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.libreccm.core.CcmObject; import org.libreccm.core.CcmObjectRepository; import org.libreccm.security.authorization.LabBean; -import org.libreccm.tests.categories.IntegrationTest; import javax.inject.Inject; @@ -58,16 +56,15 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"001_create_schema.sql", - "002_create_ccm_core_tables.sql", +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class AuthorizationInterceptorTest { +public class AuthorizationInterceptorIT { @Inject private Subject subject; @@ -78,7 +75,7 @@ public class AuthorizationInterceptorTest { @Inject private LabBean labBean; - public AuthorizationInterceptorTest() { + public AuthorizationInterceptorIT() { } @BeforeClass @@ -102,37 +99,7 @@ public class AuthorizationInterceptorTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.AuthorizationInterceptorTest.war") - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addPackage(org.libreccm.configuration.ConfigurationManager.class - .getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) - .addPackage(org.libreccm.security.User.class.getPackage()) - .addPackage(org.libreccm.security.authorization.LabBean.class - .getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class.getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(com.arsdigita.kernel.security.SecurityConfig.class - .getPackage()) - .addPackage(com.arsdigita.runtime.CCMResourceManager.class - .getPackage()) - .addPackage(com.arsdigita.web.CCMApplicationContextListener.class - .getPackage()) - .addPackage(com.arsdigita.xml.XML.class.getPackage()) - .addPackage(com.arsdigita.xml.formatters.DateTimeFormatter.class - .getPackage()) - .addClass(com.arsdigita.kernel.KernelConfig.class) - .addClass(com.arsdigita.util.UncheckedWrapperException.class) - .addClass(org.libreccm.imexport.Exportable.class) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/ChallengeManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/ChallengeManagerIT.java similarity index 89% rename from ccm-core/src/test/java/org/libreccm/security/ChallengeManagerTest.java rename to ccm-core/src/test/java/org/libreccm/security/ChallengeManagerIT.java index 54f4afb62..b4ba6659c 100644 --- a/ccm-core/src/test/java/org/libreccm/security/ChallengeManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/ChallengeManagerIT.java @@ -36,9 +36,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.libreccm.tests.categories.IntegrationTest; import javax.inject.Inject; import javax.servlet.ServletContext; @@ -56,7 +54,6 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) @@ -65,7 +62,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class ChallengeManagerTest { +public class ChallengeManagerIT { @Inject private ChallengeManager challengeManager; @@ -82,7 +79,7 @@ public class ChallengeManagerTest { @Inject private Shiro shiro; - public ChallengeManagerTest() { + public ChallengeManagerIT() { } @BeforeClass @@ -106,36 +103,7 @@ public class ChallengeManagerTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.ChallengeManagerTest.war") - .addClass(com.arsdigita.runtime.CCMResourceManager.class) - .addPackage(com.arsdigita.util.Assert.class.getPackage()) - .addClass(com.arsdigita.util.servlet.HttpHost.class) - .addPackage(com.arsdigita.web.URL.class.getPackage()) - .addPackage(org.libreccm.security.OneTimeAuthManager.class - .getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addPackage( - org.libreccm.configuration.ConfigurationManager.class - .getPackage()) - .addClass(com.arsdigita.kernel.KernelConfig.class) - .addClass(com.arsdigita.kernel.security.SecurityConfig.class) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class - .getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addClass(com.arsdigita.kernel.KernelConfig.class) - .addClass(com.arsdigita.kernel.security.SecurityConfig.class) - .addClass(org.libreccm.imexport.Exportable.class) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", diff --git a/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/GroupManagerIT.java similarity index 84% rename from ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java rename to ccm-core/src/test/java/org/libreccm/security/GroupManagerIT.java index 62380c7d2..56daa7db6 100644 --- a/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/GroupManagerIT.java @@ -39,9 +39,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.libreccm.tests.categories.IntegrationTest; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; @@ -55,7 +53,6 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) @@ -64,7 +61,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class GroupManagerTest { +public class GroupManagerIT { @Inject private GroupManager groupManager; @@ -78,7 +75,7 @@ public class GroupManagerTest { @Inject private Shiro shiro; - public GroupManagerTest() { + public GroupManagerIT() { } @BeforeClass @@ -102,30 +99,7 @@ public class GroupManagerTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.GroupManagerTest.war") - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage( - org.libreccm.configuration.ConfigurationManager.class - .getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()). - addPackage(org.libreccm.security.User.class.getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class - .getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(com.arsdigita.kernel.security.SecurityConfig.class - .getPackage()) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addClass(com.arsdigita.kernel.KernelConfig.class) - .addClass(com.arsdigita.kernel.security.SecurityConfig.class) - .addClass(org.libreccm.imexport.Exportable.class) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryIT.java similarity index 86% rename from ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java rename to ccm-core/src/test/java/org/libreccm/security/GroupRepositoryIT.java index ccf562388..bf3f1ab18 100644 --- a/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryIT.java @@ -50,18 +50,16 @@ import org.jboss.arquillian.persistence.CleanupUsingScript; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.libreccm.tests.categories.IntegrationTest; import java.util.Optional; + import org.jboss.arquillian.persistence.TestExecutionPhase; /** * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) @@ -70,7 +68,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class GroupRepositoryTest { +public class GroupRepositoryIT { private static final String ADMINS = "admins"; private static final String USERS = "users"; @@ -83,7 +81,7 @@ public class GroupRepositoryTest { @PersistenceContext private EntityManager entityManager; - public GroupRepositoryTest() { + public GroupRepositoryIT() { } @@ -108,24 +106,7 @@ public class GroupRepositoryTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.UserRepositoryTest.war") - .addPackage(org.libreccm.security.User.class.getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.configuration.ConfigurationManager.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class - .getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) - .addClass(org.libreccm.imexport.Exportable.class) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", diff --git a/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerIT.java similarity index 80% rename from ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java rename to ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerIT.java index cf26e9a4c..8350c4d5e 100644 --- a/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerIT.java @@ -44,9 +44,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.libreccm.tests.categories.IntegrationTest; import java.util.List; @@ -62,16 +60,15 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"001_create_schema.sql", - "002_create_ccm_core_tables.sql", +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class OneTimeAuthManagerTest { +public class OneTimeAuthManagerIT { @Inject private OneTimeAuthManager oneTimeAuthManager; @@ -82,7 +79,7 @@ public class OneTimeAuthManagerTest { @Inject private Shiro shiro; - public OneTimeAuthManagerTest() { + public OneTimeAuthManagerIT() { } @@ -107,29 +104,7 @@ public class OneTimeAuthManagerTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.OneTimeAuthManagerTest.war") - .addPackage(org.libreccm.security.OneTimeAuthManager.class - .getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.configuration.ConfigurationManager.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addClass(com.arsdigita.kernel.security.SecurityConfig.class) - .addPackage(org.libreccm.testutils.EqualsVerifier.class - .getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addClass(com.arsdigita.kernel.KernelConfig.class) - .addClass(com.arsdigita.kernel.security.SecurityConfig.class) - .addClass(org.libreccm.imexport.Exportable.class) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", @@ -214,9 +189,9 @@ public class OneTimeAuthManagerTest { final List result = shiro.getSystemUser().execute( () -> { - return oneTimeAuthManager.retrieveForUser( - jdoe, OneTimeAuthTokenPurpose.EMAIL_VERIFICATION); - }); + return oneTimeAuthManager.retrieveForUser( + jdoe, OneTimeAuthTokenPurpose.EMAIL_VERIFICATION); + }); assertThat(result, is(not(nullValue()))); assertThat(result, is(not(empty()))); @@ -237,9 +212,9 @@ public class OneTimeAuthManagerTest { final List result = shiro.getSystemUser().execute( () -> { - return oneTimeAuthManager.retrieveForUser( - mmuster, OneTimeAuthTokenPurpose.EMAIL_VERIFICATION); - }); + return oneTimeAuthManager.retrieveForUser( + mmuster, OneTimeAuthTokenPurpose.EMAIL_VERIFICATION); + }); assertThat(result, is(empty())); } @@ -284,11 +259,11 @@ public class OneTimeAuthManagerTest { shiro.getSystemUser().execute( () -> { - assertThat( - oneTimeAuthManager.validTokenExistsForUser( - user, OneTimeAuthTokenPurpose.EMAIL_VERIFICATION), - is(true)); - }); + assertThat( + oneTimeAuthManager.validTokenExistsForUser( + user, OneTimeAuthTokenPurpose.EMAIL_VERIFICATION), + is(true)); + }); } @Test @@ -300,11 +275,11 @@ public class OneTimeAuthManagerTest { shiro.getSystemUser().execute( () -> { - assertThat( - oneTimeAuthManager.validTokenExistsForUser( - user, OneTimeAuthTokenPurpose.EMAIL_VERIFICATION), - is(false)); - }); + assertThat( + oneTimeAuthManager.validTokenExistsForUser( + user, OneTimeAuthTokenPurpose.EMAIL_VERIFICATION), + is(false)); + }); } @Test(expected = IllegalArgumentException.class) @@ -346,15 +321,15 @@ public class OneTimeAuthManagerTest { final List result = shiro.getSystemUser().execute( () -> { - return oneTimeAuthManager.retrieveForUser( - jdoe, OneTimeAuthTokenPurpose.EMAIL_VERIFICATION); - }); + return oneTimeAuthManager.retrieveForUser( + jdoe, OneTimeAuthTokenPurpose.EMAIL_VERIFICATION); + }); assertThat(result, is(not(empty()))); shiro.getSystemUser().execute( () -> { - assertThat(oneTimeAuthManager.isValid(result.get(0)), - is(true)); - }); + assertThat(oneTimeAuthManager.isValid(result.get(0)), + is(true)); + }); } @Test @@ -366,9 +341,9 @@ public class OneTimeAuthManagerTest { final List result = shiro.getSystemUser().execute( () -> { - return oneTimeAuthManager.retrieveForUser( - jdoe, OneTimeAuthTokenPurpose.EMAIL_VERIFICATION); - }); + return oneTimeAuthManager.retrieveForUser( + jdoe, OneTimeAuthTokenPurpose.EMAIL_VERIFICATION); + }); assertThat(result, is(not(empty()))); final OneTimeAuthToken token = result.get(0); @@ -379,8 +354,8 @@ public class OneTimeAuthManagerTest { shiro.getSystemUser().execute( () -> { - assertThat(oneTimeAuthManager.isValid(token), is(false)); - }); + assertThat(oneTimeAuthManager.isValid(token), is(false)); + }); } @@ -410,9 +385,9 @@ public class OneTimeAuthManagerTest { final List result = shiro.getSystemUser().execute( () -> { - return oneTimeAuthManager.retrieveForUser( - jdoe, OneTimeAuthTokenPurpose.EMAIL_VERIFICATION); - }); + return oneTimeAuthManager.retrieveForUser( + jdoe, OneTimeAuthTokenPurpose.EMAIL_VERIFICATION); + }); assertThat(result, is(not(empty()))); shiro.getSystemUser().execute( diff --git a/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryIT.java similarity index 85% rename from ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java rename to ccm-core/src/test/java/org/libreccm/security/PartyRepositoryIT.java index 02792fdeb..0e8342419 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryIT.java @@ -36,10 +36,8 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.libreccm.core.EmailAddress; -import org.libreccm.tests.categories.IntegrationTest; import javax.inject.Inject; import javax.persistence.EntityManager; @@ -59,20 +57,22 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"001_create_schema.sql", - "002_create_ccm_core_tables.sql", +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class PartyRepositoryTest { +public class PartyRepositoryIT { private static final String MMUSTER = "mmuster"; + private static final String JDOE = "jdoe"; + private static final String ADMINS = "admins"; + private static final String MANAGERS = "managers"; @Inject @@ -84,7 +84,7 @@ public class PartyRepositoryTest { @PersistenceContext private EntityManager entityManager; - public PartyRepositoryTest() { + public PartyRepositoryIT() { } @BeforeClass @@ -108,29 +108,7 @@ public class PartyRepositoryTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.UserRepositoryTest.war") - .addPackage(org.libreccm.security.User.class.getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage( - org.libreccm.configuration.ConfigurationManager.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class - .getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class. - getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) - .addClass(com.arsdigita.kernel.security.SecurityConfig.class) - .addClass(com.arsdigita.kernel.KernelConfig.class) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addClass(org.libreccm.imexport.Exportable.class) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", diff --git a/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java b/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerIT.java similarity index 87% rename from ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java rename to ccm-core/src/test/java/org/libreccm/security/PermissionCheckerIT.java index 053162b8e..aea66f826 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerIT.java @@ -44,11 +44,9 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.libreccm.core.CcmObject; import org.libreccm.core.CcmObjectRepository; -import org.libreccm.tests.categories.IntegrationTest; import java.util.ArrayList; import java.util.List; @@ -65,74 +63,53 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"001_create_schema.sql", - "002_create_ccm_core_tables.sql", +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class PermissionCheckerTest { - +public class PermissionCheckerIT { + @Inject private Subject subject; - + @Inject private Shiro shiro; - + @Inject private PermissionChecker permissionChecker; - + @Inject private CcmObjectRepository objectRepository; - - public PermissionCheckerTest() { + + public PermissionCheckerIT() { } - + @BeforeClass public static void setUpClass() { } - + @AfterClass public static void tearDownClass() { } - + @Before public void setUp() { } - + @After public void tearDown() { } - + @Deployment public static WebArchive createDeployment() { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.PermissionCheckerTest.war") - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addPackage(org.libreccm.configuration.ConfigurationManager.class - .getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) - .addPackage(org.libreccm.security.User.class.getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class.getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(com.arsdigita.kernel.KernelConfig.class - .getPackage()) - .addPackage(com.arsdigita.kernel.security.SecurityConfig.class - .getPackage()) + .addPackages(true, "com.arsdigita", "org.libreccm") .addClass(org.libreccm.imexport.Exportable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", @@ -144,7 +121,7 @@ public class PermissionCheckerTest { .addAsWebInfResource("test-web.xml", "web.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(1100) @@ -153,12 +130,12 @@ public class PermissionCheckerTest { "foo123"); token.setRememberMe(true); subject.login(token); - + assertThat(permissionChecker.isPermitted("privilege1"), is(false)); assertThat(permissionChecker.isPermitted("privilege2"), is(false)); assertThat(permissionChecker.isPermitted("privilege3"), is(false)); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(1200) @@ -167,7 +144,7 @@ public class PermissionCheckerTest { assertThat(permissionChecker.isPermitted("privilege2"), is(false)); assertThat(permissionChecker.isPermitted("privilege3"), is(false)); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(1300) @@ -175,9 +152,9 @@ public class PermissionCheckerTest { final CcmObject object1 = objectRepository.findById(20001L).get(); final CcmObject object2 = objectRepository.findById(20002L).get(); final CcmObject object3 = objectRepository.findById(20003L).get(); - + shiro.getSystemUser().execute(new Callable() { - + @Override public Boolean call() { assertThat(permissionChecker.isPermitted("privilege1"), @@ -186,7 +163,7 @@ public class PermissionCheckerTest { is(true)); assertThat(permissionChecker.isPermitted("privilege3"), is(true)); - + assertThat(permissionChecker.isPermitted("privilege1", object2), is(true)); @@ -196,42 +173,42 @@ public class PermissionCheckerTest { assertThat(permissionChecker.isPermitted("privilege3", object3), is(true)); - + return false; } - + }); - + } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(1400) public void isPermittedObjectAuthenticatedUser() { final CcmObject object1 = objectRepository.findById(20001L).get(); final CcmObject object2 = objectRepository.findById(20002L).get(); - + final UsernamePasswordToken token = new UsernamePasswordToken("jdoe", "foo123"); token.setRememberMe(true); subject.login(token); - + assertThat(permissionChecker.isPermitted("privilege1", object1), is(false)); assertThat(permissionChecker.isPermitted("privilege2", object1), is(false)); assertThat(permissionChecker.isPermitted("privilege2", object2), is(true)); - + } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(1500) public void isPermittedObjectUnAuthenticatedUser() { final CcmObject object1 = objectRepository.findById(20001L).get(); final CcmObject object2 = objectRepository.findById(20002L).get(); - + assertThat(permissionChecker.isPermitted("privilege1", object1), is(false)); assertThat(permissionChecker.isPermitted("privilege2", object1), @@ -241,7 +218,7 @@ public class PermissionCheckerTest { assertThat(permissionChecker.isPermitted("privilege3", object1), is(true)); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(2100) @@ -250,10 +227,10 @@ public class PermissionCheckerTest { "foo123"); token.setRememberMe(true); subject.login(token); - + permissionChecker.checkPermission("privilege1"); } - + @Test(expected = AuthorizationException.class) @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @ShouldThrowException(AuthorizationException.class) @@ -261,40 +238,40 @@ public class PermissionCheckerTest { public void checkPermissionUnAuthenticatedUser() { permissionChecker.checkPermission("privilege1"); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(2300) public void checkPermissionObjectAuthenticatedUser() { final CcmObject object2 = objectRepository.findById(20002L).get(); - + final UsernamePasswordToken token = new UsernamePasswordToken("jdoe", "foo123"); token.setRememberMe(true); subject.login(token); - + permissionChecker.checkPermission("privilege2", object2); } - + @Test(expected = AuthorizationException.class) @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @ShouldThrowException(AuthorizationException.class) @InSequence(2400) public void checkPermissionObjectUnAuthenticatedUser() { final CcmObject object2 = objectRepository.findById(20002L).get(); - + permissionChecker.checkPermission("privilege2", object2); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(2500) public void checkPermissionObjectPublicUser() { final CcmObject object1 = objectRepository.findById(20001L).get(); - + permissionChecker.checkPermission("privilege3", object1); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(2600) @@ -302,69 +279,69 @@ public class PermissionCheckerTest { final CcmObject object1 = objectRepository.findById(20001L).get(); final CcmObject object2 = objectRepository.findById(20002L).get(); final CcmObject object3 = objectRepository.findById(20003L).get(); - + shiro.getSystemUser().execute(new Callable() { - + @Override public Boolean call() { permissionChecker.checkPermission("privilege1"); permissionChecker.checkPermission("privilege2"); permissionChecker.checkPermission("privilege3"); - + permissionChecker.checkPermission("privilege1", object3); permissionChecker.checkPermission("privilege2", object1); permissionChecker.checkPermission("privilege3", object2); - + return false; } - + }); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(3100) public void checkPermissionReturnObjectAuthenticatedUser() { final CcmObject object2 = objectRepository.findById(20002L).get(); - + final UsernamePasswordToken token = new UsernamePasswordToken("jdoe", "foo123"); token.setRememberMe(true); subject.login(token); - + final CcmObject result = permissionChecker.checkPermission( "privilege2", object2, CcmObject.class); assertThat(result.getDisplayName(), is(equalTo("object2"))); assertThat(permissionChecker.isAccessDeniedObject(result), is(false)); assertThat(result, is(equalTo(object2))); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(3200) public void checkPermissionReturnObjectUnAuthenticatedUser() { final CcmObject object2 = objectRepository.findById(20002L).get(); - + final CcmObject result = permissionChecker.checkPermission( "privilege2", object2, CcmObject.class); assertThat(result.getDisplayName(), is(equalTo(ACCESS_DENIED))); assertThat(permissionChecker.isAccessDeniedObject(result), is(true)); assertThat(result, is(not(equalTo(object2)))); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(600) public void checkPermissionReturnObjectPublicUser() { final CcmObject object1 = objectRepository.findById(20001L).get(); - + final CcmObject result = permissionChecker.checkPermission( "privilege3", object1, CcmObject.class); assertThat(result.getDisplayName(), is(equalTo("object1"))); assertThat(permissionChecker.isAccessDeniedObject(result), is(false)); assertThat(result, is(equalTo(object1))); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(3200) @@ -372,48 +349,48 @@ public class PermissionCheckerTest { final CcmObject object1 = objectRepository.findById(20001L).get(); final CcmObject object2 = objectRepository.findById(20002L).get(); final CcmObject object3 = objectRepository.findById(20003L).get(); - + final List results = shiro.getSystemUser().execute( new Callable>() { - + @Override public List call() { permissionChecker.checkPermission("privilege1"); permissionChecker.checkPermission("privilege2"); permissionChecker.checkPermission("privilege3"); - + final CcmObject result3 = permissionChecker.checkPermission( "privilege1", object3, CcmObject.class); final CcmObject result1 = permissionChecker.checkPermission( "privilege2", object1, CcmObject.class); final CcmObject result2 = permissionChecker.checkPermission( "privilege3", object2, CcmObject.class); - + final List results = new ArrayList<>(); results.add(result1); results.add(result2); results.add(result3); - + return results; } - + }); - + final CcmObject result1 = results.get(0); final CcmObject result2 = results.get(1); final CcmObject result3 = results.get(2); - + assertThat(result1.getDisplayName(), is(equalTo("object1"))); assertThat(permissionChecker.isAccessDeniedObject(result1), is(false)); assertThat(result1, is(equalTo(object1))); - + assertThat(result2.getDisplayName(), is(equalTo("object2"))); assertThat(permissionChecker.isAccessDeniedObject(result2), is(false)); assertThat(result2, is(equalTo(object2))); - + assertThat(result3.getDisplayName(), is(equalTo("object3"))); assertThat(permissionChecker.isAccessDeniedObject(result3), is(false)); assertThat(result3, is(equalTo(object3))); } - + } diff --git a/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/PermissionManagerIT.java similarity index 94% rename from ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java rename to ccm-core/src/test/java/org/libreccm/security/PermissionManagerIT.java index 15bdede20..bc9d91109 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PermissionManagerIT.java @@ -36,11 +36,9 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.libreccm.core.CcmObject; import org.libreccm.core.CcmObjectRepository; -import org.libreccm.tests.categories.IntegrationTest; import javax.inject.Inject; import javax.persistence.EntityManager; @@ -55,6 +53,7 @@ import org.libreccm.categorization.CategorizationConstants; import org.libreccm.core.CoreConstants; import java.util.List; + import org.jboss.arquillian.persistence.TestExecutionPhase; /** @@ -63,7 +62,6 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) @@ -72,7 +70,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class PermissionManagerTest { +public class PermissionManagerIT { @Inject private PermissionManager permissionManager; @@ -89,7 +87,7 @@ public class PermissionManagerTest { @Inject private Shiro shiro; - public PermissionManagerTest() { + public PermissionManagerIT() { } @BeforeClass @@ -112,29 +110,8 @@ public class PermissionManagerTest { public static WebArchive createDeployment() { return ShrinkWrap .create(WebArchive.class, - "LibreCCM-org.libreccm.security.PermissionManagerTest.war"). - addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.configuration.Configuration.class - .getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()). - addPackage(org.libreccm.security.User.class.getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class - .getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage()) - .addPackage(com.arsdigita.kernel.security.SecurityConfig.class - .getPackage()) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addClass(org.libreccm.imexport.Exportable.class) + "LibreCCM-org.libreccm.security.PermissionManagerTest.war") + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/RoleManagerIT.java similarity index 83% rename from ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java rename to ccm-core/src/test/java/org/libreccm/security/RoleManagerIT.java index 9b9cbf6d3..586eaacfb 100644 --- a/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/RoleManagerIT.java @@ -36,9 +36,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.libreccm.tests.categories.IntegrationTest; import javax.inject.Inject; @@ -54,16 +52,15 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"001_create_schema.sql", - "002_create_ccm_core_tables.sql", +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class RoleManagerTest { +public class RoleManagerIT { @Inject private RoleManager roleManager; @@ -77,7 +74,7 @@ public class RoleManagerTest { @Inject private Shiro shiro; - public RoleManagerTest() { + public RoleManagerIT() { } @BeforeClass @@ -101,27 +98,7 @@ public class RoleManagerTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.RoleManagerTest.war") - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.configuration.Configuration.class - .getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) - .addPackage(org.libreccm.security.User.class.getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class - .getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) - .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage()) - .addPackage(com.arsdigita.kernel.security.SecurityConfig.class - .getPackage()) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addPackages(true, "com.arsdigita", "org.libreccm") .addClass(org.libreccm.imexport.Exportable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", @@ -204,7 +181,7 @@ public class RoleManagerTest { @UsingDataSet("datasets/org/libreccm/security/RoleManagerTest/data.yml") @ShouldMatchDataSet( value - = "datasets/org/libreccm/security/RoleManagerTest/after-remove.yml", + = "datasets/org/libreccm/security/RoleManagerTest/after-remove.yml", excludeColumns = {"membership_id"}) @InSequence(300) public void removeRoleFromParty() { diff --git a/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryIT.java similarity index 90% rename from ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java rename to ccm-core/src/test/java/org/libreccm/security/RoleRepositoryIT.java index a57a5c65d..255afb8c4 100644 --- a/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryIT.java @@ -36,9 +36,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.libreccm.tests.categories.IntegrationTest; import java.util.List; @@ -65,7 +63,6 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) @@ -74,7 +71,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class RoleRepositoryTest { +public class RoleRepositoryIT { private static final String ADMINISTRATOR = "administrator"; private static final String USER = "user"; @@ -89,7 +86,7 @@ public class RoleRepositoryTest { @PersistenceContext private EntityManager entityManager; - public RoleRepositoryTest() { + public RoleRepositoryIT() { } @BeforeClass @@ -113,24 +110,7 @@ public class RoleRepositoryTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.RoleRepositoryTest.war") - .addPackage(org.libreccm.security.User.class.getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage( - org.libreccm.configuration.ConfigurationManager.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()). - addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class. - getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) + .addPackages(true, "com.arsdigita", "org.libreccm") .addClass(org.libreccm.imexport.Exportable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") diff --git a/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java b/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionIT.java similarity index 92% rename from ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java rename to ccm-core/src/test/java/org/libreccm/security/SecuredCollectionIT.java index a481c118a..e769b2e75 100644 --- a/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionIT.java @@ -19,6 +19,8 @@ package org.libreccm.security; +import static org.libreccm.testutils.DependenciesHelpers.getModuleDependencies; + import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; @@ -43,25 +45,24 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.libreccm.core.CcmObject; import org.libreccm.core.CcmObjectRepository; -import org.libreccm.tests.categories.IntegrationTest; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; -import static org.libreccm.testutils.DependenciesHelpers.*; import org.jboss.arquillian.persistence.CleanupUsingScript; import org.jboss.arquillian.persistence.TestExecutionPhase; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; + /** * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) @@ -70,7 +71,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class SecuredCollectionTest { +public class SecuredCollectionIT { private static final String ACCESS_DENIED = "Access denied"; @@ -87,7 +88,7 @@ public class SecuredCollectionTest { private SecuredCollection collection2; private SecuredCollection collection3; - public SecuredCollectionTest() { + public SecuredCollectionIT() { } @BeforeClass @@ -129,27 +130,7 @@ public class SecuredCollectionTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.SecuredCollectionTest.war") - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.configuration.Configuration.class - .getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) - .addPackage(org.libreccm.security.User.class.getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class.getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage()) - .addPackage(com.arsdigita.kernel.security.SecurityConfig.class - .getPackage()) - .addClass(org.libreccm.imexport.Exportable.class) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java b/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorIT.java similarity index 87% rename from ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java rename to ccm-core/src/test/java/org/libreccm/security/SecuredIteratorIT.java index 2a4a024d9..29126014a 100644 --- a/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorIT.java @@ -18,7 +18,6 @@ */ package org.libreccm.security; - import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.subject.Subject; import org.jboss.arquillian.container.test.api.Deployment; @@ -37,11 +36,9 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.libreccm.core.CcmObject; import org.libreccm.core.CcmObjectRepository; -import org.libreccm.tests.categories.IntegrationTest; import java.util.ArrayList; import java.util.Iterator; @@ -62,16 +59,15 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"001_create_schema.sql", - "002_create_ccm_core_tables.sql", +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class SecuredIteratorTest { +public class SecuredIteratorIT { private static final String ACCESS_DENIED = "Access denied"; @@ -86,10 +82,12 @@ public class SecuredIteratorTest { //private List list; private Iterator iterator1; + private Iterator iterator2; + private Iterator iterator3; - public SecuredIteratorTest() { + public SecuredIteratorIT() { } @BeforeClass @@ -131,27 +129,7 @@ public class SecuredIteratorTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.SecuredIteratorTest.war") - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addPackage(org.libreccm.configuration.Configuration.class - .getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) - .addPackage(org.libreccm.security.User.class.getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class.getPackage()) - .addPackage(com.arsdigita.kernel.security.SecurityConfig.class - .getPackage()) - .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage()) - .addClass(org.libreccm.imexport.Exportable.class) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java b/ccm-core/src/test/java/org/libreccm/security/ShiroIT.java similarity index 97% rename from ccm-core/src/test/java/org/libreccm/security/ShiroTest.java rename to ccm-core/src/test/java/org/libreccm/security/ShiroIT.java index a63da1a64..e9d02352d 100644 --- a/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/ShiroIT.java @@ -44,9 +44,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.libreccm.tests.categories.IntegrationTest; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; @@ -60,7 +58,6 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) @@ -69,12 +66,12 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class ShiroTest { +public class ShiroIT { @Inject private Subject subject; - public ShiroTest() { + public ShiroIT() { } @BeforeClass @@ -115,8 +112,6 @@ public class ShiroTest { .addClass(org.libreccm.modules.UnInstallEvent.class) .addClass(org.libreccm.modules.ShutdownEvent.class) .addPackage(org.libreccm.security.User.class.getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) .addPackage(org.libreccm.testutils.EqualsVerifier.class.getPackage()) .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) diff --git a/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/UserManagerIT.java similarity index 80% rename from ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java rename to ccm-core/src/test/java/org/libreccm/security/UserManagerIT.java index 13e452557..5a1b4bde6 100644 --- a/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/UserManagerIT.java @@ -24,8 +24,6 @@ import javax.inject.Inject; import org.hibernate.exception.ConstraintViolationException; -import static org.hamcrest.Matchers.*; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.arquillian.junit.Arquillian; @@ -44,9 +42,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.libreccm.tests.categories.IntegrationTest; import static org.junit.Assert.*; @@ -55,20 +51,23 @@ import static org.libreccm.testutils.DependenciesHelpers.*; import org.jboss.arquillian.persistence.CleanupUsingScript; import org.jboss.arquillian.persistence.TestExecutionPhase; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.nullValue; + /** * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"001_create_schema.sql", - "002_create_ccm_core_tables.sql", +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class UserManagerTest { +public class UserManagerIT { @Inject private UserManager userManager; @@ -79,7 +78,7 @@ public class UserManagerTest { @Inject private Shiro shiro; - public UserManagerTest() { + public UserManagerIT() { } @BeforeClass @@ -103,29 +102,7 @@ public class UserManagerTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.UserManagerTest.war") - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addPackage(org.libreccm.configuration.Configuration.class - .getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) - .addPackage(org.libreccm.security.User.class.getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class - .getPackage()) - .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage()) - .addPackage(com.arsdigita.kernel.security.SecurityConfig.class - .getPackage()) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addClass(org.libreccm.imexport.Exportable.class) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/UserRepositoryIT.java similarity index 87% rename from ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java rename to ccm-core/src/test/java/org/libreccm/security/UserRepositoryIT.java index 018e37e3f..25d6665ed 100644 --- a/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/UserRepositoryIT.java @@ -20,8 +20,6 @@ package org.libreccm.security; import org.junit.Test; -import static org.hamcrest.Matchers.*; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.arquillian.junit.Arquillian; @@ -44,10 +42,8 @@ import static org.libreccm.testutils.DependenciesHelpers.*; import org.jboss.arquillian.persistence.CleanupUsingScript; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.libreccm.core.EmailAddress; -import org.libreccm.tests.categories.IntegrationTest; import java.util.List; import java.util.Optional; @@ -55,26 +51,34 @@ import java.util.Optional; import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; + import org.jboss.arquillian.persistence.TestExecutionPhase; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.nullValue; + /** * * @author Jens Pelzetter */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"001_create_schema.sql", - "002_create_ccm_core_tables.sql", +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) -public class UserRepositoryTest { +public class UserRepositoryIT { private static final String NOBODY = "nobody"; + private static final String JOE = "joe"; + private static final String MMUSTER = "mmuster"; + private static final String JDOE = "jdoe"; @Inject @@ -86,7 +90,7 @@ public class UserRepositoryTest { @PersistenceContext private EntityManager entityManager; - public UserRepositoryTest() { + public UserRepositoryIT() { } @BeforeClass @@ -110,27 +114,7 @@ public class UserRepositoryTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.UserRepositoryTest.war") - .addPackage(org.libreccm.security.User.class.getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.configuration.Configuration.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class - .getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) - .addClass(com.arsdigita.kernel.security.SecurityConfig.class) - .addClass(com.arsdigita.kernel.KernelConfig.class) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addClass(org.libreccm.imexport.Exportable.class) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", diff --git a/ccm-core/src/test/java/org/libreccm/security/authorization/LabBean.java b/ccm-core/src/test/java/org/libreccm/security/authorization/LabBean.java index 30ad99e7f..8be633be1 100644 --- a/ccm-core/src/test/java/org/libreccm/security/authorization/LabBean.java +++ b/ccm-core/src/test/java/org/libreccm/security/authorization/LabBean.java @@ -20,7 +20,7 @@ package org.libreccm.security.authorization; import org.apache.shiro.subject.Subject; import org.libreccm.core.CcmObject; -import org.libreccm.security.AuthorizationInterceptorTest; +import org.libreccm.security.AuthorizationInterceptorIT; import org.libreccm.security.AuthorizationRequired; import org.libreccm.security.RequiresPrivilege; import org.libreccm.security.RequiresRole; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; /** - * A simple bean used by the {@link AuthorizationInterceptorTest}. + * A simple bean used by the {@link AuthorizationInterceptorIT}. * * @author Jens Pelzetter */ From 25739692fe0ee84e954f0e34dc5016d837ee4a79 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Wed, 15 Jul 2020 11:07:22 +0200 Subject: [PATCH 68/92] All integration test in ccm-core now work with the maven-failsafe-plugin --- .../modules/DependencyTreeManagerCycleIT.java | 1 + .../modules/DependencyTreeManagerIT.java | 2 ++ .../java/org/libreccm/security/ShiroIT.java | 26 +------------------ 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleIT.java b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleIT.java index da544e68d..c906598ff 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleIT.java +++ b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleIT.java @@ -86,6 +86,7 @@ public class DependencyTreeManagerCycleIT { "LibreCCM-org.libreccm.modules.dependencytree.DependencyTreeManagerCycleTest.war") .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) + .addAsResource("test-persistence.xml", "META-INF/persistence.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource( "module-info/dependency-tree-manager-cycle-test/module-root.properties", diff --git a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerIT.java b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerIT.java index 291cd1349..430a53d2e 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerIT.java +++ b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerIT.java @@ -99,6 +99,8 @@ public class DependencyTreeManagerIT { "LibreCCM-org.libreccm.modules.dependencytree.DependencyTreeManagerTest.war") .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) + .addAsResource("test-persistence.xml", + "META-INF/persistence.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource( "module-info/dependency-tree-manager-test/module-root.properties", diff --git a/ccm-core/src/test/java/org/libreccm/security/ShiroIT.java b/ccm-core/src/test/java/org/libreccm/security/ShiroIT.java index e9d02352d..4f2fca536 100644 --- a/ccm-core/src/test/java/org/libreccm/security/ShiroIT.java +++ b/ccm-core/src/test/java/org/libreccm/security/ShiroIT.java @@ -95,31 +95,7 @@ public class ShiroIT { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.ShiroTest.war") - .addPackage(org.libreccm.categorization.Category.class.getPackage()) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addPackage(org.libreccm.configuration.Configuration.class - .getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) - .addClass(org.libreccm.modules.CcmModule.class) - .addClass(org.libreccm.modules.ModuleEvent.class) - .addClass(org.libreccm.modules.InitEvent.class) - .addClass(org.libreccm.modules.InstallEvent.class) - .addClass(org.libreccm.modules.UnInstallEvent.class) - .addClass(org.libreccm.modules.ShutdownEvent.class) - .addPackage(org.libreccm.security.User.class.getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class.getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage()) - .addPackage(com.arsdigita.kernel.security.SecurityConfig.class - .getPackage()) - .addClass(org.libreccm.security.authorization.LabBean.class) - .addClass(org.libreccm.imexport.Exportable.class) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") From f73735d8092e0ad123d189c0ac4ba4fd477c4453 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Wed, 15 Jul 2020 12:53:21 +0200 Subject: [PATCH 69/92] Added the failsafe report to the reports for the ccm-core project site --- ccm-core/pom.xml | 25 +++++++++++++++++++++++++ pom.xml | 5 +++++ 2 files changed, 30 insertions(+) diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index b23d24c57..86a5e1167 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -413,6 +413,14 @@ false + + + unit-tests + + report-only + + + @@ -1063,6 +1071,23 @@ + + + + org.apache.maven.plugins + maven-surefire-report-plugin + + + integration-tests + + failsafe-report-only + + + + + + + diff --git a/pom.xml b/pom.xml index d051b2c04..3a1cda1a4 100644 --- a/pom.xml +++ b/pom.xml @@ -252,6 +252,11 @@ maven-surefire-plugin 3.0.0-M3 + + org.apache.maven.plugins + maven-surefire-report-plugin + 3.0.0-M5 + org.apache.maven.plugins maven-site-plugin From fc4bfefd580fe21e89b0d14f18ce7685fdbb91eb Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Thu, 16 Jul 2020 07:34:29 +0200 Subject: [PATCH 70/92] Integrationtests with Wildfly and PostgreSQL for ccm-core --- .gitignore | 1 + ccm-core/pom.xml | 207 ++++++++++++++++++++++-- it-pgsql-datasources.example.properties | 11 ++ pom.xml | 2 +- 4 files changed, 206 insertions(+), 15 deletions(-) create mode 100644 it-pgsql-datasources.example.properties diff --git a/.gitignore b/.gitignore index 6c5749265..ef6e85bec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +it-pgsql-datasources.properties nb-configuration.xml node node_modules diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index 86a5e1167..2c481f807 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -946,7 +946,7 @@ - test-with-wildfly + test-with-wildfly-h2mem org.wildfly.arquillian @@ -1044,19 +1044,19 @@
subsystem=datasources,data-source=ccm-core-testdb-h2-mem
true - - - - jdbc:h2:mem:ccm-core-testdb - java:/comp/env/jdbc/org/libreccm/ccm-core/h2-mem - true - sa - sa - false - h2 - - - + + + + jdbc:h2:mem:ccm-core-testdb + java:/comp/env/jdbc/org/libreccm/ccm-core/h2-mem + true + sa + sa + false + h2 + + + @@ -1087,7 +1087,186 @@ + + + + test-with-wildfly-pgsql + + + org.wildfly.arquillian + wildfly-arquillian-container-remote + test + + + net.sf.saxon + Saxon-HE + + + org.postgresql + postgresql + provided + + + + + + + src/test/resources + + + src/test/resources-wildfly-remote-pgsql + + + ${project.build.directory}/generated-resources + + + + + + + de.jpdigital + hibernate53-ddl-maven-plugin + + + h2 + postgresql9 + + + org.libreccm + + true + + + + + gen-ddl + + process-classes + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-test + verify + + + + + always + 999 + true + + org.jboss.logmanager.LogManager + + false + false + + + + org.codehaus.mojo + properties-maven-plugin + + + read-datasource-properties + initialize + + read-project-properties + + + + ${project.basedir}/../it-pgsql-datasources.properties + + + + + + + org.wildfly.plugins + wildfly-maven-plugin + + false + + + + start-test-env + + start + + pre-integration-test + + System.out + + + + prepare-deploy-jdbc-driver + + org.postgresql + postgresql + postgresql.jar + true + + pre-integration-test + + deploy-artifact + + + + prepare-test-env + + add-resource + + pre-integration-test + +
subsystem=datasources,data-source=ccm-core-testdb-pgsql
+ true + + + + ${it.ccm-core.datasource.connectionUrl} + java:/comp/env/jdbc/org/libreccm/ccm-core/pgsql + true + ${it.ccm-core.datasource.username} + ${it.ccm-core.datasource.password} + false + postgresql.jar + + + + + + + shutdown-test-env + + shutdown + + post-integration-test + + + + + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + + + integration-tests + + failsafe-report-only + + + + + + diff --git a/it-pgsql-datasources.example.properties b/it-pgsql-datasources.example.properties new file mode 100644 index 000000000..206a580c5 --- /dev/null +++ b/it-pgsql-datasources.example.properties @@ -0,0 +1,11 @@ +# Example configuration file for the PostgreSQL datasources used in integration test +# profiles test-with-wildfly-pgsql +# name format: it.${moduleName}.datasource.${property} +# +# Copy these file to it-pgsql-datasources.properties and customize the settings +# to fit your environment + +it.ccm-core.datasource.connectionUrl=jdbc://postgresql://localhost:5432/ccm-core-testdb +it.ccm-core.datasource.username=ccm +it.ccm-core.datasource.password=ccm + diff --git a/pom.xml b/pom.xml index 3a1cda1a4..f82eb789c 100644 --- a/pom.xml +++ b/pom.xml @@ -483,7 +483,7 @@ org.postgresql postgresql - 42.2.13 + 42.2.14 - + diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/001_create_schema.sql b/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/001_create_schema.sql new file mode 100644 index 000000000..fbf95fd9e --- /dev/null +++ b/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/001_create_schema.sql @@ -0,0 +1,9 @@ +DROP SCHEMA IF EXISTS ccm_shortcuts CASCADE; +DROP SCHEMA IF EXISTS ccm_core CASCADE; + +DROP SEQUENCE IF EXISTS hibernate_sequence; + +create schema CCM_CORE; + +create schema CCM_SHORTCUTS; + diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_shortcuts_schema.sql b/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_shortcuts_tables.sql similarity index 99% rename from ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_shortcuts_schema.sql rename to ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_shortcuts_tables.sql index 8c425dd6b..e89d68855 100644 --- a/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_shortcuts_schema.sql +++ b/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_shortcuts_tables.sql @@ -1,13 +1,3 @@ -DROP SCHEMA IF EXISTS ccm_shortcuts CASCADE; -DROP SCHEMA IF EXISTS ccm_core CASCADE; - -DROP SEQUENCE IF EXISTS hibernate_sequence; - - - create schema CCM_CORE; - - create schema CCM_SHORTCUTS; - create table CCM_CORE.APPLICATIONS ( APPLICATION_TYPE varchar(1024) not null, @@ -552,11 +542,11 @@ DROP SEQUENCE IF EXISTS hibernate_sequence; SETTING_ID int8 not null, CONFIGURATION_CLASS varchar(512) not null, NAME varchar(512) not null, + SETTING_VALUE_BOOLEAN boolean, + SETTING_VALUE_STRING varchar(1024), SETTING_VALUE_DOUBLE float8, SETTING_VALUE_LONG int8, SETTING_VALUE_BIG_DECIMAL numeric(19, 2), - SETTING_VALUE_STRING varchar(1024), - SETTING_VALUE_BOOLEAN boolean, primary key (SETTING_ID) ); @@ -1297,9 +1287,9 @@ create sequence hibernate_sequence start 1 increment 1; references CCM_CORE.STYLE_RULES; alter table CCM_CORE.STYLE_RULES - add constraint FKf6fb4k6y2d74p70ldmj8awqj3 + add constraint FKcbr0k93g001jix7i4kncsce1w foreign key (STYLE_ID) - references CCM_CORE.STYLE_MEDIA_RULES; + references CCM_CORE.STYLES; alter table CCM_CORE.THEME_DATA_FILES add constraint FK630m2y2p7pp487ofowbefrm89 @@ -1424,4 +1414,4 @@ create sequence hibernate_sequence start 1 increment 1; alter table CCM_CORE.WORKFLOWS add constraint FK9ray5beiny6wm2mi0uwyecay2 foreign key (TEMPLATE_ID) - references CCM_CORE.WORKFLOWS; \ No newline at end of file + references CCM_CORE.WORKFLOWS; diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/003_init_hibernate_sequence.sql b/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/003_init_hibernate_sequence.sql new file mode 100644 index 000000000..57c9f6da6 --- /dev/null +++ b/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/003_init_hibernate_sequence.sql @@ -0,0 +1,2 @@ +ALTER SEQUENCE hibernate_sequence RESTART WITH 100000; + diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/cleanup.sql b/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/999_cleanup.sql similarity index 92% rename from ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/cleanup.sql rename to ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/999_cleanup.sql index 5d987d7f9..363d03b18 100644 --- a/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/cleanup.sql +++ b/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/999_cleanup.sql @@ -36,4 +36,4 @@ DELETE FROM ccm_core.parties; DELETE FROM ccm_core.ccm_roles; -ALTER SEQUENCE hibernate_sequence RESTART WITH 1; +ALTER SEQUENCE hibernate_sequence RESTART WITH 100000; diff --git a/ccm-shortcuts/src/test/resources/scripts/datasets-test/001_create_schema.sql b/ccm-shortcuts/src/test/resources/scripts/datasets-test/001_create_schema.sql new file mode 100644 index 000000000..fbf95fd9e --- /dev/null +++ b/ccm-shortcuts/src/test/resources/scripts/datasets-test/001_create_schema.sql @@ -0,0 +1,9 @@ +DROP SCHEMA IF EXISTS ccm_shortcuts CASCADE; +DROP SCHEMA IF EXISTS ccm_core CASCADE; + +DROP SEQUENCE IF EXISTS hibernate_sequence; + +create schema CCM_CORE; + +create schema CCM_SHORTCUTS; + diff --git a/ccm-shortcuts/src/test/resources/scripts/datasets-test/002_create_ccm_shortcuts_tables.sql b/ccm-shortcuts/src/test/resources/scripts/datasets-test/002_create_ccm_shortcuts_tables.sql new file mode 100644 index 000000000..1a8562e9d --- /dev/null +++ b/ccm-shortcuts/src/test/resources/scripts/datasets-test/002_create_ccm_shortcuts_tables.sql @@ -0,0 +1,1417 @@ + + create table CCM_CORE.APPLICATIONS ( + APPLICATION_TYPE varchar(1024) not null, + PRIMARY_URL varchar(1024) not null, + OBJECT_ID bigint not null, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.ATTACHMENTS ( + ATTACHMENT_ID bigint not null, + ATTACHMENT_DATA blob, + DESCRIPTION varchar(255), + MIME_TYPE varchar(255), + TITLE varchar(255), + MESSAGE_ID bigint, + primary key (ATTACHMENT_ID) + ); + + create table CCM_CORE.CATEGORIES ( + ABSTRACT_CATEGORY boolean, + CATEGORY_ORDER bigint, + ENABLED boolean, + NAME varchar(255) not null, + UNIQUE_ID varchar(255), + VISIBLE boolean, + OBJECT_ID bigint not null, + PARENT_CATEGORY_ID bigint, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.CATEGORIZATIONS ( + CATEGORIZATION_ID bigint not null, + CATEGORY_ORDER bigint, + CATEGORY_INDEX boolean, + OBJECT_ORDER bigint, + TYPE varchar(255), + UUID varchar(255) not null, + OBJECT_ID bigint, + CATEGORY_ID bigint, + primary key (CATEGORIZATION_ID) + ); + + create table CCM_CORE.CATEGORY_DESCRIPTIONS ( + OBJECT_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (OBJECT_ID, LOCALE) + ); + + create table CCM_CORE.CATEGORY_DOMAINS ( + DOMAIN_KEY varchar(255) not null, + RELEASED timestamp, + URI varchar(1024), + VERSION varchar(255), + OBJECT_ID bigint not null, + ROOT_CATEGORY_ID bigint, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.CATEGORY_TITLES ( + OBJECT_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (OBJECT_ID, LOCALE) + ); + + create table CCM_CORE.CCM_OBJECTS ( + OBJECT_ID bigint not null, + DISPLAY_NAME varchar(255), + UUID varchar(255), + primary key (OBJECT_ID) + ); + + create table CCM_CORE.CCM_OBJECTS_AUD ( + OBJECT_ID bigint not null, + REV integer not null, + REVTYPE tinyint, + DISPLAY_NAME varchar(255), + primary key (OBJECT_ID, REV) + ); + + create table CCM_CORE.CCM_REVISIONS ( + id integer not null, + timestamp bigint not null, + USER_NAME varchar(255), + primary key (id) + ); + + create table CCM_CORE.CCM_ROLES ( + ROLE_ID bigint not null, + NAME varchar(512) not null, + UUID varchar(255) not null, + primary key (ROLE_ID) + ); + + create table CCM_CORE.DIGESTS ( + FREQUENCY integer, + HEADER varchar(4096) not null, + NEXT_RUN timestamp, + DIGEST_SEPARATOR varchar(128) not null, + SIGNATURE varchar(4096) not null, + SUBJECT varchar(255) not null, + OBJECT_ID bigint not null, + FROM_PARTY_ID bigint, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.DOMAIN_DESCRIPTIONS ( + OBJECT_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (OBJECT_ID, LOCALE) + ); + + create table CCM_CORE.DOMAIN_OWNERSHIPS ( + OWNERSHIP_ID bigint not null, + CONTEXT varchar(255), + DOMAIN_ORDER bigint, + OWNER_ORDER bigint, + UUID varchar(255) not null, + domain_OBJECT_ID bigint not null, + owner_OBJECT_ID bigint not null, + primary key (OWNERSHIP_ID) + ); + + create table CCM_CORE.DOMAIN_TITLES ( + OBJECT_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (OBJECT_ID, LOCALE) + ); + + create table CCM_CORE.FORMBUILDER_COMPONENT_DESCRIPTIONS ( + COMPONENT_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (COMPONENT_ID, LOCALE) + ); + + create table CCM_CORE.FORMBUILDER_COMPONENTS ( + ACTIVE boolean, + ADMIN_NAME varchar(255), + ATTRIBUTE_STRING varchar(255), + COMPONENT_ORDER bigint, + SELECTED boolean, + OBJECT_ID bigint not null, + parentComponent_OBJECT_ID bigint, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.FORMBUILDER_CONFIRM_EMAIL_LISTENER ( + BODY clob, + FROM_EMAIL varchar(255), + SUBJECT varchar(255), + OBJECT_ID bigint not null, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.FORMBUILDER_CONFIRM_REDIRECT_LISTENERS ( + URL varchar(255), + OBJECT_ID bigint not null, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.FORMBUILDER_DATA_DRIVEN_SELECTS ( + MULTIPLE boolean, + QUERY varchar(255), + OBJECT_ID bigint not null, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.FORMBUILDER_DATA_QUERIES ( + QUERY_ID varchar(255), + OBJECT_ID bigint not null, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.FORMBUILDER_DATA_QUERY_DESCRIPTIONS ( + DATA_QUERY_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (DATA_QUERY_ID, LOCALE) + ); + + create table CCM_CORE.FORMBUILDER_DATA_QUERY_NAMES ( + DATA_QUERY_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (DATA_QUERY_ID, LOCALE) + ); + + create table CCM_CORE.FORMBUILDER_FORMSECTIONS ( + FORMSECTION_ACTION varchar(255), + OBJECT_ID bigint not null, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.FORMBUILDER_LISTENERS ( + ATTRIBUTE_STRING varchar(255), + CLASS_NAME varchar(255), + OBJECT_ID bigint not null, + widget_OBJECT_ID bigint, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.FORMBUILDER_METAOBJECTS ( + CLASS_NAME varchar(255), + PRETTY_NAME varchar(255), + PRETTY_PLURAL varchar(255), + PROPERTIES_FORM varchar(255), + OBJECT_ID bigint not null, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.FORMBUILDER_OBJECT_TYPES ( + APP_NAME varchar(255), + CLASS_NAME varchar(255), + OBJECT_ID bigint not null, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.FORMBUILDER_OPTION_LABELS ( + OPTION_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (OPTION_ID, LOCALE) + ); + + create table CCM_CORE.FORMBUILDER_OPTIONS ( + PARAMETER_VALUE varchar(255), + OBJECT_ID bigint not null, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_DESCRIPTIONS ( + PROCESS_LISTENER_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (PROCESS_LISTENER_ID, LOCALE) + ); + + create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_NAMES ( + PROCESS_LISTENER_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (PROCESS_LISTENER_ID, LOCALE) + ); + + create table CCM_CORE.FORMBUILDER_PROCESS_LISTENERS ( + LISTENER_CLASS varchar(255), + PROCESS_LISTENER_ORDER bigint, + OBJECT_ID bigint not null, + formSection_OBJECT_ID bigint, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.FORMBUILDER_REMOTE_SERVER_POST_LISTENER ( + REMOTE_URL varchar(2048), + OBJECT_ID bigint not null, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.FORMBUILDER_SIMPLE_EMAIL_LISTENERS ( + RECIPIENT varchar(255), + SUBJECT varchar(255), + OBJECT_ID bigint not null, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.FORMBUILDER_TEMPLATE_EMAIL_LISTENERS ( + BODY clob, + RECIPIENT varchar(255), + SUBJECT varchar(255), + OBJECT_ID bigint not null, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.FORMBUILDER_WIDGETS ( + DEFAULT_VALUE varchar(255), + PARAMETER_MODEL varchar(255), + PARAMETER_NAME varchar(255), + OBJECT_ID bigint not null, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.FORMBUILDER_XML_EMAIL_LISTENERS ( + RECIPIENT varchar(255), + SUBJECT varchar(255), + OBJECT_ID bigint not null, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.GROUP_MEMBERSHIPS ( + MEMBERSHIP_ID bigint not null, + UUID varchar(255) not null, + GROUP_ID bigint, + MEMBER_ID bigint, + primary key (MEMBERSHIP_ID) + ); + + create table CCM_CORE.GROUPS ( + PARTY_ID bigint not null, + primary key (PARTY_ID) + ); + + create table CCM_CORE.HOSTS ( + HOST_ID bigint not null, + SERVER_NAME varchar(512), + SERVER_PORT bigint, + primary key (HOST_ID) + ); + + create table CCM_CORE.INITS ( + INITIALIZER_ID bigint not null, + CLASS_NAME varchar(255), + REQUIRED_BY_ID bigint, + primary key (INITIALIZER_ID) + ); + + create table CCM_CORE.INSTALLED_MODULES ( + MODULE_ID integer not null, + MODULE_CLASS_NAME varchar(2048), + STATUS varchar(255), + primary key (MODULE_ID) + ); + + create table CCM_CORE.LUCENE_DOCUMENTS ( + DOCUMENT_ID bigint not null, + CONTENT clob, + CONTENT_SECTION varchar(512), + COUNTRY varchar(8), + CREATED timestamp, + DIRTY bigint, + DOCUMENT_LANGUAGE varchar(8), + LAST_MODIFIED timestamp, + SUMMARY varchar(4096), + DOCUMENT_TIMESTAMP timestamp, + TITLE varchar(4096), + TYPE varchar(255), + TYPE_SPECIFIC_INFO varchar(512), + CREATED_BY_PARTY_ID bigint, + LAST_MODIFIED_BY bigint, + primary key (DOCUMENT_ID) + ); + + create table CCM_CORE.LUCENE_INDEXES ( + INDEX_ID bigint not null, + LUCENE_INDEX_ID bigint, + HOST_ID bigint, + primary key (INDEX_ID) + ); + + create table CCM_CORE.MESSAGES ( + BODY varchar(255), + BODY_MIME_TYPE varchar(255), + SENT timestamp, + SUBJECT varchar(255), + OBJECT_ID bigint not null, + IN_REPLY_TO_ID bigint, + SENDER_ID bigint, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.NOTIFICATIONS ( + EXPAND_GROUP boolean, + EXPUNGE boolean, + EXPUNGE_MESSAGE boolean, + FULFILL_DATE timestamp, + HEADER varchar(4096), + MAX_RETRIES bigint, + REQUEST_DATE timestamp, + SIGNATURE varchar(4096), + STATUS varchar(32), + OBJECT_ID bigint not null, + DIGEST_ID bigint, + MESSAGE_ID bigint, + RECEIVER_ID bigint, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.ONE_TIME_AUTH_TOKENS ( + TOKEN_ID bigint not null, + PURPOSE varchar(255), + TOKEN varchar(255), + VALID_UNTIL timestamp, + USER_ID bigint, + primary key (TOKEN_ID) + ); + + create table CCM_CORE.PAGE_MODEL_COMPONENT_MODELS ( + COMPONENT_MODEL_ID bigint not null, + CLASS_ATTRIBUTE varchar(512), + ID_ATTRIBUTE varchar(255), + COMPONENT_KEY varchar(255), + MODEL_UUID varchar(255) not null, + STYLE_ATTRIBUTE varchar(1024), + UUID varchar(255) not null, + CONTAINER_ID bigint, + primary key (COMPONENT_MODEL_ID) + ); + + create table CCM_CORE.PAGE_MODEL_CONTAINER_MODELS ( + CONTAINER_ID bigint not null, + CONTAINER_UUID varchar(255) not null, + CONTAINER_KEY varchar(255), + UUID varchar(255) not null, + PAGE_MODEL_ID bigint, + STYLE_ID bigint, + primary key (CONTAINER_ID) + ); + + create table CCM_CORE.PAGE_MODEL_DESCRIPTIONS ( + PAGE_MODEL_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (PAGE_MODEL_ID, LOCALE) + ); + + create table CCM_CORE.PAGE_MODEL_TITLES ( + PAGE_MODEL_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (PAGE_MODEL_ID, LOCALE) + ); + + create table CCM_CORE.PAGE_MODELS ( + PAGE_MODEL_ID bigint not null, + LAST_MODIFIED timestamp, + MODEL_UUID varchar(255) not null, + NAME varchar(255), + TYPE varchar(255) not null, + UUID varchar(255) not null, + VERSION varchar(255) not null, + APPLICATION_ID bigint, + primary key (PAGE_MODEL_ID) + ); + + create table CCM_CORE.PARTIES ( + PARTY_ID bigint not null, + NAME varchar(256) not null, + UUID varchar(255) not null, + primary key (PARTY_ID) + ); + + create table CCM_CORE.PERMISSIONS ( + PERMISSION_ID bigint not null, + CREATION_DATE timestamp, + CREATION_IP varchar(255), + GRANTED_PRIVILEGE varchar(255), + INHERITED boolean, + UUID varchar(255) not null, + CREATION_USER_ID bigint, + GRANTEE_ID bigint, + INHERITED_FROM_ID bigint, + OBJECT_ID bigint, + primary key (PERMISSION_ID) + ); + + create table CCM_CORE.PORTALS ( + TEMPLATE boolean, + OBJECT_ID bigint not null, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.PORTLETS ( + CELL_NUMBER bigint, + SORT_KEY bigint, + OBJECT_ID bigint not null, + PORTAL_ID bigint, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.QUEUE_ITEMS ( + QUEUE_ITEM_ID bigint not null, + HEADER varchar(4096), + RECEIVER_ADDRESS varchar(512), + RETRY_COUNT bigint, + SIGNATURE varchar(4096), + SUCCESSFUL_SENDED boolean, + MESSAGE_ID bigint, + RECEIVER_ID bigint, + primary key (QUEUE_ITEM_ID) + ); + + create table CCM_CORE.RESOURCE_DESCRIPTIONS ( + OBJECT_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (OBJECT_ID, LOCALE) + ); + + create table CCM_CORE.RESOURCE_TITLES ( + OBJECT_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (OBJECT_ID, LOCALE) + ); + + create table CCM_CORE.RESOURCE_TYPE_DESCRIPTIONS ( + RESOURCE_TYPE_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (RESOURCE_TYPE_ID, LOCALE) + ); + + create table CCM_CORE.RESOURCE_TYPES ( + RESOURCE_TYPE_ID bigint not null, + SINGLETON boolean, + TITLE varchar(254) not null, + UUID varchar(255) not null, + EMBEDDED_VIEW boolean, + FULL_PAGE_VIEW boolean, + WORKSPACE_APP boolean, + primary key (RESOURCE_TYPE_ID) + ); + + create table CCM_CORE.RESOURCES ( + CREATED timestamp, + OBJECT_ID bigint not null, + parent_OBJECT_ID bigint, + resourceType_RESOURCE_TYPE_ID bigint, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.ROLE_DESCRIPTIONS ( + ROLE_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (ROLE_ID, LOCALE) + ); + + create table CCM_CORE.ROLE_MEMBERSHIPS ( + MEMBERSHIP_ID bigint not null, + UUID varchar(255) not null, + MEMBER_ID bigint, + ROLE_ID bigint, + primary key (MEMBERSHIP_ID) + ); + + create table CCM_CORE.SETTINGS ( + DTYPE varchar(31) not null, + SETTING_ID bigint not null, + CONFIGURATION_CLASS varchar(512) not null, + NAME varchar(512) not null, + SETTING_VALUE_BOOLEAN boolean, + SETTING_VALUE_STRING varchar(1024), + SETTING_VALUE_DOUBLE double, + SETTING_VALUE_LONG bigint, + SETTING_VALUE_BIG_DECIMAL decimal(19,2), + primary key (SETTING_ID) + ); + + create table CCM_CORE.SETTINGS_ENUM_VALUES ( + ENUM_ID bigint not null, + value varchar(255) + ); + + create table CCM_CORE.SETTINGS_L10N_STR_VALUES ( + ENTRY_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (ENTRY_ID, LOCALE) + ); + + create table CCM_CORE.SETTINGS_STRING_LIST ( + LIST_ID bigint not null, + value varchar(255) + ); + + create table CCM_CORE.SITE_AWARE_APPLICATIONS ( + OBJECT_ID bigint not null, + SITE_ID bigint, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.SITES ( + DEFAULT_SITE boolean, + DEFAULT_THEME varchar(255), + DOMAIN_OF_SITE varchar(255), + OBJECT_ID bigint not null, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.STYLE_MEDIA_QUERIES ( + MEDIA_QUERY_ID bigint not null, + MAX_WIDTH_UNIT varchar(255), + MAX_WIDTH_VALUE double, + MEDIA_TYPE varchar(255), + MIN_WIDTH_UNIT varchar(255), + MIN_WIDTH_VALUE double, + primary key (MEDIA_QUERY_ID) + ); + + create table CCM_CORE.STYLE_MEDIA_RULES ( + MEDIA_RULE_ID bigint not null, + MEDIA_QUERY_ID bigint, + STYLE_ID bigint, + primary key (MEDIA_RULE_ID) + ); + + create table CCM_CORE.STYLE_PROPERTIES ( + PROPERTY_ID bigint not null, + NAME varchar(256), + PROPERTY_VALUE varchar(4096), + RULE_ID bigint, + primary key (PROPERTY_ID) + ); + + create table CCM_CORE.STYLE_RULES ( + RULE_ID bigint not null, + SELECTOR varchar(2048), + STYLE_ID bigint, + primary key (RULE_ID) + ); + + create table CCM_CORE.STYLES ( + STYLE_ID bigint not null, + STYLENAME varchar(255), + primary key (STYLE_ID) + ); + + create table CCM_CORE.THEME_DATA_FILES ( + CREATION_DATE timestamp, + FILE_DATA blob, + LAST_MODIFIED timestamp, + FILE_SIZE bigint, + TYPE varchar(255), + FILE_ID bigint not null, + primary key (FILE_ID) + ); + + create table CCM_CORE.theme_directories ( + FILE_ID bigint not null, + primary key (FILE_ID) + ); + + create table CCM_CORE.THEME_FILES ( + FILE_ID bigint not null, + NAME varchar(255) not null, + FILE_PATH varchar(8192) not null, + UUID varchar(255) not null, + VERSION varchar(255), + PARENT_DIRECTORY_ID bigint, + THEME_ID bigint, + primary key (FILE_ID) + ); + + create table CCM_CORE.THEMES ( + THEME_ID bigint not null, + NAME varchar(255), + UUID varchar(255), + VERSION varchar(255), + ROOT_DIRECTORY_ID bigint, + primary key (THEME_ID) + ); + + create table CCM_CORE.THREADS ( + OBJECT_ID bigint not null, + ROOT_ID bigint, + primary key (OBJECT_ID) + ); + + create table CCM_CORE.USER_EMAIL_ADDRESSES ( + USER_ID bigint not null, + EMAIL_ADDRESS varchar(512) not null, + BOUNCING boolean, + VERIFIED boolean + ); + + create table CCM_CORE.USERS ( + BANNED boolean, + FAMILY_NAME varchar(512), + GIVEN_NAME varchar(512), + PASSWORD varchar(2048), + PASSWORD_RESET_REQUIRED boolean, + EMAIL_ADDRESS varchar(512) not null, + BOUNCING boolean, + VERIFIED boolean, + PARTY_ID bigint not null, + primary key (PARTY_ID) + ); + + create table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS ( + DUE_DATE timestamp, + DURATION_MINUTES bigint, + LOCKED boolean, + START_DATE timestamp, + TASK_ID bigint not null, + LOCKING_USER_ID bigint, + NOTIFICATION_SENDER bigint, + primary key (TASK_ID) + ); + + create table CCM_CORE.WORKFLOW_DESCRIPTIONS ( + WORKFLOW_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (WORKFLOW_ID, LOCALE) + ); + + create table CCM_CORE.WORKFLOW_NAMES ( + WORKFLOW_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (WORKFLOW_ID, LOCALE) + ); + + create table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS ( + TASK_ASSIGNMENT_ID bigint not null, + UUID varchar(255) not null, + ROLE_ID bigint, + TASK_ID bigint, + primary key (TASK_ASSIGNMENT_ID) + ); + + create table CCM_CORE.WORKFLOW_TASK_COMMENTS ( + COMMENT_ID bigint not null, + COMMENT varchar(2147483647), + UUID varchar(255) not null, + AUTHOR_ID bigint, + TASK_ID bigint, + primary key (COMMENT_ID) + ); + + create table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES ( + TASK_DEPENDENCY_ID bigint not null, + uuid varchar(255) not null, + BLOCKED_TASK_ID bigint, + BLOCKING_TASK_ID bigint, + primary key (TASK_DEPENDENCY_ID) + ); + + create table CCM_CORE.WORKFLOW_TASK_DESCRIPTIONS ( + TASK_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (TASK_ID, LOCALE) + ); + + create table CCM_CORE.WORKFLOW_TASK_LABELS ( + TASK_ID bigint not null, + LOCALIZED_VALUE varchar(2147483647), + LOCALE varchar(255) not null, + primary key (TASK_ID, LOCALE) + ); + + create table CCM_CORE.WORKFLOW_TASKS ( + TASK_ID bigint not null, + ACTIVE boolean, + TASK_STATE varchar(512), + UUID varchar(255) not null, + WORKFLOW_ID bigint, + primary key (TASK_ID) + ); + + create table CCM_CORE.WORKFLOWS ( + WORKFLOW_ID bigint not null, + abstract_workflow boolean, + ACTIVE boolean, + WORKFLOW_STATE varchar(255), + TASKS_STATE varchar(255), + UUID varchar(255) not null, + OBJECT_ID bigint, + TEMPLATE_ID bigint, + primary key (WORKFLOW_ID) + ); + + alter table CCM_CORE.CATEGORIZATIONS + add constraint UK_da7jus3wn1tr8poyaw9btxbrc unique (UUID); + + alter table CCM_CORE.CATEGORY_DOMAINS + add constraint UK_mb1riernf8a88u3mwl0bgfj8y unique (DOMAIN_KEY); + + alter table CCM_CORE.CATEGORY_DOMAINS + add constraint UK_i1xqotjvml7i6ro2jq22fxf5g unique (URI); + + alter table CCM_CORE.CCM_OBJECTS + add constraint UK_1cm71jlagvyvcnkqvxqyit3wx unique (UUID); + + alter table CCM_CORE.CCM_ROLES + add constraint UK_rfmsjqsq6kagolsod3ufkugll unique (UUID); + + alter table CCM_CORE.DOMAIN_OWNERSHIPS + add constraint UK_j86gai9740v9hshascbsboudb unique (UUID); + + alter table CCM_CORE.GROUP_MEMBERSHIPS + add constraint UK_kkdoia60bmiwhhdru169p3n9g unique (UUID); + + alter table CCM_CORE.HOSTS + add constraint UK9ramlv6uxwt13v0wj7q0tucsx unique (SERVER_NAME, SERVER_PORT); + + alter table CCM_CORE.INSTALLED_MODULES + add constraint UK_11imwgfojyi4hpr18uw9g3jvx unique (MODULE_CLASS_NAME); + + alter table CCM_CORE.PARTIES + add constraint UK_1hv061qace2mn4loroe3fwdel unique (UUID); + + alter table CCM_CORE.PERMISSIONS + add constraint UK_p50se7rdexv7xnkiqsl6ijyti unique (UUID); + + alter table CCM_CORE.RESOURCE_TYPES + add constraint UK_ioax2ix2xmq3nw7el5k6orggb unique (UUID); + + alter table CCM_CORE.ROLE_MEMBERSHIPS + add constraint UK_82wdq214bfs99eii71fp50s97 unique (UUID); + + alter table CCM_CORE.SETTINGS + add constraint UK5whinfxdaepqs09e5ia9y71uk unique (CONFIGURATION_CLASS, NAME); + + alter table CCM_CORE.SITES + add constraint UK_kou1h4y4st2m173he44yy8grx unique (DOMAIN_OF_SITE); + + alter table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS + add constraint UK_gv93k167pe9qy3go9vjau1q2t unique (UUID); + + alter table CCM_CORE.WORKFLOW_TASK_COMMENTS + add constraint UK_4nnedf08odyjxalfkg16fmjoi unique (UUID); + + alter table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES + add constraint UK_787va2ep8ucoul29qgsoaxnub unique (uuid); + + alter table CCM_CORE.WORKFLOW_TASKS + add constraint UK_2u6ruatxij8wfojl8a1eigqqd unique (UUID); + + alter table CCM_CORE.WORKFLOWS + add constraint UK_o113id7d1cxql0edsrohlnn9x unique (UUID); + + create table CCM_SHORTCUTS.SHORTCUTS ( + SHORTCUT_ID bigint not null, + REDIRECT varchar(1024), + URL_KEY varchar(1024), + primary key (SHORTCUT_ID) + ); + + alter table CCM_SHORTCUTS.SHORTCUTS + add constraint UK_4otuwtog6qqdbg4e6p8xdpw8h unique (URL_KEY); +create sequence hibernate_sequence start with 1 increment by 1; + + alter table CCM_CORE.APPLICATIONS + add constraint FKatcp9ij6mbkx0nfeig1o6n3lm + foreign key (OBJECT_ID) + references CCM_CORE.RESOURCES; + + alter table CCM_CORE.ATTACHMENTS + add constraint FK8ju9hm9baceridp803nislkwb + foreign key (MESSAGE_ID) + references CCM_CORE.MESSAGES; + + alter table CCM_CORE.CATEGORIES + add constraint FKrj3marx99nheur4fqanm0ylur + foreign key (PARENT_CATEGORY_ID) + references CCM_CORE.CATEGORIES; + + alter table CCM_CORE.CATEGORIES + add constraint FKpm291swli2musd0204phta652 + foreign key (OBJECT_ID) + references CCM_CORE.CCM_OBJECTS; + + alter table CCM_CORE.CATEGORIZATIONS + add constraint FKejp0ubk034nfq60v1po6srkke + foreign key (OBJECT_ID) + references CCM_CORE.CCM_OBJECTS; + + alter table CCM_CORE.CATEGORIZATIONS + add constraint FKoyeipswl876wa6mqwbx0uy83h + foreign key (CATEGORY_ID) + references CCM_CORE.CATEGORIES; + + alter table CCM_CORE.CATEGORY_DESCRIPTIONS + add constraint FKhiwjlmh5vkbu3v3vng1la1qum + foreign key (OBJECT_ID) + references CCM_CORE.CATEGORIES; + + alter table CCM_CORE.CATEGORY_DOMAINS + add constraint FKf25vi73cji01w8fgo6ow1dgg + foreign key (ROOT_CATEGORY_ID) + references CCM_CORE.CATEGORIES; + + alter table CCM_CORE.CATEGORY_DOMAINS + add constraint FK58xpmnvciohkom1c16oua4xha + foreign key (OBJECT_ID) + references CCM_CORE.CCM_OBJECTS; + + alter table CCM_CORE.CATEGORY_TITLES + add constraint FKka9bt9f5br0kji5bcjxcmf6ch + foreign key (OBJECT_ID) + references CCM_CORE.CATEGORIES; + + alter table CCM_CORE.CCM_OBJECTS_AUD + add constraint FKr00eauutiyvocno8ckx6h9nw6 + foreign key (REV) + references CCM_CORE.CCM_REVISIONS; + + alter table CCM_CORE.DIGESTS + add constraint FKc53g09agnye3w1v4euy3e0gsi + foreign key (FROM_PARTY_ID) + references CCM_CORE.PARTIES; + + alter table CCM_CORE.DIGESTS + add constraint FK845r9ep6xu6nbt1mvxulwybym + foreign key (OBJECT_ID) + references CCM_CORE.CCM_OBJECTS; + + alter table CCM_CORE.DOMAIN_DESCRIPTIONS + add constraint FKn4i2dxgn8cqysa62dds6eih6a + foreign key (OBJECT_ID) + references CCM_CORE.CATEGORY_DOMAINS; + + alter table CCM_CORE.DOMAIN_OWNERSHIPS + add constraint FK47nsasr7jrdwlky5gx0u6e9py + foreign key (domain_OBJECT_ID) + references CCM_CORE.CATEGORY_DOMAINS; + + alter table CCM_CORE.DOMAIN_OWNERSHIPS + add constraint FK3u4hq6yqau4m419b1xva3xpwq + foreign key (owner_OBJECT_ID) + references CCM_CORE.APPLICATIONS; + + alter table CCM_CORE.DOMAIN_TITLES + add constraint FK5p526dsdwn94els6lp5w0hdn4 + foreign key (OBJECT_ID) + references CCM_CORE.CATEGORY_DOMAINS; + + alter table CCM_CORE.FORMBUILDER_COMPONENT_DESCRIPTIONS + add constraint FKfh0k9lj3pf4amfc9bbbss0tr1 + foreign key (COMPONENT_ID) + references CCM_CORE.FORMBUILDER_COMPONENTS; + + alter table CCM_CORE.FORMBUILDER_COMPONENTS + add constraint FKpcpmvyiix023b4g5n4q8nkfca + foreign key (parentComponent_OBJECT_ID) + references CCM_CORE.FORMBUILDER_COMPONENTS; + + alter table CCM_CORE.FORMBUILDER_COMPONENTS + add constraint FKt0e0uv00pp1rwhyaltrytghnm + foreign key (OBJECT_ID) + references CCM_CORE.CCM_OBJECTS; + + alter table CCM_CORE.FORMBUILDER_CONFIRM_EMAIL_LISTENER + add constraint FK48khrbud3xhi2gvsvnlttd8tg + foreign key (OBJECT_ID) + references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; + + alter table CCM_CORE.FORMBUILDER_CONFIRM_REDIRECT_LISTENERS + add constraint FKbyjjt2ufendvje2obtge2l7et + foreign key (OBJECT_ID) + references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; + + alter table CCM_CORE.FORMBUILDER_DATA_DRIVEN_SELECTS + add constraint FK8oriyta1957u7dvbrqk717944 + foreign key (OBJECT_ID) + references CCM_CORE.FORMBUILDER_WIDGETS; + + alter table CCM_CORE.FORMBUILDER_DATA_QUERIES + add constraint FKhhaxpeddbtmrnjr5o0fopju3a + foreign key (OBJECT_ID) + references CCM_CORE.CCM_OBJECTS; + + alter table CCM_CORE.FORMBUILDER_DATA_QUERY_DESCRIPTIONS + add constraint FKsmduu1opoiulkeo2gc8v7lsbn + foreign key (DATA_QUERY_ID) + references CCM_CORE.FORMBUILDER_DATA_QUERIES; + + alter table CCM_CORE.FORMBUILDER_DATA_QUERY_NAMES + add constraint FKju1x82inrw3kguyjuxoetn6gn + foreign key (DATA_QUERY_ID) + references CCM_CORE.FORMBUILDER_DATA_QUERIES; + + alter table CCM_CORE.FORMBUILDER_FORMSECTIONS + add constraint FKnfhsgxp4lvigq2pm33pn4afac + foreign key (OBJECT_ID) + references CCM_CORE.FORMBUILDER_COMPONENTS; + + alter table CCM_CORE.FORMBUILDER_LISTENERS + add constraint FK33ilyirwoux28yowafgd5xx0o + foreign key (widget_OBJECT_ID) + references CCM_CORE.FORMBUILDER_WIDGETS; + + alter table CCM_CORE.FORMBUILDER_LISTENERS + add constraint FKlqm76746nq5yrt8ganm474uu0 + foreign key (OBJECT_ID) + references CCM_CORE.CCM_OBJECTS; + + alter table CCM_CORE.FORMBUILDER_METAOBJECTS + add constraint FKf963v6u9mw8pwjmasrw51w8dx + foreign key (OBJECT_ID) + references CCM_CORE.CCM_OBJECTS; + + alter table CCM_CORE.FORMBUILDER_OBJECT_TYPES + add constraint FKkv337e83rsecf0h3qy8bu7l9w + foreign key (OBJECT_ID) + references CCM_CORE.CCM_OBJECTS; + + alter table CCM_CORE.FORMBUILDER_OPTION_LABELS + add constraint FKatlsylsvln6yse55eof6wwkj6 + foreign key (OPTION_ID) + references CCM_CORE.FORMBUILDER_OPTIONS; + + alter table CCM_CORE.FORMBUILDER_OPTIONS + add constraint FKhe5q71wby9g4i56sotc501h11 + foreign key (OBJECT_ID) + references CCM_CORE.FORMBUILDER_COMPONENTS; + + alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_DESCRIPTIONS + add constraint FKcv3iu04gxjk9c0pn6tl8rqqv3 + foreign key (PROCESS_LISTENER_ID) + references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; + + alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_NAMES + add constraint FK8rnyb1m6ij3b9hhmhr7klgd4p + foreign key (PROCESS_LISTENER_ID) + references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; + + alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENERS + add constraint FK7uiaeax8qafm82e5k729ms5ku + foreign key (formSection_OBJECT_ID) + references CCM_CORE.FORMBUILDER_FORMSECTIONS; + + alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENERS + add constraint FKbdnloo884qk6gn36jwiqv5rlp + foreign key (OBJECT_ID) + references CCM_CORE.CCM_OBJECTS; + + alter table CCM_CORE.FORMBUILDER_REMOTE_SERVER_POST_LISTENER + add constraint FKpajvu9m6fj1enm67a9gcb5ii9 + foreign key (OBJECT_ID) + references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; + + alter table CCM_CORE.FORMBUILDER_SIMPLE_EMAIL_LISTENERS + add constraint FKsn82ktlq0c9ikijyv8k2bfv4f + foreign key (OBJECT_ID) + references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; + + alter table CCM_CORE.FORMBUILDER_TEMPLATE_EMAIL_LISTENERS + add constraint FK8kjyu72btjsuaaqh4bvd8npns + foreign key (OBJECT_ID) + references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; + + alter table CCM_CORE.FORMBUILDER_WIDGETS + add constraint FK1wosr4ujbfckdc50u5fgmrhrk + foreign key (OBJECT_ID) + references CCM_CORE.FORMBUILDER_COMPONENTS; + + alter table CCM_CORE.FORMBUILDER_XML_EMAIL_LISTENERS + add constraint FKjie9co03m7ow4ihig5rk7l8oj + foreign key (OBJECT_ID) + references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; + + alter table CCM_CORE.GROUP_MEMBERSHIPS + add constraint FKq4qnny8ri3eo7eqh4olxco8nk + foreign key (GROUP_ID) + references CCM_CORE.GROUPS; + + alter table CCM_CORE.GROUP_MEMBERSHIPS + add constraint FKc8u86ivkhvoiw6ju8b2p365he + foreign key (MEMBER_ID) + references CCM_CORE.USERS; + + alter table CCM_CORE.GROUPS + add constraint FK4f61mlqxw0ct6s7wwpi9m0735 + foreign key (PARTY_ID) + references CCM_CORE.PARTIES; + + alter table CCM_CORE.INITS + add constraint FK3nvvxk10nmq9nfuko8yklqdgc + foreign key (REQUIRED_BY_ID) + references CCM_CORE.INITS; + + alter table CCM_CORE.LUCENE_DOCUMENTS + add constraint FK942kl4yff8rdiwr0pjk2a9g8 + foreign key (CREATED_BY_PARTY_ID) + references CCM_CORE.USERS; + + alter table CCM_CORE.LUCENE_DOCUMENTS + add constraint FKc5rs6afx4p9fidabfqsxr5ble + foreign key (LAST_MODIFIED_BY) + references CCM_CORE.USERS; + + alter table CCM_CORE.LUCENE_INDEXES + add constraint FK6gu0yrlviqk07dtb3r02iw43f + foreign key (HOST_ID) + references CCM_CORE.HOSTS; + + alter table CCM_CORE.MESSAGES + add constraint FKph10aehmg9f20pn2w4buki97q + foreign key (IN_REPLY_TO_ID) + references CCM_CORE.MESSAGES; + + alter table CCM_CORE.MESSAGES + add constraint FKjufsx3c3h538fj35h8hgfnb1p + foreign key (SENDER_ID) + references CCM_CORE.USERS; + + alter table CCM_CORE.MESSAGES + add constraint FK6w20ao7scwecd9mfwpun2ddqx + foreign key (OBJECT_ID) + references CCM_CORE.CCM_OBJECTS; + + alter table CCM_CORE.NOTIFICATIONS + add constraint FKqk70c1x1dklhty9ju5t4wukd9 + foreign key (DIGEST_ID) + references CCM_CORE.DIGESTS; + + alter table CCM_CORE.NOTIFICATIONS + add constraint FKtt4fjr2p75og79jxxgd8q8mr + foreign key (MESSAGE_ID) + references CCM_CORE.MESSAGES; + + alter table CCM_CORE.NOTIFICATIONS + add constraint FK2vlnma0ox43j0clx8ead08n5s + foreign key (RECEIVER_ID) + references CCM_CORE.PARTIES; + + alter table CCM_CORE.NOTIFICATIONS + add constraint FKf423hhiaw1bexpxeh1pnas7qt + foreign key (OBJECT_ID) + references CCM_CORE.CCM_OBJECTS; + + alter table CCM_CORE.ONE_TIME_AUTH_TOKENS + add constraint FKtplfuphkiorfkttaewb4wmfjc + foreign key (USER_ID) + references CCM_CORE.USERS; + + alter table CCM_CORE.PAGE_MODEL_COMPONENT_MODELS + add constraint FK1uvkayybawff8sqkmerqt60bk + foreign key (CONTAINER_ID) + references CCM_CORE.PAGE_MODEL_CONTAINER_MODELS; + + alter table CCM_CORE.PAGE_MODEL_CONTAINER_MODELS + add constraint FK1c6drneacxveol92vpum79fxb + foreign key (PAGE_MODEL_ID) + references CCM_CORE.PAGE_MODELS; + + alter table CCM_CORE.PAGE_MODEL_CONTAINER_MODELS + add constraint FKoi5wphv3vtwryc19akku28p24 + foreign key (STYLE_ID) + references CCM_CORE.STYLES; + + alter table CCM_CORE.PAGE_MODEL_DESCRIPTIONS + add constraint FKcc5d6eqxu1369k8ycyyt6vn3e + foreign key (PAGE_MODEL_ID) + references CCM_CORE.PAGE_MODELS; + + alter table CCM_CORE.PAGE_MODEL_TITLES + add constraint FKj14q9911yhd4js9p6rs21rwjf + foreign key (PAGE_MODEL_ID) + references CCM_CORE.PAGE_MODELS; + + alter table CCM_CORE.PAGE_MODELS + add constraint FKk2lihllrxj89mn3tqv43amafe + foreign key (APPLICATION_ID) + references CCM_CORE.APPLICATIONS; + + alter table CCM_CORE.PERMISSIONS + add constraint FKj9di7pawxgtouxmu2k44bj5c4 + foreign key (CREATION_USER_ID) + references CCM_CORE.USERS; + + alter table CCM_CORE.PERMISSIONS + add constraint FKikx3x0kn9fito23g50v6xbr9f + foreign key (GRANTEE_ID) + references CCM_CORE.CCM_ROLES; + + alter table CCM_CORE.PERMISSIONS + add constraint FKg56ujjoe0j30pq579rf0l5yc6 + foreign key (INHERITED_FROM_ID) + references CCM_CORE.CCM_OBJECTS; + + alter table CCM_CORE.PERMISSIONS + add constraint FKkamckexjnffnt8lay9nqeawhm + foreign key (OBJECT_ID) + references CCM_CORE.CCM_OBJECTS; + + alter table CCM_CORE.PORTALS + add constraint FK5a2hdrbw03mmgr74vj5nxlpvk + foreign key (OBJECT_ID) + references CCM_CORE.RESOURCES; + + alter table CCM_CORE.PORTLETS + add constraint FK9gr5xjt3rx4uhtw7vl6adruol + foreign key (PORTAL_ID) + references CCM_CORE.PORTALS; + + alter table CCM_CORE.PORTLETS + add constraint FKjmx9uebt0gwxkw3xv34niy35f + foreign key (OBJECT_ID) + references CCM_CORE.RESOURCES; + + alter table CCM_CORE.QUEUE_ITEMS + add constraint FKtgkwfruv9kjdybf46l02da088 + foreign key (MESSAGE_ID) + references CCM_CORE.MESSAGES; + + alter table CCM_CORE.QUEUE_ITEMS + add constraint FKs9aq1hyxstwmvx7fmfifp4x7r + foreign key (RECEIVER_ID) + references CCM_CORE.PARTIES; + + alter table CCM_CORE.RESOURCE_DESCRIPTIONS + add constraint FKk9arvj5u21rv23ce3cav4opqx + foreign key (OBJECT_ID) + references CCM_CORE.RESOURCES; + + alter table CCM_CORE.RESOURCE_TITLES + add constraint FKto4p6n2wklljyf7tmuxtmyfe0 + foreign key (OBJECT_ID) + references CCM_CORE.RESOURCES; + + alter table CCM_CORE.RESOURCE_TYPE_DESCRIPTIONS + add constraint FKckpihjtv23iahbg3imnpbsr2 + foreign key (RESOURCE_TYPE_ID) + references CCM_CORE.RESOURCE_TYPES; + + alter table CCM_CORE.RESOURCES + add constraint FKbo7ibfgodicn9flv2gfo11g5a + foreign key (parent_OBJECT_ID) + references CCM_CORE.RESOURCES; + + alter table CCM_CORE.RESOURCES + add constraint FK262fbwetpjx3k4uuvw24wsiv + foreign key (resourceType_RESOURCE_TYPE_ID) + references CCM_CORE.RESOURCE_TYPES; + + alter table CCM_CORE.RESOURCES + add constraint FKbjdf8pm4frth8r06ev2qjm88f + foreign key (OBJECT_ID) + references CCM_CORE.CCM_OBJECTS; + + alter table CCM_CORE.ROLE_DESCRIPTIONS + add constraint FKo09bh4j3k3k0ph3awvjwx31ft + foreign key (ROLE_ID) + references CCM_CORE.CCM_ROLES; + + alter table CCM_CORE.ROLE_MEMBERSHIPS + add constraint FK9m88ywi7rcin7b7jrgh53emrq + foreign key (MEMBER_ID) + references CCM_CORE.PARTIES; + + alter table CCM_CORE.ROLE_MEMBERSHIPS + add constraint FKcsyogv5m2rgsrmtgnhgkjhfw7 + foreign key (ROLE_ID) + references CCM_CORE.CCM_ROLES; + + alter table CCM_CORE.SETTINGS_ENUM_VALUES + add constraint FK8mw4p92s0h3h8bmo8saowu32i + foreign key (ENUM_ID) + references CCM_CORE.SETTINGS; + + alter table CCM_CORE.SETTINGS_L10N_STR_VALUES + add constraint FK5knjq7cisej0qfx5dw1y93rou + foreign key (ENTRY_ID) + references CCM_CORE.SETTINGS; + + alter table CCM_CORE.SETTINGS_STRING_LIST + add constraint FKqeclqa5sf1g53vxs857tpwrus + foreign key (LIST_ID) + references CCM_CORE.SETTINGS; + + alter table CCM_CORE.SITE_AWARE_APPLICATIONS + add constraint FKopo91c29jaunpcusjwlphhxkd + foreign key (SITE_ID) + references CCM_CORE.SITES; + + alter table CCM_CORE.SITE_AWARE_APPLICATIONS + add constraint FKslbu2qagg23dmdu01lun7oh7x + foreign key (OBJECT_ID) + references CCM_CORE.APPLICATIONS; + + alter table CCM_CORE.SITES + add constraint FKrca95c6p023men53b8ayu26kp + foreign key (OBJECT_ID) + references CCM_CORE.CCM_OBJECTS; + + alter table CCM_CORE.STYLE_MEDIA_RULES + add constraint FKdq24a4atxp4c1sbqs8g6lpkx0 + foreign key (MEDIA_QUERY_ID) + references CCM_CORE.STYLE_MEDIA_QUERIES; + + alter table CCM_CORE.STYLE_MEDIA_RULES + add constraint FKf67h8q9kkjft9go2xo2572n17 + foreign key (STYLE_ID) + references CCM_CORE.STYLES; + + alter table CCM_CORE.STYLE_PROPERTIES + add constraint FKg2g0n7jmce3vjmula0898yp94 + foreign key (RULE_ID) + references CCM_CORE.STYLE_RULES; + + alter table CCM_CORE.STYLE_RULES + add constraint FKcbr0k93g001jix7i4kncsce1w + foreign key (STYLE_ID) + references CCM_CORE.STYLES; + + alter table CCM_CORE.THEME_DATA_FILES + add constraint FK630m2y2p7pp487ofowbefrm89 + foreign key (FILE_ID) + references CCM_CORE.THEME_FILES; + + alter table CCM_CORE.theme_directories + add constraint FKrmgyslvw22j87n4cxau5jvsou + foreign key (FILE_ID) + references CCM_CORE.THEME_FILES; + + alter table CCM_CORE.THEME_FILES + add constraint FKfsycb4bt8d0wye7r3n06ekfeu + foreign key (PARENT_DIRECTORY_ID) + references CCM_CORE.theme_directories; + + alter table CCM_CORE.THEME_FILES + add constraint FKke2jj04kjqh91h347g1ut0yff + foreign key (THEME_ID) + references CCM_CORE.THEMES; + + alter table CCM_CORE.THEMES + add constraint FKlat55c5l3fxbykkibrmv7qi4x + foreign key (ROOT_DIRECTORY_ID) + references CCM_CORE.theme_directories; + + alter table CCM_CORE.THREADS + add constraint FKsx08mpwvwnw97uwdgjs76q39g + foreign key (ROOT_ID) + references CCM_CORE.MESSAGES; + + alter table CCM_CORE.THREADS + add constraint FKp97b1sy1kop07rtapeh5l9fb2 + foreign key (OBJECT_ID) + references CCM_CORE.CCM_OBJECTS; + + alter table CCM_CORE.USER_EMAIL_ADDRESSES + add constraint FKr900l79erul95seyyccf04ufc + foreign key (USER_ID) + references CCM_CORE.USERS; + + alter table CCM_CORE.USERS + add constraint FKosh928q71aonu6l1kurb417r + foreign key (PARTY_ID) + references CCM_CORE.PARTIES; + + alter table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS + add constraint FK1pnsq9ur3ylq0ghuj23p4cogs + foreign key (LOCKING_USER_ID) + references CCM_CORE.USERS; + + alter table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS + add constraint FK9ngp088m8xa82swy7yg3qx6vh + foreign key (NOTIFICATION_SENDER) + references CCM_CORE.USERS; + + alter table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS + add constraint FKt9ha3no3bj8a50pnw8cnqh2cq + foreign key (TASK_ID) + references CCM_CORE.WORKFLOW_TASKS; + + alter table CCM_CORE.WORKFLOW_DESCRIPTIONS + add constraint FKgx7upkqky82dpxvbs95imfl9l + foreign key (WORKFLOW_ID) + references CCM_CORE.WORKFLOWS; + + alter table CCM_CORE.WORKFLOW_NAMES + add constraint FKkxedy9p48avfk45r0bn4uc09i + foreign key (WORKFLOW_ID) + references CCM_CORE.WORKFLOWS; + + alter table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS + add constraint FKpq4paqtfbi5erhh98wl1ja005 + foreign key (ROLE_ID) + references CCM_CORE.CCM_ROLES; + + alter table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS + add constraint FK3933ol31co3yn5ee75b2hmhgp + foreign key (TASK_ID) + references CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS; + + alter table CCM_CORE.WORKFLOW_TASK_COMMENTS + add constraint FKd2ymdg8nay9pmh2nn2whba0j8 + foreign key (AUTHOR_ID) + references CCM_CORE.USERS; + + alter table CCM_CORE.WORKFLOW_TASK_COMMENTS + add constraint FKkfqrf9jdvm7livu5if06w0r5t + foreign key (TASK_ID) + references CCM_CORE.WORKFLOW_TASKS; + + alter table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES + add constraint FKy88tppv7ihx0lsn6g64f5lfq + foreign key (BLOCKED_TASK_ID) + references CCM_CORE.WORKFLOW_TASKS; + + alter table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES + add constraint FKrj80uilojn73u9a4xgk3vt0cj + foreign key (BLOCKING_TASK_ID) + references CCM_CORE.WORKFLOW_TASKS; + + alter table CCM_CORE.WORKFLOW_TASK_DESCRIPTIONS + add constraint FKeb7mqbdx3bk7t01vo7kp2hpf + foreign key (TASK_ID) + references CCM_CORE.WORKFLOW_TASKS; + + alter table CCM_CORE.WORKFLOW_TASK_LABELS + add constraint FKf715qud6g9xv2xeb8rrpnv4xs + foreign key (TASK_ID) + references CCM_CORE.WORKFLOW_TASKS; + + alter table CCM_CORE.WORKFLOW_TASKS + add constraint FK1693cbc36e4d8gucg8q7sc57e + foreign key (WORKFLOW_ID) + references CCM_CORE.WORKFLOWS; + + alter table CCM_CORE.WORKFLOWS + add constraint FKrm2yfrs6veoxoy304upq2wc64 + foreign key (OBJECT_ID) + references CCM_CORE.CCM_OBJECTS; + + alter table CCM_CORE.WORKFLOWS + add constraint FK9ray5beiny6wm2mi0uwyecay2 + foreign key (TEMPLATE_ID) + references CCM_CORE.WORKFLOWS; \ No newline at end of file diff --git a/ccm-shortcuts/src/test/resources/scripts/datasets-test/003_init_hibernate_sequence.sql b/ccm-shortcuts/src/test/resources/scripts/datasets-test/003_init_hibernate_sequence.sql new file mode 100644 index 000000000..57c9f6da6 --- /dev/null +++ b/ccm-shortcuts/src/test/resources/scripts/datasets-test/003_init_hibernate_sequence.sql @@ -0,0 +1,2 @@ +ALTER SEQUENCE hibernate_sequence RESTART WITH 100000; + diff --git a/ccm-testutils/src/main/java/org/libreccm/testutils/DatasetsVerifier.java b/ccm-testutils/src/main/java/org/libreccm/testutils/DatasetsVerifier.java index 1e7ad323d..defdb185f 100644 --- a/ccm-testutils/src/main/java/org/libreccm/testutils/DatasetsVerifier.java +++ b/ccm-testutils/src/main/java/org/libreccm/testutils/DatasetsVerifier.java @@ -47,7 +47,9 @@ import org.jboss.arquillian.persistence.dbunit.dataset.yaml.YamlDataSet; import java.io.InputStream; import java.io.StringReader; +import java.net.URL; import java.nio.charset.StandardCharsets; +import java.util.Objects; /** * @@ -149,7 +151,7 @@ public class DatasetsVerifier { switch (getDatasetType()) { case FLAT_XML: final FlatXmlDataSetBuilder builder - = new FlatXmlDataSetBuilder(); + = new FlatXmlDataSetBuilder(); dataSet = builder.build(inputStream); break; case JSON: @@ -167,7 +169,7 @@ public class DatasetsVerifier { //Create DBUnit DB connection final IDatabaseConnection dbUnitConn - = new DatabaseConnection(connection); + = new DatabaseConnection(connection); dbUnitConn.getConfig().setProperty( "http://www.dbunit.org/features/qualifiedTableNames", true); //Check if dumping works the DB works before loading the dataset. @@ -187,12 +189,17 @@ public class DatasetsVerifier { return new String[]{"/sql/ddl/auto/h2.sql"}; } - private void processDdlFile(final Connection connection, - final String ddlFile) throws URISyntaxException, - SQLException, - IOException { - final Path schemaPath = Paths.get(getClass().getResource(ddlFile) - .toURI()); + private void processDdlFile( + final Connection connection, final String ddlFile) + throws URISyntaxException, SQLException, IOException { + final URL resource = Objects.requireNonNull( + getClass().getResource(ddlFile), + String.format( + "Failed to get DDL file: %s,", + ddlFile + ) + ); + final Path schemaPath = Paths.get(resource.toURI()); RunScript.execute(connection, Files.newBufferedReader(schemaPath, StandardCharsets.UTF_8)); From 70b679052694570b9ba832c79f7b807cdcc481a8 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 18 Jul 2020 09:52:49 +0200 Subject: [PATCH 74/92] Fixed test failure in ccm-shortcuts --- ccm-shortcuts/pom.xml | 20 +++++++++++++ .../libreccm/shortcuts/ShortcutManagerIT.java | 28 ++++++++++++++++--- .../shortcuts/ShortcutRepositoryIT.java | 22 +++++++++++++-- .../src/test/resources/application.xml.off | 11 -------- .../src/test/resources/test-beans.xml.off | 11 -------- 5 files changed, 64 insertions(+), 28 deletions(-) delete mode 100644 ccm-shortcuts/src/test/resources/application.xml.off delete mode 100644 ccm-shortcuts/src/test/resources/test-beans.xml.off diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml index 536ac1573..aa16f3649 100644 --- a/ccm-shortcuts/pom.xml +++ b/ccm-shortcuts/pom.xml @@ -61,6 +61,26 @@ hibernate-validator provided + + org.hibernate + hibernate-validator-cdi + provided + + + + org.hibernate + hibernate-search-orm + provided + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-xml-provider + org.apache.logging.log4j diff --git a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerIT.java b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerIT.java index d69750125..980594955 100644 --- a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerIT.java +++ b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerIT.java @@ -62,9 +62,9 @@ import static org.junit.Assert.*; @Transactional(TransactionMode.COMMIT) @CreateSchema( { - "001_create_schema.sql", - "002_create_ccm_shortcuts_tables.sql", - "003_init_hibernate_sequence.sql" + "001_create_schema.sql", + "002_create_ccm_shortcuts_tables.sql", + "003_init_hibernate_sequence.sql" } ) @CleanupUsingScript(value = {"999_cleanup.sql"}, @@ -107,7 +107,27 @@ public class ShortcutManagerIT { return ShrinkWrap.create( WebArchive.class, "LibreCCM-org.libreccm.shortcuts.ShortcutTest-web.war") - .addPackages(true, "com.arsdigita", "org.libreccm") + .addPackage(org.libreccm.auditing.CcmRevision.class.getPackage()) + .addPackage(org.libreccm.categorization.Categorization.class + .getPackage()) + .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addPackage(org.libreccm.configuration.Configuration.class + .getPackage()) + .addPackage(org.libreccm.core.CcmCore.class.getPackage()) + .addPackage(org.libreccm.jpa.EntityManagerProducer.class + .getPackage()) + .addPackage(org.libreccm.l10n.LocalizedString.class + .getPackage()) + .addPackage(org.libreccm.security.Permission.class.getPackage()) + .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) + .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) + .addPackage(org.libreccm.tests.categories.IntegrationTest.class + .getPackage()) + .addClass(com.arsdigita.kernel.KernelConfig.class) + .addClass(org.libreccm.imexport.Exportable.class) + .addClass(org.libreccm.shortcuts.Shortcut.class) + .addClass(org.libreccm.shortcuts.ShortcutManager.class) + .addClass(org.libreccm.shortcuts.ShortcutRepository.class) .addAsLibraries(getModuleDependencies()) .addAsLibraries(getCcmCoreDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") diff --git a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryIT.java b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryIT.java index 86b14441f..16e38124d 100644 --- a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryIT.java +++ b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryIT.java @@ -19,6 +19,7 @@ package org.libreccm.shortcuts; import static org.libreccm.testutils.DependenciesHelpers.getCcmCoreDependencies; +import static org.libreccm.testutils.DependenciesHelpers.getModuleDependencies; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; @@ -105,8 +106,25 @@ public class ShortcutRepositoryIT { WebArchive.class, "LibreCCM-org.libreccm.shortcuts.ShortcutRepositoryTest-web.war" ) - .addPackages(true, "com.arsdigita", "org.libreccm") - //.addAsLibraries(getModuleDependencies()) + .addPackage(org.libreccm.auditing.CcmRevision.class.getPackage()) + .addPackage(org.libreccm.categorization.Categorization.class + .getPackage()) + .addPackage(org.libreccm.configuration.Configuration.class + .getPackage()) + .addPackage(org.libreccm.core.CcmCore.class.getPackage()) + .addPackage(org.libreccm.jpa.EntityManagerProducer.class + .getPackage()) + .addPackage(org.libreccm.l10n.LocalizedString.class + .getPackage()) + .addPackage(org.libreccm.security.Permission.class.getPackage()) + .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) + .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) + .addPackage(org.libreccm.tests.categories.IntegrationTest.class + .getPackage()) + .addClass(org.libreccm.imexport.Exportable.class) + .addClass(org.libreccm.shortcuts.Shortcut.class) + .addClass(org.libreccm.shortcuts.ShortcutRepository.class) + .addAsLibraries(getModuleDependencies()) .addAsLibraries(getCcmCoreDependencies()) .addAsResource( "test-persistence.xml", "META-INF/persistence.xml" diff --git a/ccm-shortcuts/src/test/resources/application.xml.off b/ccm-shortcuts/src/test/resources/application.xml.off deleted file mode 100644 index 10dae5667..000000000 --- a/ccm-shortcuts/src/test/resources/application.xml.off +++ /dev/null @@ -1,11 +0,0 @@ - - - ccm-bundle-shortcuts-test-wildfly - - - LibreCCM-org.libreccm.shortcuts.ShortcutTest-web.war - /libreccm-shortcuts-test - - - lib - diff --git a/ccm-shortcuts/src/test/resources/test-beans.xml.off b/ccm-shortcuts/src/test/resources/test-beans.xml.off deleted file mode 100644 index d45765d18..000000000 --- a/ccm-shortcuts/src/test/resources/test-beans.xml.off +++ /dev/null @@ -1,11 +0,0 @@ - - - - org.libreccm.security.AuthorizationInterceptor - - - From 6f43fc29a9102c1446b867566211129a85f32484 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 18 Jul 2020 12:09:20 +0200 Subject: [PATCH 75/92] Typo --- ccm-shortcuts/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml index 8e2ab17dd..3355da8f7 100644 --- a/ccm-shortcuts/pom.xml +++ b/ccm-shortcuts/pom.xml @@ -62,7 +62,7 @@ provided - org.hibernate + org.hibernate.validator hibernate-validator-cdi provided From 8b86772ebdb6722cbf17c087626c6ea13760bdd6 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 18 Jul 2020 12:50:28 +0200 Subject: [PATCH 76/92] Removed import for IntegrationTest category --- .../src/test/java/org/libreccm/shortcuts/ShortcutManagerIT.java | 2 -- .../test/java/org/libreccm/shortcuts/ShortcutRepositoryIT.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerIT.java b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerIT.java index 980594955..c82d70adf 100644 --- a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerIT.java +++ b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerIT.java @@ -121,8 +121,6 @@ public class ShortcutManagerIT { .addPackage(org.libreccm.security.Permission.class.getPackage()) .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) .addClass(com.arsdigita.kernel.KernelConfig.class) .addClass(org.libreccm.imexport.Exportable.class) .addClass(org.libreccm.shortcuts.Shortcut.class) diff --git a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryIT.java b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryIT.java index 16e38124d..027dfe57c 100644 --- a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryIT.java +++ b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryIT.java @@ -119,8 +119,6 @@ public class ShortcutRepositoryIT { .addPackage(org.libreccm.security.Permission.class.getPackage()) .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) .addClass(org.libreccm.imexport.Exportable.class) .addClass(org.libreccm.shortcuts.Shortcut.class) .addClass(org.libreccm.shortcuts.ShortcutRepository.class) From 28c884be8f59efc82f11d32b1fe32e9d24c5d766 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 18 Jul 2020 17:56:34 +0200 Subject: [PATCH 77/92] Removed IntegrationTest category, renamed resources, adapted profile for remote wildfly to use the maven-failsafe-plugin --- ...lass__Test.java => __moduleClass__IT.java} | 3 - ccm-cms/pom.xml | 264 +--- .../arquillian.xml | 0 .../scripts/001_create_schema.sql | 0 .../scripts/002_create_ccm_cms_tables.sql | 0 .../scripts/003_init_hibernate_sequence.sql | 0 .../scripts/999_cleanup.sql | 0 .../test-persistence.xml | 0 .../arquillian.xml | 0 .../scripts/001_create_schema.sql | 0 .../scripts/002_create_ccm_cms_tables.sql | 0 .../scripts/003_init_hibernate_sequence.sql | 0 .../scripts/999_cleanup.sql | 0 .../test-persistence.xml | 0 ccm-core/pom.xml | 266 +--- .../arquillian.xml | 0 .../scripts/001_create_schema.sql | 0 .../scripts/002_create_ccm_core_tables.sql | 0 .../scripts/003_init_hibernate_sequence.sql | 0 .../scripts/999_cleanup.sql | 0 .../test-persistence.xml | 0 .../arquillian.xml | 0 .../scripts/001_create_schema.sql | 0 .../scripts/002_create_ccm_core_tables.sql | 0 .../scripts/003_init_hibernate_sequence.sql | 0 .../scripts/999_cleanup.sql | 0 .../test-persistence.xml | 0 ccm-docrepo/pom.xml | 325 +--- .../portation/ArquillianExampleTest.java.off | 2 - .../portation/FilePortationTest.java.off | 5 - .../arquillian.xml | 40 - .../scripts/create_ccm_docrepo_schema.sql | 1329 ----------------- .../test-persistence.xml | 40 - .../arquillian.xml | 40 - .../scripts/create_ccm_docrepo_schema.sql | 1329 ----------------- .../test-persistence.xml | 40 - ccm-shortcuts/pom.xml | 270 +--- .../arquillian.xml | 0 .../scripts/001_create_schema.sql | 0 .../002_create_ccm_shortcuts_tables.sql | 0 .../scripts/003_init_hibernate_sequence.sql | 0 .../scripts/999_cleanup.sql | 0 .../test-persistence.xml | 0 .../arquillian.xml | 0 .../scripts/001_create_schema.sql | 0 .../002_create_ccm_shortcuts_tables.sql | 0 .../scripts/003_init_hibernate_sequence.sql | 0 .../scripts/999_cleanup.sql | 0 .../test-persistence.xml | 0 ccm-testutils/src/site/apt/index.apt | 42 - .../src/site/markdown/index.markdown | 33 + 51 files changed, 218 insertions(+), 3810 deletions(-) rename ccm-archetype-module/src/main/resources/archetype-resources/src/test/java/{__moduleClass__Test.java => __moduleClass__IT.java} (94%) rename ccm-cms/src/test/{resources-wildfly-remote-h2-mem => resources-wildfly-h2mem}/arquillian.xml (100%) rename ccm-cms/src/test/{resources-wildfly-remote-h2-mem => resources-wildfly-h2mem}/scripts/001_create_schema.sql (100%) rename ccm-cms/src/test/{resources-wildfly-remote-h2-mem => resources-wildfly-h2mem}/scripts/002_create_ccm_cms_tables.sql (100%) rename ccm-cms/src/test/{resources-wildfly-remote-h2-mem => resources-wildfly-h2mem}/scripts/003_init_hibernate_sequence.sql (100%) rename ccm-cms/src/test/{resources-wildfly-remote-h2-mem => resources-wildfly-h2mem}/scripts/999_cleanup.sql (100%) rename ccm-cms/src/test/{resources-wildfly-remote-h2-mem => resources-wildfly-h2mem}/test-persistence.xml (100%) rename ccm-cms/src/test/{resources-wildfly-remote-pgsql => resources-wildfly-pgsql}/arquillian.xml (100%) rename ccm-cms/src/test/{resources-wildfly-remote-pgsql => resources-wildfly-pgsql}/scripts/001_create_schema.sql (100%) rename ccm-cms/src/test/{resources-wildfly-remote-pgsql => resources-wildfly-pgsql}/scripts/002_create_ccm_cms_tables.sql (100%) rename ccm-cms/src/test/{resources-wildfly-remote-pgsql => resources-wildfly-pgsql}/scripts/003_init_hibernate_sequence.sql (100%) rename ccm-cms/src/test/{resources-wildfly-remote-pgsql => resources-wildfly-pgsql}/scripts/999_cleanup.sql (100%) rename ccm-cms/src/test/{resources-wildfly-remote-pgsql => resources-wildfly-pgsql}/test-persistence.xml (100%) rename ccm-core/src/test/{resources-wildfly-remote-h2-mem => resources-wildfly-h2mem}/arquillian.xml (100%) rename ccm-core/src/test/{resources-wildfly-remote-h2-mem => resources-wildfly-h2mem}/scripts/001_create_schema.sql (100%) rename ccm-core/src/test/{resources-wildfly-remote-h2-mem => resources-wildfly-h2mem}/scripts/002_create_ccm_core_tables.sql (100%) rename ccm-core/src/test/{resources-wildfly-remote-h2-mem => resources-wildfly-h2mem}/scripts/003_init_hibernate_sequence.sql (100%) rename ccm-core/src/test/{resources-wildfly-remote-h2-mem => resources-wildfly-h2mem}/scripts/999_cleanup.sql (100%) rename ccm-core/src/test/{resources-wildfly-remote-h2-mem => resources-wildfly-h2mem}/test-persistence.xml (100%) rename ccm-core/src/test/{resources-wildfly-remote-pgsql => resources-wildfly-pgsql}/arquillian.xml (100%) rename ccm-core/src/test/{resources-wildfly-remote-pgsql => resources-wildfly-pgsql}/scripts/001_create_schema.sql (100%) rename ccm-core/src/test/{resources-wildfly-remote-pgsql => resources-wildfly-pgsql}/scripts/002_create_ccm_core_tables.sql (100%) rename ccm-core/src/test/{resources-wildfly-remote-pgsql => resources-wildfly-pgsql}/scripts/003_init_hibernate_sequence.sql (100%) rename ccm-core/src/test/{resources-wildfly-remote-pgsql => resources-wildfly-pgsql}/scripts/999_cleanup.sql (100%) rename ccm-core/src/test/{resources-wildfly-remote-pgsql => resources-wildfly-pgsql}/test-persistence.xml (100%) delete mode 100644 ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/arquillian.xml delete mode 100644 ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_docrepo_schema.sql delete mode 100644 ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/test-persistence.xml delete mode 100644 ccm-docrepo/src/test/resources-wildfly-remote-pgsql/arquillian.xml delete mode 100644 ccm-docrepo/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_docrepo_schema.sql delete mode 100644 ccm-docrepo/src/test/resources-wildfly-remote-pgsql/test-persistence.xml rename ccm-shortcuts/src/test/{resources-wildfly-remote-h2-mem => resources-wildfly-h2mem}/arquillian.xml (100%) rename ccm-shortcuts/src/test/{resources-wildfly-remote-h2-mem => resources-wildfly-h2mem}/scripts/001_create_schema.sql (100%) rename ccm-shortcuts/src/test/{resources-wildfly-remote-h2-mem => resources-wildfly-h2mem}/scripts/002_create_ccm_shortcuts_tables.sql (100%) rename ccm-shortcuts/src/test/{resources-wildfly-remote-h2-mem => resources-wildfly-h2mem}/scripts/003_init_hibernate_sequence.sql (100%) rename ccm-shortcuts/src/test/{resources-wildfly-remote-h2-mem => resources-wildfly-h2mem}/scripts/999_cleanup.sql (100%) rename ccm-shortcuts/src/test/{resources-wildfly-remote-h2-mem => resources-wildfly-h2mem}/test-persistence.xml (100%) rename ccm-shortcuts/src/test/{resources-wildfly-remote-pgsql => resources-wildfly-pgsql}/arquillian.xml (100%) rename ccm-shortcuts/src/test/{resources-wildfly-remote-pgsql => resources-wildfly-pgsql}/scripts/001_create_schema.sql (100%) rename ccm-shortcuts/src/test/{resources-wildfly-remote-pgsql => resources-wildfly-pgsql}/scripts/002_create_ccm_shortcuts_tables.sql (100%) rename ccm-shortcuts/src/test/{resources-wildfly-remote-pgsql => resources-wildfly-pgsql}/scripts/003_init_hibernate_sequence.sql (100%) rename ccm-shortcuts/src/test/{resources-wildfly-remote-pgsql => resources-wildfly-pgsql}/scripts/999_cleanup.sql (100%) rename ccm-shortcuts/src/test/{resources-wildfly-remote-pgsql => resources-wildfly-pgsql}/test-persistence.xml (100%) delete mode 100644 ccm-testutils/src/site/apt/index.apt create mode 100644 ccm-testutils/src/site/markdown/index.markdown diff --git a/ccm-archetype-module/src/main/resources/archetype-resources/src/test/java/__moduleClass__Test.java b/ccm-archetype-module/src/main/resources/archetype-resources/src/test/java/__moduleClass__IT.java similarity index 94% rename from ccm-archetype-module/src/main/resources/archetype-resources/src/test/java/__moduleClass__Test.java rename to ccm-archetype-module/src/main/resources/archetype-resources/src/test/java/__moduleClass__IT.java index 91a1b9d6b..601637e48 100644 --- a/ccm-archetype-module/src/main/resources/archetype-resources/src/test/java/__moduleClass__Test.java +++ b/ccm-archetype-module/src/main/resources/archetype-resources/src/test/java/__moduleClass__IT.java @@ -26,9 +26,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.libreccm.tests.categories.IntegrationTest; import java.io.File; import java.util.List; @@ -39,7 +37,6 @@ import javax.persistence.PersistenceContext; import static org.junit.Assert.*; -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml index dd66848eb..7339dba5e 100644 --- a/ccm-cms/pom.xml +++ b/ccm-cms/pom.xml @@ -373,7 +373,7 @@ src/test/resources - src/test/resources-wildfly-remote-h2-mem + src/test/resources-wildfly-h2mem ${project.build.directory}/generated-resources @@ -522,7 +522,7 @@ src/test/resources - src/test/resources-wildfly-remote-pgsql + src/test/resources-wildfly-pgsql ${project.build.directory}/generated-resources @@ -675,190 +675,15 @@ - + - wildfly-managed-h2-mem - - - org.wildfly.arquillian - wildfly-arquillian-container-managed - test - - - org.jacoco - org.jacoco.core - test - - - org.jboss.arquillian.extension - arquillian-jacoco - - - net.sf.saxon - Saxon-HE - - - - - - - src/test/resources - - - src/test/resources-wildfly-remote-h2-mem - - - ${project.build.directory}/generated-resources - - - - - - de.jpdigital - hibernate53-ddl-maven-plugin - - - h2 - postgresql9 - - - org.libreccm - - true - - - - - gen-ddl - - process-classes - - - - - org.apache.maven.plugins - maven-surefire-plugin - - always - 999 - true - false - - org.jboss.logmanager.LogManager - - - false - - org.libreccm.tests.categories.UnitTest, - org.libreccm.tests.categories.IntegrationTest - - - - - - - - - wildfly-managed-pgsql - - - org.wildfly.arquillian - wildfly-arquillian-container-managed - test - - - org.jacoco - org.jacoco.core - test - - - org.jboss.arquillian.extension - arquillian-jacoco - - - net.sf.saxon - Saxon-HE - - - - - - - src/test/resources - - - src/test/resources-wildfly-remote-pgsql - - - ${project.build.directory}/generated-resources - - - - - - de.jpdigital - hibernate53-ddl-maven-plugin - - - h2 - postgresql9 - - - org.libreccm - - true - - - - - gen-ddl - - process-classes - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - always - 999 - true - - org.jboss.logmanager.LogManager - - - false - - org.libreccm.tests.categories.UnitTest, - org.libreccm.tests.categories.IntegrationTest - - - - - - - - - wildfly-remote-h2-mem + run-its-in-remote-wildfly-h2mem org.wildfly.arquillian wildfly-arquillian-container-remote test - - org.jacoco - org.jacoco.core - test - - - org.jboss.arquillian.extension - arquillian-jacoco - net.sf.saxon Saxon-HE @@ -871,7 +696,7 @@ src/test/resources - src/test/resources-wildfly-remote-h2-mem + src/test/resources-wildfly-h2mem ${project.build.directory}/generated-resources @@ -903,7 +728,15 @@ org.apache.maven.plugins - maven-surefire-plugin + maven-failsafe-plugin + + + + integration-test + verify + + + always 999 @@ -911,37 +744,39 @@ false org.jboss.logmanager.LogManager - false - - org.libreccm.tests.categories.UnitTest, - org.libreccm.tests.categories.IntegrationTest - + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + + + integration-tests + + failsafe-report-only + + + + + + - wildfly-remote-pgsql + run-its-in-remote-wildfly-pgsql org.wildfly.arquillian wildfly-arquillian-container-remote test - - org.jacoco - org.jacoco.core - test - - - org.jboss.arquillian.extension - arquillian-jacoco - net.sf.saxon Saxon-HE @@ -954,7 +789,7 @@ src/test/resources - src/test/resources-wildfly-remote-pgsql + src/test/resources-wildfly-pgsql ${project.build.directory}/generated-resources @@ -986,7 +821,15 @@ org.apache.maven.plugins - maven-surefire-plugin + maven-failsafe-plugin + + + + integration-test + verify + + + false always @@ -994,18 +837,29 @@ true org.jboss.logmanager.LogManager - false - - org.libreccm.tests.categories.UnitTest, - org.libreccm.tests.categories.IntegrationTest - + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + + + integration-tests + + failsafe-report-only + + + + + + diff --git a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/arquillian.xml b/ccm-cms/src/test/resources-wildfly-h2mem/arquillian.xml similarity index 100% rename from ccm-cms/src/test/resources-wildfly-remote-h2-mem/arquillian.xml rename to ccm-cms/src/test/resources-wildfly-h2mem/arquillian.xml diff --git a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql b/ccm-cms/src/test/resources-wildfly-h2mem/scripts/001_create_schema.sql similarity index 100% rename from ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql rename to ccm-cms/src/test/resources-wildfly-h2mem/scripts/001_create_schema.sql diff --git a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/002_create_ccm_cms_tables.sql b/ccm-cms/src/test/resources-wildfly-h2mem/scripts/002_create_ccm_cms_tables.sql similarity index 100% rename from ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/002_create_ccm_cms_tables.sql rename to ccm-cms/src/test/resources-wildfly-h2mem/scripts/002_create_ccm_cms_tables.sql diff --git a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/003_init_hibernate_sequence.sql b/ccm-cms/src/test/resources-wildfly-h2mem/scripts/003_init_hibernate_sequence.sql similarity index 100% rename from ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/003_init_hibernate_sequence.sql rename to ccm-cms/src/test/resources-wildfly-h2mem/scripts/003_init_hibernate_sequence.sql diff --git a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/999_cleanup.sql b/ccm-cms/src/test/resources-wildfly-h2mem/scripts/999_cleanup.sql similarity index 100% rename from ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/999_cleanup.sql rename to ccm-cms/src/test/resources-wildfly-h2mem/scripts/999_cleanup.sql diff --git a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/test-persistence.xml b/ccm-cms/src/test/resources-wildfly-h2mem/test-persistence.xml similarity index 100% rename from ccm-cms/src/test/resources-wildfly-remote-h2-mem/test-persistence.xml rename to ccm-cms/src/test/resources-wildfly-h2mem/test-persistence.xml diff --git a/ccm-cms/src/test/resources-wildfly-remote-pgsql/arquillian.xml b/ccm-cms/src/test/resources-wildfly-pgsql/arquillian.xml similarity index 100% rename from ccm-cms/src/test/resources-wildfly-remote-pgsql/arquillian.xml rename to ccm-cms/src/test/resources-wildfly-pgsql/arquillian.xml diff --git a/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/001_create_schema.sql b/ccm-cms/src/test/resources-wildfly-pgsql/scripts/001_create_schema.sql similarity index 100% rename from ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/001_create_schema.sql rename to ccm-cms/src/test/resources-wildfly-pgsql/scripts/001_create_schema.sql diff --git a/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_cms_tables.sql b/ccm-cms/src/test/resources-wildfly-pgsql/scripts/002_create_ccm_cms_tables.sql similarity index 100% rename from ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_cms_tables.sql rename to ccm-cms/src/test/resources-wildfly-pgsql/scripts/002_create_ccm_cms_tables.sql diff --git a/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/003_init_hibernate_sequence.sql b/ccm-cms/src/test/resources-wildfly-pgsql/scripts/003_init_hibernate_sequence.sql similarity index 100% rename from ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/003_init_hibernate_sequence.sql rename to ccm-cms/src/test/resources-wildfly-pgsql/scripts/003_init_hibernate_sequence.sql diff --git a/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/999_cleanup.sql b/ccm-cms/src/test/resources-wildfly-pgsql/scripts/999_cleanup.sql similarity index 100% rename from ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/999_cleanup.sql rename to ccm-cms/src/test/resources-wildfly-pgsql/scripts/999_cleanup.sql diff --git a/ccm-cms/src/test/resources-wildfly-remote-pgsql/test-persistence.xml b/ccm-cms/src/test/resources-wildfly-pgsql/test-persistence.xml similarity index 100% rename from ccm-cms/src/test/resources-wildfly-remote-pgsql/test-persistence.xml rename to ccm-cms/src/test/resources-wildfly-pgsql/test-persistence.xml diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index 4754df200..aa63f14ff 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -569,7 +569,11 @@ - + + + Required for WebServices and RESTful WebServices org.apache.openejb tomee-webservices @@ -680,10 +684,6 @@ ${project.basedir}/target/wildfly-8.2.0.Final/modules false - - org.libreccm.tests.categories.UnitTest, - org.libreccm.tests.categories.IntegrationTest - ${project.build.directory}/generated-resources @@ -757,175 +757,13 @@ 1.7.2 false - - org.libreccm.tests.categories.UnitTest, - org.libreccm.tests.categories.IntegrationTest - false - - - - wildfly-managed-h2-mem - - - org.wildfly.arquillian - wildfly-arquillian-container-managed - test - - - - net.sf.saxon - Saxon-HE - - - - - - - src/test/resources - - - src/test/resources-wildfly-remote-h2-mem - - - ${project.build.directory}/generated-resources - - - - - - de.jpdigital - hibernate53-ddl-maven-plugin - - - h2 - postgresql9 - - - org.libreccm - - true - - - - - gen-ddl - - process-classes - - - - - org.apache.maven.plugins - maven-surefire-plugin - - always - 999 - true - - org.jboss.logmanager.LogManager - - false - - org.libreccm.tests.categories.UnitTest, - org.libreccm.tests.categories.IntegrationTest - - false - - - - - - - - wildfly-managed-pgsql - - - org.wildfly.arquillian - wildfly-arquillian-container-managed - test - - - - net.sf.saxon - Saxon-HE - - - - - - - src/test/resources - - - src/test/resources-wildfly-remote-pgsql - - - ${project.build.directory}/generated-resources - - - - - - de.jpdigital - hibernate53-ddl-maven-plugin - - - h2 - postgresql9 - - - org.libreccm - - true - - - - - gen-ddl - - process-classes - - - - - org.apache.maven.plugins - maven-surefire-plugin - - always - 999 - true - - org.jboss.logmanager.LogManager - - false - - org.libreccm.tests.categories.UnitTest, - org.libreccm.tests.categories.IntegrationTest - - false - - - - - - + --> + run-its-with-wildfly-h2mem @@ -946,7 +784,7 @@ src/test/resources - src/test/resources-wildfly-remote-h2-mem + src/test/resources-wildfly-h2mem ${project.build.directory}/generated-resources @@ -1094,7 +932,7 @@ src/test/resources - src/test/resources-wildfly-remote-pgsql + src/test/resources-wildfly-pgsql ${project.build.directory}/generated-resources @@ -1249,22 +1087,13 @@ - wildfly-remote-h2-mem + run-its-in-remote-wildfly-h2mem org.wildfly.arquillian wildfly-arquillian-container-remote test - net.sf.saxon Saxon-HE @@ -1277,7 +1106,7 @@ src/test/resources - src/test/resources-wildfly-remote-h2-mem + src/test/resources-wildfly-h2mem ${project.build.directory}/generated-resources @@ -1309,7 +1138,15 @@ org.apache.maven.plugins - maven-surefire-plugin + maven-failsafe-plugin + + + + integration-test + verify + + + always 999 @@ -1318,30 +1155,38 @@ org.jboss.logmanager.LogManager false - - org.libreccm.tests.categories.UnitTest, - org.libreccm.tests.categories.IntegrationTest - false + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + + + integration-tests + + failsafe-report-only + + + + + + - wildfly-remote-pgsql + run-its-in-remote-wildfly-pgsql org.wildfly.arquillian wildfly-arquillian-container-remote test - net.sf.saxon Saxon-HE @@ -1354,7 +1199,7 @@ src/test/resources - src/test/resources-wildfly-remote-pgsql + src/test/resources-wildfly-pgsql ${project.build.directory}/generated-resources @@ -1386,7 +1231,15 @@ org.apache.maven.plugins - maven-surefire-plugin + maven-failsafe-plugin + + + + integration-test + verify + + + always 999 @@ -1395,15 +1248,28 @@ org.jboss.logmanager.LogManager false - - org.libreccm.tests.categories.UnitTest, - org.libreccm.tests.categories.IntegrationTest - false + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + + + integration-tests + + failsafe-report-only + + + + + + diff --git a/ccm-core/src/test/resources-wildfly-remote-h2-mem/arquillian.xml b/ccm-core/src/test/resources-wildfly-h2mem/arquillian.xml similarity index 100% rename from ccm-core/src/test/resources-wildfly-remote-h2-mem/arquillian.xml rename to ccm-core/src/test/resources-wildfly-h2mem/arquillian.xml diff --git a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql b/ccm-core/src/test/resources-wildfly-h2mem/scripts/001_create_schema.sql similarity index 100% rename from ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql rename to ccm-core/src/test/resources-wildfly-h2mem/scripts/001_create_schema.sql diff --git a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/002_create_ccm_core_tables.sql b/ccm-core/src/test/resources-wildfly-h2mem/scripts/002_create_ccm_core_tables.sql similarity index 100% rename from ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/002_create_ccm_core_tables.sql rename to ccm-core/src/test/resources-wildfly-h2mem/scripts/002_create_ccm_core_tables.sql diff --git a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/003_init_hibernate_sequence.sql b/ccm-core/src/test/resources-wildfly-h2mem/scripts/003_init_hibernate_sequence.sql similarity index 100% rename from ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/003_init_hibernate_sequence.sql rename to ccm-core/src/test/resources-wildfly-h2mem/scripts/003_init_hibernate_sequence.sql diff --git a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/999_cleanup.sql b/ccm-core/src/test/resources-wildfly-h2mem/scripts/999_cleanup.sql similarity index 100% rename from ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/999_cleanup.sql rename to ccm-core/src/test/resources-wildfly-h2mem/scripts/999_cleanup.sql diff --git a/ccm-core/src/test/resources-wildfly-remote-h2-mem/test-persistence.xml b/ccm-core/src/test/resources-wildfly-h2mem/test-persistence.xml similarity index 100% rename from ccm-core/src/test/resources-wildfly-remote-h2-mem/test-persistence.xml rename to ccm-core/src/test/resources-wildfly-h2mem/test-persistence.xml diff --git a/ccm-core/src/test/resources-wildfly-remote-pgsql/arquillian.xml b/ccm-core/src/test/resources-wildfly-pgsql/arquillian.xml similarity index 100% rename from ccm-core/src/test/resources-wildfly-remote-pgsql/arquillian.xml rename to ccm-core/src/test/resources-wildfly-pgsql/arquillian.xml diff --git a/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/001_create_schema.sql b/ccm-core/src/test/resources-wildfly-pgsql/scripts/001_create_schema.sql similarity index 100% rename from ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/001_create_schema.sql rename to ccm-core/src/test/resources-wildfly-pgsql/scripts/001_create_schema.sql diff --git a/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_core_tables.sql b/ccm-core/src/test/resources-wildfly-pgsql/scripts/002_create_ccm_core_tables.sql similarity index 100% rename from ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_core_tables.sql rename to ccm-core/src/test/resources-wildfly-pgsql/scripts/002_create_ccm_core_tables.sql diff --git a/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/003_init_hibernate_sequence.sql b/ccm-core/src/test/resources-wildfly-pgsql/scripts/003_init_hibernate_sequence.sql similarity index 100% rename from ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/003_init_hibernate_sequence.sql rename to ccm-core/src/test/resources-wildfly-pgsql/scripts/003_init_hibernate_sequence.sql diff --git a/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/999_cleanup.sql b/ccm-core/src/test/resources-wildfly-pgsql/scripts/999_cleanup.sql similarity index 100% rename from ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/999_cleanup.sql rename to ccm-core/src/test/resources-wildfly-pgsql/scripts/999_cleanup.sql diff --git a/ccm-core/src/test/resources-wildfly-remote-pgsql/test-persistence.xml b/ccm-core/src/test/resources-wildfly-pgsql/test-persistence.xml similarity index 100% rename from ccm-core/src/test/resources-wildfly-remote-pgsql/test-persistence.xml rename to ccm-core/src/test/resources-wildfly-pgsql/test-persistence.xml diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml index 92859132a..c65c751bf 100644 --- a/ccm-docrepo/pom.xml +++ b/ccm-docrepo/pom.xml @@ -242,7 +242,7 @@ true utf-8 1.8 - - - - - - de.jpdigital - hibernate53-ddl-maven-plugin - - - h2 - postgresql9 - - - org.libreccm - - true - - - - - gen-ddl - - process-classes - - - - - org.apache.maven.plugins - maven-surefire-plugin - - always - 999 - true - - org.jboss.logmanager.LogManager - - false - - org.libreccm.tests.categories.UnitTest, - org.libreccm.tests.categories.IntegrationTest - - - - - - - - - wildfly-managed-pgsql - - - org.wildfly.arquillian - wildfly-arquillian-container-managed - test - - - org.jacoco - org.jacoco.core - test - - - org.jboss.arquillian.extension - arquillian-jacoco - - - net.sf.saxon - Saxon-HE - - - - - - - src/test/resources - - - src/test/resources-wildfly-remote-pgsql - - - - - - - de.jpdigital - hibernate53-ddl-maven-plugin - - - h2 - postgresql9 - - - org.libreccm - - true - - - - - gen-ddl - - process-classes - - - - - org.apache.maven.plugins - maven-surefire-plugin - - always - 999 - true - - org.jboss.logmanager.LogManager - - false - - org.libreccm.tests.categories.UnitTest, - org.libreccm.tests.categories.IntegrationTest - - - - - - - - - wildfly-remote-h2-mem - - - org.wildfly.arquillian - wildfly-arquillian-container-remote - test - - - org.jacoco - org.jacoco.core - test - - - org.jboss.arquillian.extension - arquillian-jacoco - - - net.sf.saxon - Saxon-HE - - - - - - - src/test/resources - - - src/test/resources-wildfly-remote-h2-mem - - - - - - - de.jpdigital - hibernate53-ddl-maven-plugin - - - h2 - postgresql9 - - - org.libreccm - - true - - - - - gen-ddl - - process-classes - - - - - org.apache.maven.plugins - maven-surefire-plugin - - always - 999 - true - - org.jboss.logmanager.LogManager - - false - - org.libreccm.tests.categories.UnitTest, - org.libreccm.tests.categories.IntegrationTest - - - - - - - - - wildfly-remote-pgsql - - - org.wildfly.arquillian - wildfly-arquillian-container-remote - test - - - org.jacoco - org.jacoco.core - test - - - org.jboss.arquillian.extension - arquillian-jacoco - - - net.sf.saxon - Saxon-HE - - - - - - - src/test/resources - - - src/test/resources-wildfly-remote-pgsql - - - - - - - de.jpdigital - hibernate53-ddl-maven-plugin - - - h2 - postgresql9 - - - org.libreccm - - true - - - - - gen-ddl - - process-classes - - - - - org.apache.maven.plugins - maven-surefire-plugin - - always - 999 - true - - org.jboss.logmanager.LogManager - - false - - org.libreccm.tests.categories.UnitTest, - org.libreccm.tests.categories.IntegrationTest - - - - - - - - - diff --git a/ccm-docrepo/src/test/java/org/libreccm/docrepo/portation/ArquillianExampleTest.java.off b/ccm-docrepo/src/test/java/org/libreccm/docrepo/portation/ArquillianExampleTest.java.off index af0ac4d88..37601cf86 100644 --- a/ccm-docrepo/src/test/java/org/libreccm/docrepo/portation/ArquillianExampleTest.java.off +++ b/ccm-docrepo/src/test/java/org/libreccm/docrepo/portation/ArquillianExampleTest.java.off @@ -27,7 +27,6 @@ import org.libreccm.core.CcmObjectRepository; import org.libreccm.jpa.EntityManagerProducer; import org.libreccm.jpa.utils.MimeTypeConverter; import org.libreccm.l10n.LocalizedString; -import org.libreccm.tests.categories.IntegrationTest; import org.libreccm.testutils.EqualsVerifier; import org.libreccm.workflow.Workflow; @@ -101,7 +100,6 @@ public class ArquillianExampleTest { .addPackage(EntityManagerProducer.class.getPackage()) .addPackage(MimeTypeConverter.class.getPackage()) .addPackage(EqualsVerifier.class.getPackage()) - .addPackage(IntegrationTest.class.getPackage()) .addAsLibraries(getModuleDependencies()) .addAsLibraries(getCcmCoreDependencies()) .addAsResource("test-persistence.xml", diff --git a/ccm-docrepo/src/test/java/org/libreccm/docrepo/portation/FilePortationTest.java.off b/ccm-docrepo/src/test/java/org/libreccm/docrepo/portation/FilePortationTest.java.off index 866bea2d1..79ad18ce2 100644 --- a/ccm-docrepo/src/test/java/org/libreccm/docrepo/portation/FilePortationTest.java.off +++ b/ccm-docrepo/src/test/java/org/libreccm/docrepo/portation/FilePortationTest.java.off @@ -35,14 +35,12 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.libreccm.docrepo.File; import org.libreccm.docrepo.FileMarshaller; import org.libreccm.docrepo.FileRepository; import org.libreccm.portation.Format; import org.libreccm.portation.Marshals; -import org.libreccm.tests.categories.IntegrationTest; import javax.inject.Inject; import java.io.FileWriter; @@ -62,7 +60,6 @@ import static org.libreccm.testutils.DependenciesHelpers.getModuleDependencies; * @author Tobias Osmers * @version 13/01/2016 */ -@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) @@ -156,8 +153,6 @@ public class FilePortationTest { .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) .addPackage(org.libreccm.testutils.EqualsVerifier.class.getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) .addPackage(com.arsdigita.xml.CCMTransformerFactory.class .getPackage()) .addAsLibraries(getModuleDependencies()) diff --git a/ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/arquillian.xml b/ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/arquillian.xml deleted file mode 100644 index 4419c92c2..000000000 --- a/ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/arquillian.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - target/deployments - - - - - - java:/comp/env/jdbc/org/libreccm/ccm-docrepo/h2-mem - - - NONE - - true - target - - - - json - org.dbunit.ext.h2.H2DataTypeFactory - true - true - - - - scripts/h2-cleanup.sql - - - - diff --git a/ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_docrepo_schema.sql b/ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_docrepo_schema.sql deleted file mode 100644 index 7e6be987a..000000000 --- a/ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_docrepo_schema.sql +++ /dev/null @@ -1,1329 +0,0 @@ -DROP SCHEMA IF EXISTS ccm_docrepo CASCADE; -DROP SCHEMA IF EXISTS ccm_core CASCADE; - -DROP SEQUENCE IF EXISTS hibernate_sequence; - -CREATE SCHEMA ccm_core; -CREATE SCHEMA ccm_docrepo; - - create table CCM_CORE.APPLICATIONS ( - APPLICATION_TYPE varchar(1024) not null, - PRIMARY_URL varchar(1024) not null, - OBJECT_ID bigint not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.ATTACHMENTS ( - ATTACHMENT_ID bigint not null, - ATTACHMENT_DATA blob, - DESCRIPTION varchar(255), - MIME_TYPE varchar(255), - TITLE varchar(255), - MESSAGE_ID bigint, - primary key (ATTACHMENT_ID) - ); - - create table CCM_CORE.CATEGORIES ( - ABSTRACT_CATEGORY boolean, - CATEGORY_ORDER bigint, - ENABLED boolean, - NAME varchar(255) not null, - UNIQUE_ID varchar(255), - VISIBLE boolean, - OBJECT_ID bigint not null, - PARENT_CATEGORY_ID bigint, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.CATEGORIZATIONS ( - CATEGORIZATION_ID bigint not null, - CATEGORY_ORDER bigint, - CATEGORY_INDEX boolean, - OBJECT_ORDER bigint, - TYPE varchar(255), - OBJECT_ID bigint, - CATEGORY_ID bigint, - primary key (CATEGORIZATION_ID) - ); - - create table CCM_CORE.CATEGORY_DESCRIPTIONS ( - OBJECT_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (OBJECT_ID, LOCALE) - ); - - create table CCM_CORE.CATEGORY_DOMAINS ( - DOMAIN_KEY varchar(255) not null, - RELEASED timestamp, - URI varchar(1024), - VERSION varchar(255), - OBJECT_ID bigint not null, - ROOT_CATEGORY_ID bigint, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.CATEGORY_TITLES ( - OBJECT_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (OBJECT_ID, LOCALE) - ); - - create table CCM_CORE.CCM_OBJECTS ( - OBJECT_ID bigint not null, - DISPLAY_NAME varchar(255), - UUID varchar(255), - primary key (OBJECT_ID) - ); - - create table CCM_CORE.CCM_OBJECTS_AUD ( - OBJECT_ID bigint not null, - REV integer not null, - REVTYPE tinyint, - REVEND integer, - DISPLAY_NAME varchar(255), - primary key (OBJECT_ID, REV) - ); - - create table CCM_CORE.CCM_REVISIONS ( - id integer not null, - timestamp bigint not null, - USER_NAME varchar(255), - primary key (id) - ); - - create table CCM_CORE.CCM_ROLES ( - ROLE_ID bigint not null, - NAME varchar(512) not null, - primary key (ROLE_ID) - ); - - create table CCM_CORE.DIGESTS ( - FREQUENCY integer, - HEADER varchar(4096) not null, - NEXT_RUN timestamp, - DIGEST_SEPARATOR varchar(128) not null, - SIGNATURE varchar(4096) not null, - SUBJECT varchar(255) not null, - OBJECT_ID bigint not null, - FROM_PARTY_ID bigint, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.DOMAIN_DESCRIPTIONS ( - OBJECT_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (OBJECT_ID, LOCALE) - ); - - create table CCM_CORE.DOMAIN_OWNERSHIPS ( - OWNERSHIP_ID bigint not null, - CONTEXT varchar(255), - DOMAIN_ORDER bigint, - OWNER_ORDER bigint, - domain_OBJECT_ID bigint not null, - owner_OBJECT_ID bigint not null, - primary key (OWNERSHIP_ID) - ); - - create table CCM_CORE.DOMAIN_TITLES ( - OBJECT_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (OBJECT_ID, LOCALE) - ); - - create table CCM_CORE.FORMBUILDER_COMPONENT_DESCRIPTIONS ( - COMPONENT_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (COMPONENT_ID, LOCALE) - ); - - create table CCM_CORE.FORMBUILDER_COMPONENTS ( - ACTIVE boolean, - ADMIN_NAME varchar(255), - ATTRIBUTE_STRING varchar(255), - COMPONENT_ORDER bigint, - SELECTED boolean, - OBJECT_ID bigint not null, - parentComponent_OBJECT_ID bigint, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_CONFIRM_EMAIL_LISTENER ( - BODY clob, - FROM_EMAIL varchar(255), - SUBJECT varchar(255), - OBJECT_ID bigint not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_CONFIRM_REDIRECT_LISTENERS ( - URL varchar(255), - OBJECT_ID bigint not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_DATA_DRIVEN_SELECTS ( - MULTIPLE boolean, - QUERY varchar(255), - OBJECT_ID bigint not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_DATA_QUERIES ( - QUERY_ID varchar(255), - OBJECT_ID bigint not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_DATA_QUERY_DESCRIPTIONS ( - DATA_QUERY_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (DATA_QUERY_ID, LOCALE) - ); - - create table CCM_CORE.FORMBUILDER_DATA_QUERY_NAMES ( - DATA_QUERY_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (DATA_QUERY_ID, LOCALE) - ); - - create table CCM_CORE.FORMBUILDER_FORMSECTIONS ( - FORMSECTION_ACTION varchar(255), - OBJECT_ID bigint not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_LISTENERS ( - ATTRIBUTE_STRING varchar(255), - CLASS_NAME varchar(255), - OBJECT_ID bigint not null, - widget_OBJECT_ID bigint, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_METAOBJECTS ( - CLASS_NAME varchar(255), - PRETTY_NAME varchar(255), - PRETTY_PLURAL varchar(255), - PROPERTIES_FORM varchar(255), - OBJECT_ID bigint not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_OBJECT_TYPES ( - APP_NAME varchar(255), - CLASS_NAME varchar(255), - OBJECT_ID bigint not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_OPTION_LABELS ( - OPTION_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (OPTION_ID, LOCALE) - ); - - create table CCM_CORE.FORMBUILDER_OPTIONS ( - PARAMETER_VALUE varchar(255), - OBJECT_ID bigint not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_DESCRIPTIONS ( - PROCESS_LISTENER_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (PROCESS_LISTENER_ID, LOCALE) - ); - - create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_NAMES ( - PROCESS_LISTENER_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (PROCESS_LISTENER_ID, LOCALE) - ); - - create table CCM_CORE.FORMBUILDER_PROCESS_LISTENERS ( - LISTENER_CLASS varchar(255), - PROCESS_LISTENER_ORDER bigint, - OBJECT_ID bigint not null, - formSection_OBJECT_ID bigint, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_REMOTE_SERVER_POST_LISTENER ( - REMOTE_URL varchar(2048), - OBJECT_ID bigint not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_SIMPLE_EMAIL_LISTENERS ( - RECIPIENT varchar(255), - SUBJECT varchar(255), - OBJECT_ID bigint not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_TEMPLATE_EMAIL_LISTENERS ( - BODY clob, - RECIPIENT varchar(255), - SUBJECT varchar(255), - OBJECT_ID bigint not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_WIDGETS ( - DEFAULT_VALUE varchar(255), - PARAMETER_MODEL varchar(255), - PARAMETER_NAME varchar(255), - OBJECT_ID bigint not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_XML_EMAIL_LISTENERS ( - RECIPIENT varchar(255), - SUBJECT varchar(255), - OBJECT_ID bigint not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.GROUP_MEMBERSHIPS ( - MEMBERSHIP_ID bigint not null, - GROUP_ID bigint, - MEMBER_ID bigint, - primary key (MEMBERSHIP_ID) - ); - - create table CCM_CORE.GROUPS ( - PARTY_ID bigint not null, - primary key (PARTY_ID) - ); - - create table CCM_CORE.HOSTS ( - HOST_ID bigint not null, - SERVER_NAME varchar(512), - SERVER_PORT bigint, - primary key (HOST_ID) - ); - - create table CCM_CORE.INITS ( - INITIALIZER_ID bigint not null, - CLASS_NAME varchar(255), - REQUIRED_BY_ID bigint, - primary key (INITIALIZER_ID) - ); - - create table CCM_CORE.INSTALLED_MODULES ( - MODULE_ID integer not null, - MODULE_CLASS_NAME varchar(2048), - STATUS varchar(255), - primary key (MODULE_ID) - ); - - create table CCM_CORE.LUCENE_DOCUMENTS ( - DOCUMENT_ID bigint not null, - CONTENT clob, - CONTENT_SECTION varchar(512), - COUNTRY varchar(8), - CREATED timestamp, - DIRTY bigint, - DOCUMENT_LANGUAGE varchar(8), - LAST_MODIFIED timestamp, - SUMMARY varchar(4096), - DOCUMENT_TIMESTAMP timestamp, - TITLE varchar(4096), - TYPE varchar(255), - TYPE_SPECIFIC_INFO varchar(512), - CREATED_BY_PARTY_ID bigint, - LAST_MODIFIED_BY bigint, - primary key (DOCUMENT_ID) - ); - - create table CCM_CORE.LUCENE_INDEXES ( - INDEX_ID bigint not null, - LUCENE_INDEX_ID bigint, - HOST_ID bigint, - primary key (INDEX_ID) - ); - - create table CCM_CORE.MESSAGES ( - BODY varchar(255), - BODY_MIME_TYPE varchar(255), - SENT timestamp, - SUBJECT varchar(255), - OBJECT_ID bigint not null, - IN_REPLY_TO_ID bigint, - SENDER_ID bigint, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.NOTIFICATIONS ( - EXPAND_GROUP boolean, - EXPUNGE boolean, - EXPUNGE_MESSAGE boolean, - FULFILL_DATE timestamp, - HEADER varchar(4096), - MAX_RETRIES bigint, - REQUEST_DATE timestamp, - SIGNATURE varchar(4096), - STATUS varchar(32), - OBJECT_ID bigint not null, - DIGEST_ID bigint, - MESSAGE_ID bigint, - RECEIVER_ID bigint, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.ONE_TIME_AUTH_TOKENS ( - TOKEN_ID bigint not null, - PURPOSE varchar(255), - TOKEN varchar(255), - VALID_UNTIL timestamp, - USER_ID bigint, - primary key (TOKEN_ID) - ); - - create table CCM_CORE.PAGE_MODEL_COMPONENT_MODELS ( - COMPONENT_MODEL_ID bigint not null, - CLASS_ATTRIBUTE varchar(512), - ID_ATTRIBUTE varchar(255), - COMPONENT_KEY varchar(255), - MODEL_UUID varchar(255) not null, - STYLE_ATTRIBUTE varchar(1024), - UUID varchar(255) not null, - PAGE_MODEL_ID bigint, - primary key (COMPONENT_MODEL_ID) - ); - - create table CCM_CORE.PAGE_MODEL_DESCRIPTIONS ( - PAGE_MODEL_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (PAGE_MODEL_ID, LOCALE) - ); - - create table CCM_CORE.PAGE_MODEL_TITLES ( - PAGE_MODEL_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (PAGE_MODEL_ID, LOCALE) - ); - - create table CCM_CORE.PAGE_MODELS ( - PAGE_MODEL_ID bigint not null, - MODEL_UUID varchar(255) not null, - NAME varchar(255), - TYPE varchar(255) not null, - UUID varchar(255) not null, - VERSION varchar(255) not null, - APPLICATION_ID bigint, - primary key (PAGE_MODEL_ID) - ); - - create table CCM_CORE.PARTIES ( - PARTY_ID bigint not null, - NAME varchar(256) not null, - primary key (PARTY_ID) - ); - - create table CCM_CORE.PERMISSIONS ( - PERMISSION_ID bigint not null, - CREATION_DATE timestamp, - CREATION_IP varchar(255), - GRANTED_PRIVILEGE varchar(255), - INHERITED boolean, - CREATION_USER_ID bigint, - GRANTEE_ID bigint, - INHERITED_FROM_ID bigint, - OBJECT_ID bigint, - primary key (PERMISSION_ID) - ); - - create table CCM_CORE.PORTALS ( - TEMPLATE boolean, - OBJECT_ID bigint not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.PORTLETS ( - CELL_NUMBER bigint, - SORT_KEY bigint, - OBJECT_ID bigint not null, - PORTAL_ID bigint, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.QUEUE_ITEMS ( - QUEUE_ITEM_ID bigint not null, - HEADER varchar(4096), - RECEIVER_ADDRESS varchar(512), - RETRY_COUNT bigint, - SIGNATURE varchar(4096), - SUCCESSFUL_SENDED boolean, - MESSAGE_ID bigint, - RECEIVER_ID bigint, - primary key (QUEUE_ITEM_ID) - ); - - create table CCM_CORE.RESOURCE_DESCRIPTIONS ( - OBJECT_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (OBJECT_ID, LOCALE) - ); - - create table CCM_CORE.RESOURCE_TITLES ( - OBJECT_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (OBJECT_ID, LOCALE) - ); - - create table CCM_CORE.RESOURCE_TYPE_DESCRIPTIONS ( - RESOURCE_TYPE_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (RESOURCE_TYPE_ID, LOCALE) - ); - - create table CCM_CORE.RESOURCE_TYPES ( - RESOURCE_TYPE_ID bigint not null, - SINGLETON boolean, - TITLE varchar(254) not null, - EMBEDDED_VIEW boolean, - FULL_PAGE_VIEW boolean, - WORKSPACE_APP boolean, - primary key (RESOURCE_TYPE_ID) - ); - - create table CCM_CORE.RESOURCES ( - CREATED timestamp, - OBJECT_ID bigint not null, - parent_OBJECT_ID bigint, - resourceType_RESOURCE_TYPE_ID bigint, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.ROLE_DESCRIPTIONS ( - ROLE_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (ROLE_ID, LOCALE) - ); - - create table CCM_CORE.ROLE_MEMBERSHIPS ( - MEMBERSHIP_ID bigint not null, - MEMBER_ID bigint, - ROLE_ID bigint, - primary key (MEMBERSHIP_ID) - ); - - create table CCM_CORE.SETTINGS ( - DTYPE varchar(31) not null, - SETTING_ID bigint not null, - CONFIGURATION_CLASS varchar(512) not null, - NAME varchar(512) not null, - SETTING_VALUE_LONG bigint, - SETTING_VALUE_BOOLEAN boolean, - SETTING_VALUE_STRING varchar(1024), - SETTING_VALUE_DOUBLE double, - SETTING_VALUE_BIG_DECIMAL decimal(19,2), - primary key (SETTING_ID) - ); - - create table CCM_CORE.SETTINGS_ENUM_VALUES ( - ENUM_ID bigint not null, - value varchar(255) - ); - - create table CCM_CORE.SETTINGS_L10N_STR_VALUES ( - ENTRY_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (ENTRY_ID, LOCALE) - ); - - create table CCM_CORE.SETTINGS_STRING_LIST ( - LIST_ID bigint not null, - value varchar(255) - ); - - create table CCM_CORE.THREADS ( - OBJECT_ID bigint not null, - ROOT_ID bigint, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.USER_EMAIL_ADDRESSES ( - USER_ID bigint not null, - EMAIL_ADDRESS varchar(512) not null, - BOUNCING boolean, - VERIFIED boolean - ); - - create table CCM_CORE.USERS ( - BANNED boolean, - FAMILY_NAME varchar(512), - GIVEN_NAME varchar(512), - PASSWORD varchar(2048), - PASSWORD_RESET_REQUIRED boolean, - EMAIL_ADDRESS varchar(512) not null, - BOUNCING boolean, - VERIFIED boolean, - PARTY_ID bigint not null, - primary key (PARTY_ID) - ); - - create table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS ( - DUE_DATE timestamp, - DURATION_MINUTES bigint, - LOCKED boolean, - START_DATE timestamp, - TASK_ID bigint not null, - LOCKING_USER_ID bigint, - NOTIFICATION_SENDER bigint, - primary key (TASK_ID) - ); - - create table CCM_CORE.WORKFLOW_DESCRIPTIONS ( - WORKFLOW_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (WORKFLOW_ID, LOCALE) - ); - - create table CCM_CORE.WORKFLOW_NAMES ( - WORKFLOW_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (WORKFLOW_ID, LOCALE) - ); - - create table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS ( - TASK_ASSIGNMENT_ID bigint not null, - ROLE_ID bigint, - TASK_ID bigint, - primary key (TASK_ASSIGNMENT_ID) - ); - - create table CCM_CORE.WORKFLOW_TASK_COMMENTS ( - COMMENT_ID bigint not null, - COMMENT varchar(2147483647), - UUID varchar(255) not null, - AUTHOR_ID bigint, - TASK_ID bigint, - primary key (COMMENT_ID) - ); - - create table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES ( - DEPENDS_ON_TASK_ID bigint not null, - DEPENDENT_TASK_ID bigint not null - ); - - create table CCM_CORE.WORKFLOW_TASK_DESCRIPTIONS ( - TASK_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (TASK_ID, LOCALE) - ); - - create table CCM_CORE.WORKFLOW_TASK_LABELS ( - TASK_ID bigint not null, - LOCALIZED_VALUE varchar(2147483647), - LOCALE varchar(255) not null, - primary key (TASK_ID, LOCALE) - ); - - create table CCM_CORE.WORKFLOW_TASKS ( - TASK_ID bigint not null, - ACTIVE boolean, - TASK_STATE varchar(512), - UUID varchar(255) not null, - WORKFLOW_ID bigint, - primary key (TASK_ID) - ); - - create table CCM_CORE.WORKFLOWS ( - WORKFLOW_ID bigint not null, - abstract_workflow boolean, - ACTIVE boolean, - WORKFLOW_STATE varchar(255), - TASKS_STATE varchar(255), - UUID varchar(255) not null, - OBJECT_ID bigint, - TEMPLATE_ID bigint, - primary key (WORKFLOW_ID) - ); - - alter table CCM_CORE.CATEGORY_DOMAINS - add constraint UK_mb1riernf8a88u3mwl0bgfj8y unique (DOMAIN_KEY); - - alter table CCM_CORE.CATEGORY_DOMAINS - add constraint UK_i1xqotjvml7i6ro2jq22fxf5g unique (URI); - - alter table CCM_CORE.CCM_OBJECTS - add constraint UK_1cm71jlagvyvcnkqvxqyit3wx unique (UUID); - - alter table CCM_CORE.HOSTS - add constraint UK9ramlv6uxwt13v0wj7q0tucsx unique (SERVER_NAME, SERVER_PORT); - - alter table CCM_CORE.INSTALLED_MODULES - add constraint UK_11imwgfojyi4hpr18uw9g3jvx unique (MODULE_CLASS_NAME); - - alter table CCM_CORE.SETTINGS - add constraint UK5whinfxdaepqs09e5ia9y71uk unique (CONFIGURATION_CLASS, NAME); - - alter table CCM_CORE.WORKFLOW_TASK_COMMENTS - add constraint UK_4nnedf08odyjxalfkg16fmjoi unique (UUID); - - alter table CCM_CORE.WORKFLOW_TASKS - add constraint UK_2u6ruatxij8wfojl8a1eigqqd unique (UUID); - - alter table CCM_CORE.WORKFLOWS - add constraint UK_o113id7d1cxql0edsrohlnn9x unique (UUID); - - create table CCM_DOCREPO.BLOB_OBJECTS ( - BLOB_OBJECT_ID bigint not null, - CONTENT blob, - UUID varchar(255) not null, - primary key (BLOB_OBJECT_ID) - ); - - create table CCM_DOCREPO.FILES ( - OBJECT_ID bigint not null, - CONTENT_ID bigint, - primary key (OBJECT_ID) - ); - - create table CCM_DOCREPO.FOLDERS ( - OBJECT_ID bigint not null, - primary key (OBJECT_ID) - ); - - create table CCM_DOCREPO.REC_UPD_DOCS_PORTLETS ( - OBJECT_ID bigint not null, - primary key (OBJECT_ID) - ); - - create table CCM_DOCREPO.REPOSITORIES ( - NAME varchar(512) not null, - OBJECT_ID bigint not null, - OWNER_ID bigint not null, - ROOT_FOLDER_ID bigint not null, - primary key (OBJECT_ID) - ); - - create table CCM_DOCREPO.RESOURCES ( - CREATION_DATE timestamp not null, - CREATION_IP varchar(255), - DESCRIPTION varchar(255), - LAST_MODIFIED_DATE timestamp not null, - LAST_MODIFIED_IP varchar(255), - MIME_TYPE varchar(255), - NAME varchar(512) not null, - PATH varchar(255), - SIZE bigint, - OBJECT_ID bigint not null, - CREATION_USER_ID bigint, - LAST_MODIFIED_USER_ID bigint, - PARENT_ID bigint, - REPOSITORY_ID bigint, - primary key (OBJECT_ID) - ); - - alter table CCM_DOCREPO.REPOSITORIES - add constraint UK_n24tjtffp9k0wwng0p6s86mrp unique (NAME); - - alter table CCM_DOCREPO.REPOSITORIES - add constraint UK_li6a82kt97qrftfobdo1bweaq unique (ROOT_FOLDER_ID); - - alter table CCM_DOCREPO.RESOURCES - add constraint UK_5do2fx5we845tevs441mbdotm unique (NAME); - - alter table CCM_DOCREPO.RESOURCES - add constraint UK_gl32co8ta3opblaihamh6d0fk unique (PATH); - - create sequence hibernate_sequence start with 1 increment by 1; - - alter table CCM_CORE.APPLICATIONS - add constraint FKatcp9ij6mbkx0nfeig1o6n3lm - foreign key (OBJECT_ID) - references CCM_CORE.RESOURCES; - - alter table CCM_CORE.ATTACHMENTS - add constraint FK8ju9hm9baceridp803nislkwb - foreign key (MESSAGE_ID) - references CCM_CORE.MESSAGES; - - alter table CCM_CORE.CATEGORIES - add constraint FKrj3marx99nheur4fqanm0ylur - foreign key (PARENT_CATEGORY_ID) - references CCM_CORE.CATEGORIES; - - alter table CCM_CORE.CATEGORIES - add constraint FKpm291swli2musd0204phta652 - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.CATEGORIZATIONS - add constraint FKejp0ubk034nfq60v1po6srkke - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.CATEGORIZATIONS - add constraint FKoyeipswl876wa6mqwbx0uy83h - foreign key (CATEGORY_ID) - references CCM_CORE.CATEGORIES; - - alter table CCM_CORE.CATEGORY_DESCRIPTIONS - add constraint FKhiwjlmh5vkbu3v3vng1la1qum - foreign key (OBJECT_ID) - references CCM_CORE.CATEGORIES; - - alter table CCM_CORE.CATEGORY_DOMAINS - add constraint FKf25vi73cji01w8fgo6ow1dgg - foreign key (ROOT_CATEGORY_ID) - references CCM_CORE.CATEGORIES; - - alter table CCM_CORE.CATEGORY_DOMAINS - add constraint FK58xpmnvciohkom1c16oua4xha - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.CATEGORY_TITLES - add constraint FKka9bt9f5br0kji5bcjxcmf6ch - foreign key (OBJECT_ID) - references CCM_CORE.CATEGORIES; - - alter table CCM_CORE.CCM_OBJECTS_AUD - add constraint FKr00eauutiyvocno8ckx6h9nw6 - foreign key (REV) - references CCM_CORE.CCM_REVISIONS; - - alter table CCM_CORE.CCM_OBJECTS_AUD - add constraint FKo5s37ctcdny7tmewjwv7705h5 - foreign key (REVEND) - references CCM_CORE.CCM_REVISIONS; - - alter table CCM_CORE.DIGESTS - add constraint FKc53g09agnye3w1v4euy3e0gsi - foreign key (FROM_PARTY_ID) - references CCM_CORE.PARTIES; - - alter table CCM_CORE.DIGESTS - add constraint FK845r9ep6xu6nbt1mvxulwybym - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.DOMAIN_DESCRIPTIONS - add constraint FKn4i2dxgn8cqysa62dds6eih6a - foreign key (OBJECT_ID) - references CCM_CORE.CATEGORY_DOMAINS; - - alter table CCM_CORE.DOMAIN_OWNERSHIPS - add constraint FK47nsasr7jrdwlky5gx0u6e9py - foreign key (domain_OBJECT_ID) - references CCM_CORE.CATEGORY_DOMAINS; - - alter table CCM_CORE.DOMAIN_OWNERSHIPS - add constraint FK3u4hq6yqau4m419b1xva3xpwq - foreign key (owner_OBJECT_ID) - references CCM_CORE.APPLICATIONS; - - alter table CCM_CORE.DOMAIN_TITLES - add constraint FK5p526dsdwn94els6lp5w0hdn4 - foreign key (OBJECT_ID) - references CCM_CORE.CATEGORY_DOMAINS; - - alter table CCM_CORE.FORMBUILDER_COMPONENT_DESCRIPTIONS - add constraint FKfh0k9lj3pf4amfc9bbbss0tr1 - foreign key (COMPONENT_ID) - references CCM_CORE.FORMBUILDER_COMPONENTS; - - alter table CCM_CORE.FORMBUILDER_COMPONENTS - add constraint FKpcpmvyiix023b4g5n4q8nkfca - foreign key (parentComponent_OBJECT_ID) - references CCM_CORE.FORMBUILDER_COMPONENTS; - - alter table CCM_CORE.FORMBUILDER_COMPONENTS - add constraint FKt0e0uv00pp1rwhyaltrytghnm - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.FORMBUILDER_CONFIRM_EMAIL_LISTENER - add constraint FK48khrbud3xhi2gvsvnlttd8tg - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; - - alter table CCM_CORE.FORMBUILDER_CONFIRM_REDIRECT_LISTENERS - add constraint FKbyjjt2ufendvje2obtge2l7et - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; - - alter table CCM_CORE.FORMBUILDER_DATA_DRIVEN_SELECTS - add constraint FK8oriyta1957u7dvbrqk717944 - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_WIDGETS; - - alter table CCM_CORE.FORMBUILDER_DATA_QUERIES - add constraint FKhhaxpeddbtmrnjr5o0fopju3a - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.FORMBUILDER_DATA_QUERY_DESCRIPTIONS - add constraint FKsmduu1opoiulkeo2gc8v7lsbn - foreign key (DATA_QUERY_ID) - references CCM_CORE.FORMBUILDER_DATA_QUERIES; - - alter table CCM_CORE.FORMBUILDER_DATA_QUERY_NAMES - add constraint FKju1x82inrw3kguyjuxoetn6gn - foreign key (DATA_QUERY_ID) - references CCM_CORE.FORMBUILDER_DATA_QUERIES; - - alter table CCM_CORE.FORMBUILDER_FORMSECTIONS - add constraint FKnfhsgxp4lvigq2pm33pn4afac - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_COMPONENTS; - - alter table CCM_CORE.FORMBUILDER_LISTENERS - add constraint FK33ilyirwoux28yowafgd5xx0o - foreign key (widget_OBJECT_ID) - references CCM_CORE.FORMBUILDER_WIDGETS; - - alter table CCM_CORE.FORMBUILDER_LISTENERS - add constraint FKlqm76746nq5yrt8ganm474uu0 - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.FORMBUILDER_METAOBJECTS - add constraint FKf963v6u9mw8pwjmasrw51w8dx - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.FORMBUILDER_OBJECT_TYPES - add constraint FKkv337e83rsecf0h3qy8bu7l9w - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.FORMBUILDER_OPTION_LABELS - add constraint FKatlsylsvln6yse55eof6wwkj6 - foreign key (OPTION_ID) - references CCM_CORE.FORMBUILDER_OPTIONS; - - alter table CCM_CORE.FORMBUILDER_OPTIONS - add constraint FKhe5q71wby9g4i56sotc501h11 - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_COMPONENTS; - - alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_DESCRIPTIONS - add constraint FKcv3iu04gxjk9c0pn6tl8rqqv3 - foreign key (PROCESS_LISTENER_ID) - references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; - - alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_NAMES - add constraint FK8rnyb1m6ij3b9hhmhr7klgd4p - foreign key (PROCESS_LISTENER_ID) - references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; - - alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENERS - add constraint FK7uiaeax8qafm82e5k729ms5ku - foreign key (formSection_OBJECT_ID) - references CCM_CORE.FORMBUILDER_FORMSECTIONS; - - alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENERS - add constraint FKbdnloo884qk6gn36jwiqv5rlp - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.FORMBUILDER_REMOTE_SERVER_POST_LISTENER - add constraint FKpajvu9m6fj1enm67a9gcb5ii9 - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; - - alter table CCM_CORE.FORMBUILDER_SIMPLE_EMAIL_LISTENERS - add constraint FKsn82ktlq0c9ikijyv8k2bfv4f - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; - - alter table CCM_CORE.FORMBUILDER_TEMPLATE_EMAIL_LISTENERS - add constraint FK8kjyu72btjsuaaqh4bvd8npns - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; - - alter table CCM_CORE.FORMBUILDER_WIDGETS - add constraint FK1wosr4ujbfckdc50u5fgmrhrk - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_COMPONENTS; - - alter table CCM_CORE.FORMBUILDER_XML_EMAIL_LISTENERS - add constraint FKjie9co03m7ow4ihig5rk7l8oj - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; - - alter table CCM_CORE.GROUP_MEMBERSHIPS - add constraint FKq4qnny8ri3eo7eqh4olxco8nk - foreign key (GROUP_ID) - references CCM_CORE.GROUPS; - - alter table CCM_CORE.GROUP_MEMBERSHIPS - add constraint FKc8u86ivkhvoiw6ju8b2p365he - foreign key (MEMBER_ID) - references CCM_CORE.USERS; - - alter table CCM_CORE.GROUPS - add constraint FK4f61mlqxw0ct6s7wwpi9m0735 - foreign key (PARTY_ID) - references CCM_CORE.PARTIES; - - alter table CCM_CORE.INITS - add constraint FK3nvvxk10nmq9nfuko8yklqdgc - foreign key (REQUIRED_BY_ID) - references CCM_CORE.INITS; - - alter table CCM_CORE.LUCENE_DOCUMENTS - add constraint FK942kl4yff8rdiwr0pjk2a9g8 - foreign key (CREATED_BY_PARTY_ID) - references CCM_CORE.USERS; - - alter table CCM_CORE.LUCENE_DOCUMENTS - add constraint FKc5rs6afx4p9fidabfqsxr5ble - foreign key (LAST_MODIFIED_BY) - references CCM_CORE.USERS; - - alter table CCM_CORE.LUCENE_INDEXES - add constraint FK6gu0yrlviqk07dtb3r02iw43f - foreign key (HOST_ID) - references CCM_CORE.HOSTS; - - alter table CCM_CORE.MESSAGES - add constraint FKph10aehmg9f20pn2w4buki97q - foreign key (IN_REPLY_TO_ID) - references CCM_CORE.MESSAGES; - - alter table CCM_CORE.MESSAGES - add constraint FKjufsx3c3h538fj35h8hgfnb1p - foreign key (SENDER_ID) - references CCM_CORE.USERS; - - alter table CCM_CORE.MESSAGES - add constraint FK6w20ao7scwecd9mfwpun2ddqx - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.NOTIFICATIONS - add constraint FKqk70c1x1dklhty9ju5t4wukd9 - foreign key (DIGEST_ID) - references CCM_CORE.DIGESTS; - - alter table CCM_CORE.NOTIFICATIONS - add constraint FKtt4fjr2p75og79jxxgd8q8mr - foreign key (MESSAGE_ID) - references CCM_CORE.MESSAGES; - - alter table CCM_CORE.NOTIFICATIONS - add constraint FK2vlnma0ox43j0clx8ead08n5s - foreign key (RECEIVER_ID) - references CCM_CORE.PARTIES; - - alter table CCM_CORE.NOTIFICATIONS - add constraint FKf423hhiaw1bexpxeh1pnas7qt - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.ONE_TIME_AUTH_TOKENS - add constraint FKtplfuphkiorfkttaewb4wmfjc - foreign key (USER_ID) - references CCM_CORE.USERS; - - alter table CCM_CORE.PAGE_MODEL_COMPONENT_MODELS - add constraint FKo696ch035fe7rrueol1po13od - foreign key (PAGE_MODEL_ID) - references CCM_CORE.PAGE_MODELS; - - alter table CCM_CORE.PAGE_MODEL_DESCRIPTIONS - add constraint FKcc5d6eqxu1369k8ycyyt6vn3e - foreign key (PAGE_MODEL_ID) - references CCM_CORE.PAGE_MODELS; - - alter table CCM_CORE.PAGE_MODEL_TITLES - add constraint FKj14q9911yhd4js9p6rs21rwjf - foreign key (PAGE_MODEL_ID) - references CCM_CORE.PAGE_MODELS; - - alter table CCM_CORE.PAGE_MODELS - add constraint FKk2lihllrxj89mn3tqv43amafe - foreign key (APPLICATION_ID) - references CCM_CORE.APPLICATIONS; - - alter table CCM_CORE.PERMISSIONS - add constraint FKj9di7pawxgtouxmu2k44bj5c4 - foreign key (CREATION_USER_ID) - references CCM_CORE.USERS; - - alter table CCM_CORE.PERMISSIONS - add constraint FKikx3x0kn9fito23g50v6xbr9f - foreign key (GRANTEE_ID) - references CCM_CORE.CCM_ROLES; - - alter table CCM_CORE.PERMISSIONS - add constraint FKg56ujjoe0j30pq579rf0l5yc6 - foreign key (INHERITED_FROM_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.PERMISSIONS - add constraint FKkamckexjnffnt8lay9nqeawhm - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.PORTALS - add constraint FK5a2hdrbw03mmgr74vj5nxlpvk - foreign key (OBJECT_ID) - references CCM_CORE.RESOURCES; - - alter table CCM_CORE.PORTLETS - add constraint FK9gr5xjt3rx4uhtw7vl6adruol - foreign key (PORTAL_ID) - references CCM_CORE.PORTALS; - - alter table CCM_CORE.PORTLETS - add constraint FKjmx9uebt0gwxkw3xv34niy35f - foreign key (OBJECT_ID) - references CCM_CORE.RESOURCES; - - alter table CCM_CORE.QUEUE_ITEMS - add constraint FKtgkwfruv9kjdybf46l02da088 - foreign key (MESSAGE_ID) - references CCM_CORE.MESSAGES; - - alter table CCM_CORE.QUEUE_ITEMS - add constraint FKs9aq1hyxstwmvx7fmfifp4x7r - foreign key (RECEIVER_ID) - references CCM_CORE.PARTIES; - - alter table CCM_CORE.RESOURCE_DESCRIPTIONS - add constraint FKk9arvj5u21rv23ce3cav4opqx - foreign key (OBJECT_ID) - references CCM_CORE.RESOURCES; - - alter table CCM_CORE.RESOURCE_TITLES - add constraint FKto4p6n2wklljyf7tmuxtmyfe0 - foreign key (OBJECT_ID) - references CCM_CORE.RESOURCES; - - alter table CCM_CORE.RESOURCE_TYPE_DESCRIPTIONS - add constraint FKckpihjtv23iahbg3imnpbsr2 - foreign key (RESOURCE_TYPE_ID) - references CCM_CORE.RESOURCE_TYPES; - - alter table CCM_CORE.RESOURCES - add constraint FKbo7ibfgodicn9flv2gfo11g5a - foreign key (parent_OBJECT_ID) - references CCM_CORE.RESOURCES; - - alter table CCM_CORE.RESOURCES - add constraint FK262fbwetpjx3k4uuvw24wsiv - foreign key (resourceType_RESOURCE_TYPE_ID) - references CCM_CORE.RESOURCE_TYPES; - - alter table CCM_CORE.RESOURCES - add constraint FKbjdf8pm4frth8r06ev2qjm88f - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.ROLE_DESCRIPTIONS - add constraint FKo09bh4j3k3k0ph3awvjwx31ft - foreign key (ROLE_ID) - references CCM_CORE.CCM_ROLES; - - alter table CCM_CORE.ROLE_MEMBERSHIPS - add constraint FK9m88ywi7rcin7b7jrgh53emrq - foreign key (MEMBER_ID) - references CCM_CORE.PARTIES; - - alter table CCM_CORE.ROLE_MEMBERSHIPS - add constraint FKcsyogv5m2rgsrmtgnhgkjhfw7 - foreign key (ROLE_ID) - references CCM_CORE.CCM_ROLES; - - alter table CCM_CORE.SETTINGS_ENUM_VALUES - add constraint FK8mw4p92s0h3h8bmo8saowu32i - foreign key (ENUM_ID) - references CCM_CORE.SETTINGS; - - alter table CCM_CORE.SETTINGS_L10N_STR_VALUES - add constraint FK5knjq7cisej0qfx5dw1y93rou - foreign key (ENTRY_ID) - references CCM_CORE.SETTINGS; - - alter table CCM_CORE.SETTINGS_STRING_LIST - add constraint FKqeclqa5sf1g53vxs857tpwrus - foreign key (LIST_ID) - references CCM_CORE.SETTINGS; - - alter table CCM_CORE.THREADS - add constraint FKsx08mpwvwnw97uwdgjs76q39g - foreign key (ROOT_ID) - references CCM_CORE.MESSAGES; - - alter table CCM_CORE.THREADS - add constraint FKp97b1sy1kop07rtapeh5l9fb2 - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.USER_EMAIL_ADDRESSES - add constraint FKr900l79erul95seyyccf04ufc - foreign key (USER_ID) - references CCM_CORE.USERS; - - alter table CCM_CORE.USERS - add constraint FKosh928q71aonu6l1kurb417r - foreign key (PARTY_ID) - references CCM_CORE.PARTIES; - - alter table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS - add constraint FK1pnsq9ur3ylq0ghuj23p4cogs - foreign key (LOCKING_USER_ID) - references CCM_CORE.USERS; - - alter table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS - add constraint FK9ngp088m8xa82swy7yg3qx6vh - foreign key (NOTIFICATION_SENDER) - references CCM_CORE.USERS; - - alter table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS - add constraint FKt9ha3no3bj8a50pnw8cnqh2cq - foreign key (TASK_ID) - references CCM_CORE.WORKFLOW_TASKS; - - alter table CCM_CORE.WORKFLOW_DESCRIPTIONS - add constraint FKgx7upkqky82dpxvbs95imfl9l - foreign key (WORKFLOW_ID) - references CCM_CORE.WORKFLOWS; - - alter table CCM_CORE.WORKFLOW_NAMES - add constraint FKkxedy9p48avfk45r0bn4uc09i - foreign key (WORKFLOW_ID) - references CCM_CORE.WORKFLOWS; - - alter table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS - add constraint FKpq4paqtfbi5erhh98wl1ja005 - foreign key (ROLE_ID) - references CCM_CORE.CCM_ROLES; - - alter table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS - add constraint FK3933ol31co3yn5ee75b2hmhgp - foreign key (TASK_ID) - references CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS; - - alter table CCM_CORE.WORKFLOW_TASK_COMMENTS - add constraint FKd2ymdg8nay9pmh2nn2whba0j8 - foreign key (AUTHOR_ID) - references CCM_CORE.USERS; - - alter table CCM_CORE.WORKFLOW_TASK_COMMENTS - add constraint FKkfqrf9jdvm7livu5if06w0r5t - foreign key (TASK_ID) - references CCM_CORE.WORKFLOW_TASKS; - - alter table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES - add constraint FK1htp420ki24jaswtcum56iawe - foreign key (DEPENDENT_TASK_ID) - references CCM_CORE.WORKFLOW_TASKS; - - alter table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES - add constraint FK8rbggnp4yjpab8quvvx800ymy - foreign key (DEPENDS_ON_TASK_ID) - references CCM_CORE.WORKFLOW_TASKS; - - alter table CCM_CORE.WORKFLOW_TASK_DESCRIPTIONS - add constraint FKeb7mqbdx3bk7t01vo7kp2hpf - foreign key (TASK_ID) - references CCM_CORE.WORKFLOW_TASKS; - - alter table CCM_CORE.WORKFLOW_TASK_LABELS - add constraint FKf715qud6g9xv2xeb8rrpnv4xs - foreign key (TASK_ID) - references CCM_CORE.WORKFLOW_TASKS; - - alter table CCM_CORE.WORKFLOW_TASKS - add constraint FK1693cbc36e4d8gucg8q7sc57e - foreign key (WORKFLOW_ID) - references CCM_CORE.WORKFLOWS; - - alter table CCM_CORE.WORKFLOWS - add constraint FKrm2yfrs6veoxoy304upq2wc64 - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.WORKFLOWS - add constraint FK9ray5beiny6wm2mi0uwyecay2 - foreign key (TEMPLATE_ID) - references CCM_CORE.WORKFLOWS; - - alter table CCM_DOCREPO.FILES - add constraint FK2hsq6npoqb0gnvj9blucdy0cp - foreign key (CONTENT_ID) - references CCM_DOCREPO.BLOB_OBJECTS; - - alter table CCM_DOCREPO.FILES - add constraint FKj29rqxnqsxub552uxng0ekyj4 - foreign key (OBJECT_ID) - references CCM_DOCREPO.RESOURCES; - - alter table CCM_DOCREPO.FOLDERS - add constraint FKnmxkqionnxqc7ye70npa5ikp0 - foreign key (OBJECT_ID) - references CCM_DOCREPO.RESOURCES; - - alter table CCM_DOCREPO.REC_UPD_DOCS_PORTLETS - add constraint FKaxwcfqi3ssgmdhhsqy2m258vc - foreign key (OBJECT_ID) - references CCM_CORE.PORTLETS; - - alter table CCM_DOCREPO.REPOSITORIES - add constraint FKovamdv1r9txoqbp7sw4i55pwu - foreign key (OWNER_ID) - references CCM_CORE.USERS; - - alter table CCM_DOCREPO.REPOSITORIES - add constraint FKr3nbsglhju8b24vxkcie08g1k - foreign key (ROOT_FOLDER_ID) - references CCM_DOCREPO.FOLDERS; - - alter table CCM_DOCREPO.REPOSITORIES - add constraint FKdjq3yme7ow441nw4as9dqy0we - foreign key (OBJECT_ID) - references CCM_CORE.APPLICATIONS; - - alter table CCM_DOCREPO.RESOURCES - add constraint FK7fv70w41xca4tduehyb1ye2c6 - foreign key (CREATION_USER_ID) - references CCM_CORE.USERS; - - alter table CCM_DOCREPO.RESOURCES - add constraint FK9jl78hpalagwr323bl561qsgj - foreign key (LAST_MODIFIED_USER_ID) - references CCM_CORE.USERS; - - alter table CCM_DOCREPO.RESOURCES - add constraint FKap5pdovro7cgbn4jrs77nqa6o - foreign key (PARENT_ID) - references CCM_DOCREPO.FOLDERS; - - alter table CCM_DOCREPO.RESOURCES - add constraint FKpn78v9bfo6ak34kqbe3g6nb1n - foreign key (REPOSITORY_ID) - references CCM_DOCREPO.REPOSITORIES; - - alter table CCM_DOCREPO.RESOURCES - add constraint FKbjdf8pm4frth8r06ev2qjm88f - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; \ No newline at end of file diff --git a/ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/test-persistence.xml b/ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/test-persistence.xml deleted file mode 100644 index 67bc5597a..000000000 --- a/ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/test-persistence.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - org.hibernate.jpa.HibernatePersistenceProvider - - java:/comp/env/jdbc/org/libreccm/ccm-docrepo/h2-mem - - - - - - - - - - - - diff --git a/ccm-docrepo/src/test/resources-wildfly-remote-pgsql/arquillian.xml b/ccm-docrepo/src/test/resources-wildfly-remote-pgsql/arquillian.xml deleted file mode 100644 index 9b77862db..000000000 --- a/ccm-docrepo/src/test/resources-wildfly-remote-pgsql/arquillian.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - target/deployments - - - - - - java:/comp/env/jdbc/org/libreccm/ccm-docrepo/pgsql - - - NONE - - true - target - - - - json - - true - true - - - - scripts/pgsql-cleanup.sql - - - - diff --git a/ccm-docrepo/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_docrepo_schema.sql b/ccm-docrepo/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_docrepo_schema.sql deleted file mode 100644 index b5ba2e154..000000000 --- a/ccm-docrepo/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_docrepo_schema.sql +++ /dev/null @@ -1,1329 +0,0 @@ -DROP SCHEMA IF EXISTS ccm_docrepo; -DROP SCHEMA IF EXISTS ccm_core; - -DROP SEQUENCE IF EXISTS hibernate_sequence; - -CREATE SCHEMA ccm_core; -CREATE SCHEMA ccm_docrepo; - - create table CCM_CORE.APPLICATIONS ( - APPLICATION_TYPE varchar(1024) not null, - PRIMARY_URL varchar(1024) not null, - OBJECT_ID int8 not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.ATTACHMENTS ( - ATTACHMENT_ID int8 not null, - ATTACHMENT_DATA oid, - DESCRIPTION varchar(255), - MIME_TYPE varchar(255), - TITLE varchar(255), - MESSAGE_ID int8, - primary key (ATTACHMENT_ID) - ); - - create table CCM_CORE.CATEGORIES ( - ABSTRACT_CATEGORY boolean, - CATEGORY_ORDER int8, - ENABLED boolean, - NAME varchar(255) not null, - UNIQUE_ID varchar(255), - VISIBLE boolean, - OBJECT_ID int8 not null, - PARENT_CATEGORY_ID int8, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.CATEGORIZATIONS ( - CATEGORIZATION_ID int8 not null, - CATEGORY_ORDER int8, - CATEGORY_INDEX boolean, - OBJECT_ORDER int8, - TYPE varchar(255), - OBJECT_ID int8, - CATEGORY_ID int8, - primary key (CATEGORIZATION_ID) - ); - - create table CCM_CORE.CATEGORY_DESCRIPTIONS ( - OBJECT_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (OBJECT_ID, LOCALE) - ); - - create table CCM_CORE.CATEGORY_DOMAINS ( - DOMAIN_KEY varchar(255) not null, - RELEASED timestamp, - URI varchar(1024), - VERSION varchar(255), - OBJECT_ID int8 not null, - ROOT_CATEGORY_ID int8, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.CATEGORY_TITLES ( - OBJECT_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (OBJECT_ID, LOCALE) - ); - - create table CCM_CORE.CCM_OBJECTS ( - OBJECT_ID int8 not null, - DISPLAY_NAME varchar(255), - UUID varchar(255), - primary key (OBJECT_ID) - ); - - create table CCM_CORE.CCM_OBJECTS_AUD ( - OBJECT_ID int8 not null, - REV int4 not null, - REVTYPE int2, - REVEND int4, - DISPLAY_NAME varchar(255), - primary key (OBJECT_ID, REV) - ); - - create table CCM_CORE.CCM_REVISIONS ( - id int4 not null, - timestamp int8 not null, - USER_NAME varchar(255), - primary key (id) - ); - - create table CCM_CORE.CCM_ROLES ( - ROLE_ID int8 not null, - NAME varchar(512) not null, - primary key (ROLE_ID) - ); - - create table CCM_CORE.DIGESTS ( - FREQUENCY int4, - HEADER varchar(4096) not null, - NEXT_RUN timestamp, - DIGEST_SEPARATOR varchar(128) not null, - SIGNATURE varchar(4096) not null, - SUBJECT varchar(255) not null, - OBJECT_ID int8 not null, - FROM_PARTY_ID int8, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.DOMAIN_DESCRIPTIONS ( - OBJECT_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (OBJECT_ID, LOCALE) - ); - - create table CCM_CORE.DOMAIN_OWNERSHIPS ( - OWNERSHIP_ID int8 not null, - CONTEXT varchar(255), - DOMAIN_ORDER int8, - OWNER_ORDER int8, - domain_OBJECT_ID int8 not null, - owner_OBJECT_ID int8 not null, - primary key (OWNERSHIP_ID) - ); - - create table CCM_CORE.DOMAIN_TITLES ( - OBJECT_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (OBJECT_ID, LOCALE) - ); - - create table CCM_CORE.FORMBUILDER_COMPONENT_DESCRIPTIONS ( - COMPONENT_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (COMPONENT_ID, LOCALE) - ); - - create table CCM_CORE.FORMBUILDER_COMPONENTS ( - ACTIVE boolean, - ADMIN_NAME varchar(255), - ATTRIBUTE_STRING varchar(255), - COMPONENT_ORDER int8, - SELECTED boolean, - OBJECT_ID int8 not null, - parentComponent_OBJECT_ID int8, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_CONFIRM_EMAIL_LISTENER ( - BODY text, - FROM_EMAIL varchar(255), - SUBJECT varchar(255), - OBJECT_ID int8 not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_CONFIRM_REDIRECT_LISTENERS ( - URL varchar(255), - OBJECT_ID int8 not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_DATA_DRIVEN_SELECTS ( - MULTIPLE boolean, - QUERY varchar(255), - OBJECT_ID int8 not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_DATA_QUERIES ( - QUERY_ID varchar(255), - OBJECT_ID int8 not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_DATA_QUERY_DESCRIPTIONS ( - DATA_QUERY_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (DATA_QUERY_ID, LOCALE) - ); - - create table CCM_CORE.FORMBUILDER_DATA_QUERY_NAMES ( - DATA_QUERY_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (DATA_QUERY_ID, LOCALE) - ); - - create table CCM_CORE.FORMBUILDER_FORMSECTIONS ( - FORMSECTION_ACTION varchar(255), - OBJECT_ID int8 not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_LISTENERS ( - ATTRIBUTE_STRING varchar(255), - CLASS_NAME varchar(255), - OBJECT_ID int8 not null, - widget_OBJECT_ID int8, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_METAOBJECTS ( - CLASS_NAME varchar(255), - PRETTY_NAME varchar(255), - PRETTY_PLURAL varchar(255), - PROPERTIES_FORM varchar(255), - OBJECT_ID int8 not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_OBJECT_TYPES ( - APP_NAME varchar(255), - CLASS_NAME varchar(255), - OBJECT_ID int8 not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_OPTION_LABELS ( - OPTION_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (OPTION_ID, LOCALE) - ); - - create table CCM_CORE.FORMBUILDER_OPTIONS ( - PARAMETER_VALUE varchar(255), - OBJECT_ID int8 not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_DESCRIPTIONS ( - PROCESS_LISTENER_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (PROCESS_LISTENER_ID, LOCALE) - ); - - create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_NAMES ( - PROCESS_LISTENER_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (PROCESS_LISTENER_ID, LOCALE) - ); - - create table CCM_CORE.FORMBUILDER_PROCESS_LISTENERS ( - LISTENER_CLASS varchar(255), - PROCESS_LISTENER_ORDER int8, - OBJECT_ID int8 not null, - formSection_OBJECT_ID int8, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_REMOTE_SERVER_POST_LISTENER ( - REMOTE_URL varchar(2048), - OBJECT_ID int8 not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_SIMPLE_EMAIL_LISTENERS ( - RECIPIENT varchar(255), - SUBJECT varchar(255), - OBJECT_ID int8 not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_TEMPLATE_EMAIL_LISTENERS ( - BODY text, - RECIPIENT varchar(255), - SUBJECT varchar(255), - OBJECT_ID int8 not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_WIDGETS ( - DEFAULT_VALUE varchar(255), - PARAMETER_MODEL varchar(255), - PARAMETER_NAME varchar(255), - OBJECT_ID int8 not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.FORMBUILDER_XML_EMAIL_LISTENERS ( - RECIPIENT varchar(255), - SUBJECT varchar(255), - OBJECT_ID int8 not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.GROUP_MEMBERSHIPS ( - MEMBERSHIP_ID int8 not null, - GROUP_ID int8, - MEMBER_ID int8, - primary key (MEMBERSHIP_ID) - ); - - create table CCM_CORE.GROUPS ( - PARTY_ID int8 not null, - primary key (PARTY_ID) - ); - - create table CCM_CORE.HOSTS ( - HOST_ID int8 not null, - SERVER_NAME varchar(512), - SERVER_PORT int8, - primary key (HOST_ID) - ); - - create table CCM_CORE.INITS ( - INITIALIZER_ID int8 not null, - CLASS_NAME varchar(255), - REQUIRED_BY_ID int8, - primary key (INITIALIZER_ID) - ); - - create table CCM_CORE.INSTALLED_MODULES ( - MODULE_ID int4 not null, - MODULE_CLASS_NAME varchar(2048), - STATUS varchar(255), - primary key (MODULE_ID) - ); - - create table CCM_CORE.LUCENE_DOCUMENTS ( - DOCUMENT_ID int8 not null, - CONTENT text, - CONTENT_SECTION varchar(512), - COUNTRY varchar(8), - CREATED timestamp, - DIRTY int8, - DOCUMENT_LANGUAGE varchar(8), - LAST_MODIFIED timestamp, - SUMMARY varchar(4096), - DOCUMENT_TIMESTAMP timestamp, - TITLE varchar(4096), - TYPE varchar(255), - TYPE_SPECIFIC_INFO varchar(512), - CREATED_BY_PARTY_ID int8, - LAST_MODIFIED_BY int8, - primary key (DOCUMENT_ID) - ); - - create table CCM_CORE.LUCENE_INDEXES ( - INDEX_ID int8 not null, - LUCENE_INDEX_ID int8, - HOST_ID int8, - primary key (INDEX_ID) - ); - - create table CCM_CORE.MESSAGES ( - BODY varchar(255), - BODY_MIME_TYPE varchar(255), - SENT timestamp, - SUBJECT varchar(255), - OBJECT_ID int8 not null, - IN_REPLY_TO_ID int8, - SENDER_ID int8, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.NOTIFICATIONS ( - EXPAND_GROUP boolean, - EXPUNGE boolean, - EXPUNGE_MESSAGE boolean, - FULFILL_DATE timestamp, - HEADER varchar(4096), - MAX_RETRIES int8, - REQUEST_DATE timestamp, - SIGNATURE varchar(4096), - STATUS varchar(32), - OBJECT_ID int8 not null, - DIGEST_ID int8, - MESSAGE_ID int8, - RECEIVER_ID int8, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.ONE_TIME_AUTH_TOKENS ( - TOKEN_ID int8 not null, - PURPOSE varchar(255), - TOKEN varchar(255), - VALID_UNTIL timestamp, - USER_ID int8, - primary key (TOKEN_ID) - ); - - create table CCM_CORE.PAGE_MODEL_COMPONENT_MODELS ( - COMPONENT_MODEL_ID int8 not null, - CLASS_ATTRIBUTE varchar(512), - ID_ATTRIBUTE varchar(255), - COMPONENT_KEY varchar(255), - MODEL_UUID varchar(255) not null, - STYLE_ATTRIBUTE varchar(1024), - UUID varchar(255) not null, - PAGE_MODEL_ID int8, - primary key (COMPONENT_MODEL_ID) - ); - - create table CCM_CORE.PAGE_MODEL_DESCRIPTIONS ( - PAGE_MODEL_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (PAGE_MODEL_ID, LOCALE) - ); - - create table CCM_CORE.PAGE_MODEL_TITLES ( - PAGE_MODEL_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (PAGE_MODEL_ID, LOCALE) - ); - - create table CCM_CORE.PAGE_MODELS ( - PAGE_MODEL_ID int8 not null, - MODEL_UUID varchar(255) not null, - NAME varchar(255), - TYPE varchar(255) not null, - UUID varchar(255) not null, - VERSION varchar(255) not null, - APPLICATION_ID int8, - primary key (PAGE_MODEL_ID) - ); - - create table CCM_CORE.PARTIES ( - PARTY_ID int8 not null, - NAME varchar(256) not null, - primary key (PARTY_ID) - ); - - create table CCM_CORE.PERMISSIONS ( - PERMISSION_ID int8 not null, - CREATION_DATE timestamp, - CREATION_IP varchar(255), - GRANTED_PRIVILEGE varchar(255), - INHERITED boolean, - CREATION_USER_ID int8, - GRANTEE_ID int8, - INHERITED_FROM_ID int8, - OBJECT_ID int8, - primary key (PERMISSION_ID) - ); - - create table CCM_CORE.PORTALS ( - TEMPLATE boolean, - OBJECT_ID int8 not null, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.PORTLETS ( - CELL_NUMBER int8, - SORT_KEY int8, - OBJECT_ID int8 not null, - PORTAL_ID int8, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.QUEUE_ITEMS ( - QUEUE_ITEM_ID int8 not null, - HEADER varchar(4096), - RECEIVER_ADDRESS varchar(512), - RETRY_COUNT int8, - SIGNATURE varchar(4096), - SUCCESSFUL_SENDED boolean, - MESSAGE_ID int8, - RECEIVER_ID int8, - primary key (QUEUE_ITEM_ID) - ); - - create table CCM_CORE.RESOURCE_DESCRIPTIONS ( - OBJECT_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (OBJECT_ID, LOCALE) - ); - - create table CCM_CORE.RESOURCE_TITLES ( - OBJECT_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (OBJECT_ID, LOCALE) - ); - - create table CCM_CORE.RESOURCE_TYPE_DESCRIPTIONS ( - RESOURCE_TYPE_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (RESOURCE_TYPE_ID, LOCALE) - ); - - create table CCM_CORE.RESOURCE_TYPES ( - RESOURCE_TYPE_ID int8 not null, - SINGLETON boolean, - TITLE varchar(254) not null, - EMBEDDED_VIEW boolean, - FULL_PAGE_VIEW boolean, - WORKSPACE_APP boolean, - primary key (RESOURCE_TYPE_ID) - ); - - create table CCM_CORE.RESOURCES ( - CREATED timestamp, - OBJECT_ID int8 not null, - parent_OBJECT_ID int8, - resourceType_RESOURCE_TYPE_ID int8, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.ROLE_DESCRIPTIONS ( - ROLE_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (ROLE_ID, LOCALE) - ); - - create table CCM_CORE.ROLE_MEMBERSHIPS ( - MEMBERSHIP_ID int8 not null, - MEMBER_ID int8, - ROLE_ID int8, - primary key (MEMBERSHIP_ID) - ); - - create table CCM_CORE.SETTINGS ( - DTYPE varchar(31) not null, - SETTING_ID int8 not null, - CONFIGURATION_CLASS varchar(512) not null, - NAME varchar(512) not null, - SETTING_VALUE_LONG int8, - SETTING_VALUE_BOOLEAN boolean, - SETTING_VALUE_STRING varchar(1024), - SETTING_VALUE_DOUBLE float8, - SETTING_VALUE_BIG_DECIMAL numeric(19, 2), - primary key (SETTING_ID) - ); - - create table CCM_CORE.SETTINGS_ENUM_VALUES ( - ENUM_ID int8 not null, - value varchar(255) - ); - - create table CCM_CORE.SETTINGS_L10N_STR_VALUES ( - ENTRY_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (ENTRY_ID, LOCALE) - ); - - create table CCM_CORE.SETTINGS_STRING_LIST ( - LIST_ID int8 not null, - value varchar(255) - ); - - create table CCM_CORE.THREADS ( - OBJECT_ID int8 not null, - ROOT_ID int8, - primary key (OBJECT_ID) - ); - - create table CCM_CORE.USER_EMAIL_ADDRESSES ( - USER_ID int8 not null, - EMAIL_ADDRESS varchar(512) not null, - BOUNCING boolean, - VERIFIED boolean - ); - - create table CCM_CORE.USERS ( - BANNED boolean, - FAMILY_NAME varchar(512), - GIVEN_NAME varchar(512), - PASSWORD varchar(2048), - PASSWORD_RESET_REQUIRED boolean, - EMAIL_ADDRESS varchar(512) not null, - BOUNCING boolean, - VERIFIED boolean, - PARTY_ID int8 not null, - primary key (PARTY_ID) - ); - - create table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS ( - DUE_DATE timestamp, - DURATION_MINUTES int8, - LOCKED boolean, - START_DATE timestamp, - TASK_ID int8 not null, - LOCKING_USER_ID int8, - NOTIFICATION_SENDER int8, - primary key (TASK_ID) - ); - - create table CCM_CORE.WORKFLOW_DESCRIPTIONS ( - WORKFLOW_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (WORKFLOW_ID, LOCALE) - ); - - create table CCM_CORE.WORKFLOW_NAMES ( - WORKFLOW_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (WORKFLOW_ID, LOCALE) - ); - - create table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS ( - TASK_ASSIGNMENT_ID int8 not null, - ROLE_ID int8, - TASK_ID int8, - primary key (TASK_ASSIGNMENT_ID) - ); - - create table CCM_CORE.WORKFLOW_TASK_COMMENTS ( - COMMENT_ID int8 not null, - COMMENT text, - UUID varchar(255) not null, - AUTHOR_ID int8, - TASK_ID int8, - primary key (COMMENT_ID) - ); - - create table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES ( - DEPENDS_ON_TASK_ID int8 not null, - DEPENDENT_TASK_ID int8 not null - ); - - create table CCM_CORE.WORKFLOW_TASK_DESCRIPTIONS ( - TASK_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (TASK_ID, LOCALE) - ); - - create table CCM_CORE.WORKFLOW_TASK_LABELS ( - TASK_ID int8 not null, - LOCALIZED_VALUE text, - LOCALE varchar(255) not null, - primary key (TASK_ID, LOCALE) - ); - - create table CCM_CORE.WORKFLOW_TASKS ( - TASK_ID int8 not null, - ACTIVE boolean, - TASK_STATE varchar(512), - UUID varchar(255) not null, - WORKFLOW_ID int8, - primary key (TASK_ID) - ); - - create table CCM_CORE.WORKFLOWS ( - WORKFLOW_ID int8 not null, - abstract_workflow boolean, - ACTIVE boolean, - WORKFLOW_STATE varchar(255), - TASKS_STATE varchar(255), - UUID varchar(255) not null, - OBJECT_ID int8, - TEMPLATE_ID int8, - primary key (WORKFLOW_ID) - ); - - alter table CCM_CORE.CATEGORY_DOMAINS - add constraint UK_mb1riernf8a88u3mwl0bgfj8y unique (DOMAIN_KEY); - - alter table CCM_CORE.CATEGORY_DOMAINS - add constraint UK_i1xqotjvml7i6ro2jq22fxf5g unique (URI); - - alter table CCM_CORE.CCM_OBJECTS - add constraint UK_1cm71jlagvyvcnkqvxqyit3wx unique (UUID); - - alter table CCM_CORE.HOSTS - add constraint UK9ramlv6uxwt13v0wj7q0tucsx unique (SERVER_NAME, SERVER_PORT); - - alter table CCM_CORE.INSTALLED_MODULES - add constraint UK_11imwgfojyi4hpr18uw9g3jvx unique (MODULE_CLASS_NAME); - - alter table CCM_CORE.SETTINGS - add constraint UK5whinfxdaepqs09e5ia9y71uk unique (CONFIGURATION_CLASS, NAME); - - alter table CCM_CORE.WORKFLOW_TASK_COMMENTS - add constraint UK_4nnedf08odyjxalfkg16fmjoi unique (UUID); - - alter table CCM_CORE.WORKFLOW_TASKS - add constraint UK_2u6ruatxij8wfojl8a1eigqqd unique (UUID); - - alter table CCM_CORE.WORKFLOWS - add constraint UK_o113id7d1cxql0edsrohlnn9x unique (UUID); - - create table CCM_DOCREPO.BLOB_OBJECTS ( - BLOB_OBJECT_ID int8 not null, - CONTENT oid, - UUID varchar(255) not null, - primary key (BLOB_OBJECT_ID) - ); - - create table CCM_DOCREPO.FILES ( - OBJECT_ID int8 not null, - CONTENT_ID int8, - primary key (OBJECT_ID) - ); - - create table CCM_DOCREPO.FOLDERS ( - OBJECT_ID int8 not null, - primary key (OBJECT_ID) - ); - - create table CCM_DOCREPO.REC_UPD_DOCS_PORTLETS ( - OBJECT_ID int8 not null, - primary key (OBJECT_ID) - ); - - create table CCM_DOCREPO.REPOSITORIES ( - NAME varchar(512) not null, - OBJECT_ID int8 not null, - OWNER_ID int8 not null, - ROOT_FOLDER_ID int8 not null, - primary key (OBJECT_ID) - ); - - create table CCM_DOCREPO.RESOURCES ( - CREATION_DATE timestamp not null, - CREATION_IP varchar(255), - DESCRIPTION varchar(255), - LAST_MODIFIED_DATE timestamp not null, - LAST_MODIFIED_IP varchar(255), - MIME_TYPE varchar(255), - NAME varchar(512) not null, - PATH varchar(255), - SIZE int8, - OBJECT_ID int8 not null, - CREATION_USER_ID int8, - LAST_MODIFIED_USER_ID int8, - PARENT_ID int8, - REPOSITORY_ID int8, - primary key (OBJECT_ID) - ); - - alter table CCM_DOCREPO.REPOSITORIES - add constraint UK_n24tjtffp9k0wwng0p6s86mrp unique (NAME); - - alter table CCM_DOCREPO.REPOSITORIES - add constraint UK_li6a82kt97qrftfobdo1bweaq unique (ROOT_FOLDER_ID); - - alter table CCM_DOCREPO.RESOURCES - add constraint UK_5do2fx5we845tevs441mbdotm unique (NAME); - - alter table CCM_DOCREPO.RESOURCES - add constraint UK_gl32co8ta3opblaihamh6d0fk unique (PATH); - - create sequence hibernate_sequence start 1 increment 1; - - alter table CCM_CORE.APPLICATIONS - add constraint FKatcp9ij6mbkx0nfeig1o6n3lm - foreign key (OBJECT_ID) - references CCM_CORE.RESOURCES; - - alter table CCM_CORE.ATTACHMENTS - add constraint FK8ju9hm9baceridp803nislkwb - foreign key (MESSAGE_ID) - references CCM_CORE.MESSAGES; - - alter table CCM_CORE.CATEGORIES - add constraint FKrj3marx99nheur4fqanm0ylur - foreign key (PARENT_CATEGORY_ID) - references CCM_CORE.CATEGORIES; - - alter table CCM_CORE.CATEGORIES - add constraint FKpm291swli2musd0204phta652 - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.CATEGORIZATIONS - add constraint FKejp0ubk034nfq60v1po6srkke - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.CATEGORIZATIONS - add constraint FKoyeipswl876wa6mqwbx0uy83h - foreign key (CATEGORY_ID) - references CCM_CORE.CATEGORIES; - - alter table CCM_CORE.CATEGORY_DESCRIPTIONS - add constraint FKhiwjlmh5vkbu3v3vng1la1qum - foreign key (OBJECT_ID) - references CCM_CORE.CATEGORIES; - - alter table CCM_CORE.CATEGORY_DOMAINS - add constraint FKf25vi73cji01w8fgo6ow1dgg - foreign key (ROOT_CATEGORY_ID) - references CCM_CORE.CATEGORIES; - - alter table CCM_CORE.CATEGORY_DOMAINS - add constraint FK58xpmnvciohkom1c16oua4xha - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.CATEGORY_TITLES - add constraint FKka9bt9f5br0kji5bcjxcmf6ch - foreign key (OBJECT_ID) - references CCM_CORE.CATEGORIES; - - alter table CCM_CORE.CCM_OBJECTS_AUD - add constraint FKr00eauutiyvocno8ckx6h9nw6 - foreign key (REV) - references CCM_CORE.CCM_REVISIONS; - - alter table CCM_CORE.CCM_OBJECTS_AUD - add constraint FKo5s37ctcdny7tmewjwv7705h5 - foreign key (REVEND) - references CCM_CORE.CCM_REVISIONS; - - alter table CCM_CORE.DIGESTS - add constraint FKc53g09agnye3w1v4euy3e0gsi - foreign key (FROM_PARTY_ID) - references CCM_CORE.PARTIES; - - alter table CCM_CORE.DIGESTS - add constraint FK845r9ep6xu6nbt1mvxulwybym - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.DOMAIN_DESCRIPTIONS - add constraint FKn4i2dxgn8cqysa62dds6eih6a - foreign key (OBJECT_ID) - references CCM_CORE.CATEGORY_DOMAINS; - - alter table CCM_CORE.DOMAIN_OWNERSHIPS - add constraint FK47nsasr7jrdwlky5gx0u6e9py - foreign key (domain_OBJECT_ID) - references CCM_CORE.CATEGORY_DOMAINS; - - alter table CCM_CORE.DOMAIN_OWNERSHIPS - add constraint FK3u4hq6yqau4m419b1xva3xpwq - foreign key (owner_OBJECT_ID) - references CCM_CORE.APPLICATIONS; - - alter table CCM_CORE.DOMAIN_TITLES - add constraint FK5p526dsdwn94els6lp5w0hdn4 - foreign key (OBJECT_ID) - references CCM_CORE.CATEGORY_DOMAINS; - - alter table CCM_CORE.FORMBUILDER_COMPONENT_DESCRIPTIONS - add constraint FKfh0k9lj3pf4amfc9bbbss0tr1 - foreign key (COMPONENT_ID) - references CCM_CORE.FORMBUILDER_COMPONENTS; - - alter table CCM_CORE.FORMBUILDER_COMPONENTS - add constraint FKpcpmvyiix023b4g5n4q8nkfca - foreign key (parentComponent_OBJECT_ID) - references CCM_CORE.FORMBUILDER_COMPONENTS; - - alter table CCM_CORE.FORMBUILDER_COMPONENTS - add constraint FKt0e0uv00pp1rwhyaltrytghnm - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.FORMBUILDER_CONFIRM_EMAIL_LISTENER - add constraint FK48khrbud3xhi2gvsvnlttd8tg - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; - - alter table CCM_CORE.FORMBUILDER_CONFIRM_REDIRECT_LISTENERS - add constraint FKbyjjt2ufendvje2obtge2l7et - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; - - alter table CCM_CORE.FORMBUILDER_DATA_DRIVEN_SELECTS - add constraint FK8oriyta1957u7dvbrqk717944 - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_WIDGETS; - - alter table CCM_CORE.FORMBUILDER_DATA_QUERIES - add constraint FKhhaxpeddbtmrnjr5o0fopju3a - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.FORMBUILDER_DATA_QUERY_DESCRIPTIONS - add constraint FKsmduu1opoiulkeo2gc8v7lsbn - foreign key (DATA_QUERY_ID) - references CCM_CORE.FORMBUILDER_DATA_QUERIES; - - alter table CCM_CORE.FORMBUILDER_DATA_QUERY_NAMES - add constraint FKju1x82inrw3kguyjuxoetn6gn - foreign key (DATA_QUERY_ID) - references CCM_CORE.FORMBUILDER_DATA_QUERIES; - - alter table CCM_CORE.FORMBUILDER_FORMSECTIONS - add constraint FKnfhsgxp4lvigq2pm33pn4afac - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_COMPONENTS; - - alter table CCM_CORE.FORMBUILDER_LISTENERS - add constraint FK33ilyirwoux28yowafgd5xx0o - foreign key (widget_OBJECT_ID) - references CCM_CORE.FORMBUILDER_WIDGETS; - - alter table CCM_CORE.FORMBUILDER_LISTENERS - add constraint FKlqm76746nq5yrt8ganm474uu0 - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.FORMBUILDER_METAOBJECTS - add constraint FKf963v6u9mw8pwjmasrw51w8dx - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.FORMBUILDER_OBJECT_TYPES - add constraint FKkv337e83rsecf0h3qy8bu7l9w - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.FORMBUILDER_OPTION_LABELS - add constraint FKatlsylsvln6yse55eof6wwkj6 - foreign key (OPTION_ID) - references CCM_CORE.FORMBUILDER_OPTIONS; - - alter table CCM_CORE.FORMBUILDER_OPTIONS - add constraint FKhe5q71wby9g4i56sotc501h11 - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_COMPONENTS; - - alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_DESCRIPTIONS - add constraint FKcv3iu04gxjk9c0pn6tl8rqqv3 - foreign key (PROCESS_LISTENER_ID) - references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; - - alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_NAMES - add constraint FK8rnyb1m6ij3b9hhmhr7klgd4p - foreign key (PROCESS_LISTENER_ID) - references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; - - alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENERS - add constraint FK7uiaeax8qafm82e5k729ms5ku - foreign key (formSection_OBJECT_ID) - references CCM_CORE.FORMBUILDER_FORMSECTIONS; - - alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENERS - add constraint FKbdnloo884qk6gn36jwiqv5rlp - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.FORMBUILDER_REMOTE_SERVER_POST_LISTENER - add constraint FKpajvu9m6fj1enm67a9gcb5ii9 - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; - - alter table CCM_CORE.FORMBUILDER_SIMPLE_EMAIL_LISTENERS - add constraint FKsn82ktlq0c9ikijyv8k2bfv4f - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; - - alter table CCM_CORE.FORMBUILDER_TEMPLATE_EMAIL_LISTENERS - add constraint FK8kjyu72btjsuaaqh4bvd8npns - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; - - alter table CCM_CORE.FORMBUILDER_WIDGETS - add constraint FK1wosr4ujbfckdc50u5fgmrhrk - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_COMPONENTS; - - alter table CCM_CORE.FORMBUILDER_XML_EMAIL_LISTENERS - add constraint FKjie9co03m7ow4ihig5rk7l8oj - foreign key (OBJECT_ID) - references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS; - - alter table CCM_CORE.GROUP_MEMBERSHIPS - add constraint FKq4qnny8ri3eo7eqh4olxco8nk - foreign key (GROUP_ID) - references CCM_CORE.GROUPS; - - alter table CCM_CORE.GROUP_MEMBERSHIPS - add constraint FKc8u86ivkhvoiw6ju8b2p365he - foreign key (MEMBER_ID) - references CCM_CORE.USERS; - - alter table CCM_CORE.GROUPS - add constraint FK4f61mlqxw0ct6s7wwpi9m0735 - foreign key (PARTY_ID) - references CCM_CORE.PARTIES; - - alter table CCM_CORE.INITS - add constraint FK3nvvxk10nmq9nfuko8yklqdgc - foreign key (REQUIRED_BY_ID) - references CCM_CORE.INITS; - - alter table CCM_CORE.LUCENE_DOCUMENTS - add constraint FK942kl4yff8rdiwr0pjk2a9g8 - foreign key (CREATED_BY_PARTY_ID) - references CCM_CORE.USERS; - - alter table CCM_CORE.LUCENE_DOCUMENTS - add constraint FKc5rs6afx4p9fidabfqsxr5ble - foreign key (LAST_MODIFIED_BY) - references CCM_CORE.USERS; - - alter table CCM_CORE.LUCENE_INDEXES - add constraint FK6gu0yrlviqk07dtb3r02iw43f - foreign key (HOST_ID) - references CCM_CORE.HOSTS; - - alter table CCM_CORE.MESSAGES - add constraint FKph10aehmg9f20pn2w4buki97q - foreign key (IN_REPLY_TO_ID) - references CCM_CORE.MESSAGES; - - alter table CCM_CORE.MESSAGES - add constraint FKjufsx3c3h538fj35h8hgfnb1p - foreign key (SENDER_ID) - references CCM_CORE.USERS; - - alter table CCM_CORE.MESSAGES - add constraint FK6w20ao7scwecd9mfwpun2ddqx - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.NOTIFICATIONS - add constraint FKqk70c1x1dklhty9ju5t4wukd9 - foreign key (DIGEST_ID) - references CCM_CORE.DIGESTS; - - alter table CCM_CORE.NOTIFICATIONS - add constraint FKtt4fjr2p75og79jxxgd8q8mr - foreign key (MESSAGE_ID) - references CCM_CORE.MESSAGES; - - alter table CCM_CORE.NOTIFICATIONS - add constraint FK2vlnma0ox43j0clx8ead08n5s - foreign key (RECEIVER_ID) - references CCM_CORE.PARTIES; - - alter table CCM_CORE.NOTIFICATIONS - add constraint FKf423hhiaw1bexpxeh1pnas7qt - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.ONE_TIME_AUTH_TOKENS - add constraint FKtplfuphkiorfkttaewb4wmfjc - foreign key (USER_ID) - references CCM_CORE.USERS; - - alter table CCM_CORE.PAGE_MODEL_COMPONENT_MODELS - add constraint FKo696ch035fe7rrueol1po13od - foreign key (PAGE_MODEL_ID) - references CCM_CORE.PAGE_MODELS; - - alter table CCM_CORE.PAGE_MODEL_DESCRIPTIONS - add constraint FKcc5d6eqxu1369k8ycyyt6vn3e - foreign key (PAGE_MODEL_ID) - references CCM_CORE.PAGE_MODELS; - - alter table CCM_CORE.PAGE_MODEL_TITLES - add constraint FKj14q9911yhd4js9p6rs21rwjf - foreign key (PAGE_MODEL_ID) - references CCM_CORE.PAGE_MODELS; - - alter table CCM_CORE.PAGE_MODELS - add constraint FKk2lihllrxj89mn3tqv43amafe - foreign key (APPLICATION_ID) - references CCM_CORE.APPLICATIONS; - - alter table CCM_CORE.PERMISSIONS - add constraint FKj9di7pawxgtouxmu2k44bj5c4 - foreign key (CREATION_USER_ID) - references CCM_CORE.USERS; - - alter table CCM_CORE.PERMISSIONS - add constraint FKikx3x0kn9fito23g50v6xbr9f - foreign key (GRANTEE_ID) - references CCM_CORE.CCM_ROLES; - - alter table CCM_CORE.PERMISSIONS - add constraint FKg56ujjoe0j30pq579rf0l5yc6 - foreign key (INHERITED_FROM_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.PERMISSIONS - add constraint FKkamckexjnffnt8lay9nqeawhm - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.PORTALS - add constraint FK5a2hdrbw03mmgr74vj5nxlpvk - foreign key (OBJECT_ID) - references CCM_CORE.RESOURCES; - - alter table CCM_CORE.PORTLETS - add constraint FK9gr5xjt3rx4uhtw7vl6adruol - foreign key (PORTAL_ID) - references CCM_CORE.PORTALS; - - alter table CCM_CORE.PORTLETS - add constraint FKjmx9uebt0gwxkw3xv34niy35f - foreign key (OBJECT_ID) - references CCM_CORE.RESOURCES; - - alter table CCM_CORE.QUEUE_ITEMS - add constraint FKtgkwfruv9kjdybf46l02da088 - foreign key (MESSAGE_ID) - references CCM_CORE.MESSAGES; - - alter table CCM_CORE.QUEUE_ITEMS - add constraint FKs9aq1hyxstwmvx7fmfifp4x7r - foreign key (RECEIVER_ID) - references CCM_CORE.PARTIES; - - alter table CCM_CORE.RESOURCE_DESCRIPTIONS - add constraint FKk9arvj5u21rv23ce3cav4opqx - foreign key (OBJECT_ID) - references CCM_CORE.RESOURCES; - - alter table CCM_CORE.RESOURCE_TITLES - add constraint FKto4p6n2wklljyf7tmuxtmyfe0 - foreign key (OBJECT_ID) - references CCM_CORE.RESOURCES; - - alter table CCM_CORE.RESOURCE_TYPE_DESCRIPTIONS - add constraint FKckpihjtv23iahbg3imnpbsr2 - foreign key (RESOURCE_TYPE_ID) - references CCM_CORE.RESOURCE_TYPES; - - alter table CCM_CORE.RESOURCES - add constraint FKbo7ibfgodicn9flv2gfo11g5a - foreign key (parent_OBJECT_ID) - references CCM_CORE.RESOURCES; - - alter table CCM_CORE.RESOURCES - add constraint FK262fbwetpjx3k4uuvw24wsiv - foreign key (resourceType_RESOURCE_TYPE_ID) - references CCM_CORE.RESOURCE_TYPES; - - alter table CCM_CORE.RESOURCES - add constraint FKbjdf8pm4frth8r06ev2qjm88f - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.ROLE_DESCRIPTIONS - add constraint FKo09bh4j3k3k0ph3awvjwx31ft - foreign key (ROLE_ID) - references CCM_CORE.CCM_ROLES; - - alter table CCM_CORE.ROLE_MEMBERSHIPS - add constraint FK9m88ywi7rcin7b7jrgh53emrq - foreign key (MEMBER_ID) - references CCM_CORE.PARTIES; - - alter table CCM_CORE.ROLE_MEMBERSHIPS - add constraint FKcsyogv5m2rgsrmtgnhgkjhfw7 - foreign key (ROLE_ID) - references CCM_CORE.CCM_ROLES; - - alter table CCM_CORE.SETTINGS_ENUM_VALUES - add constraint FK8mw4p92s0h3h8bmo8saowu32i - foreign key (ENUM_ID) - references CCM_CORE.SETTINGS; - - alter table CCM_CORE.SETTINGS_L10N_STR_VALUES - add constraint FK5knjq7cisej0qfx5dw1y93rou - foreign key (ENTRY_ID) - references CCM_CORE.SETTINGS; - - alter table CCM_CORE.SETTINGS_STRING_LIST - add constraint FKqeclqa5sf1g53vxs857tpwrus - foreign key (LIST_ID) - references CCM_CORE.SETTINGS; - - alter table CCM_CORE.THREADS - add constraint FKsx08mpwvwnw97uwdgjs76q39g - foreign key (ROOT_ID) - references CCM_CORE.MESSAGES; - - alter table CCM_CORE.THREADS - add constraint FKp97b1sy1kop07rtapeh5l9fb2 - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.USER_EMAIL_ADDRESSES - add constraint FKr900l79erul95seyyccf04ufc - foreign key (USER_ID) - references CCM_CORE.USERS; - - alter table CCM_CORE.USERS - add constraint FKosh928q71aonu6l1kurb417r - foreign key (PARTY_ID) - references CCM_CORE.PARTIES; - - alter table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS - add constraint FK1pnsq9ur3ylq0ghuj23p4cogs - foreign key (LOCKING_USER_ID) - references CCM_CORE.USERS; - - alter table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS - add constraint FK9ngp088m8xa82swy7yg3qx6vh - foreign key (NOTIFICATION_SENDER) - references CCM_CORE.USERS; - - alter table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS - add constraint FKt9ha3no3bj8a50pnw8cnqh2cq - foreign key (TASK_ID) - references CCM_CORE.WORKFLOW_TASKS; - - alter table CCM_CORE.WORKFLOW_DESCRIPTIONS - add constraint FKgx7upkqky82dpxvbs95imfl9l - foreign key (WORKFLOW_ID) - references CCM_CORE.WORKFLOWS; - - alter table CCM_CORE.WORKFLOW_NAMES - add constraint FKkxedy9p48avfk45r0bn4uc09i - foreign key (WORKFLOW_ID) - references CCM_CORE.WORKFLOWS; - - alter table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS - add constraint FKpq4paqtfbi5erhh98wl1ja005 - foreign key (ROLE_ID) - references CCM_CORE.CCM_ROLES; - - alter table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS - add constraint FK3933ol31co3yn5ee75b2hmhgp - foreign key (TASK_ID) - references CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS; - - alter table CCM_CORE.WORKFLOW_TASK_COMMENTS - add constraint FKd2ymdg8nay9pmh2nn2whba0j8 - foreign key (AUTHOR_ID) - references CCM_CORE.USERS; - - alter table CCM_CORE.WORKFLOW_TASK_COMMENTS - add constraint FKkfqrf9jdvm7livu5if06w0r5t - foreign key (TASK_ID) - references CCM_CORE.WORKFLOW_TASKS; - - alter table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES - add constraint FK1htp420ki24jaswtcum56iawe - foreign key (DEPENDENT_TASK_ID) - references CCM_CORE.WORKFLOW_TASKS; - - alter table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES - add constraint FK8rbggnp4yjpab8quvvx800ymy - foreign key (DEPENDS_ON_TASK_ID) - references CCM_CORE.WORKFLOW_TASKS; - - alter table CCM_CORE.WORKFLOW_TASK_DESCRIPTIONS - add constraint FKeb7mqbdx3bk7t01vo7kp2hpf - foreign key (TASK_ID) - references CCM_CORE.WORKFLOW_TASKS; - - alter table CCM_CORE.WORKFLOW_TASK_LABELS - add constraint FKf715qud6g9xv2xeb8rrpnv4xs - foreign key (TASK_ID) - references CCM_CORE.WORKFLOW_TASKS; - - alter table CCM_CORE.WORKFLOW_TASKS - add constraint FK1693cbc36e4d8gucg8q7sc57e - foreign key (WORKFLOW_ID) - references CCM_CORE.WORKFLOWS; - - alter table CCM_CORE.WORKFLOWS - add constraint FKrm2yfrs6veoxoy304upq2wc64 - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; - - alter table CCM_CORE.WORKFLOWS - add constraint FK9ray5beiny6wm2mi0uwyecay2 - foreign key (TEMPLATE_ID) - references CCM_CORE.WORKFLOWS; - - alter table CCM_DOCREPO.FILES - add constraint FK2hsq6npoqb0gnvj9blucdy0cp - foreign key (CONTENT_ID) - references CCM_DOCREPO.BLOB_OBJECTS; - - alter table CCM_DOCREPO.FILES - add constraint FKj29rqxnqsxub552uxng0ekyj4 - foreign key (OBJECT_ID) - references CCM_DOCREPO.RESOURCES; - - alter table CCM_DOCREPO.FOLDERS - add constraint FKnmxkqionnxqc7ye70npa5ikp0 - foreign key (OBJECT_ID) - references CCM_DOCREPO.RESOURCES; - - alter table CCM_DOCREPO.REC_UPD_DOCS_PORTLETS - add constraint FKaxwcfqi3ssgmdhhsqy2m258vc - foreign key (OBJECT_ID) - references CCM_CORE.PORTLETS; - - alter table CCM_DOCREPO.REPOSITORIES - add constraint FKovamdv1r9txoqbp7sw4i55pwu - foreign key (OWNER_ID) - references CCM_CORE.USERS; - - alter table CCM_DOCREPO.REPOSITORIES - add constraint FKr3nbsglhju8b24vxkcie08g1k - foreign key (ROOT_FOLDER_ID) - references CCM_DOCREPO.FOLDERS; - - alter table CCM_DOCREPO.REPOSITORIES - add constraint FKdjq3yme7ow441nw4as9dqy0we - foreign key (OBJECT_ID) - references CCM_CORE.APPLICATIONS; - - alter table CCM_DOCREPO.RESOURCES - add constraint FK7fv70w41xca4tduehyb1ye2c6 - foreign key (CREATION_USER_ID) - references CCM_CORE.USERS; - - alter table CCM_DOCREPO.RESOURCES - add constraint FK9jl78hpalagwr323bl561qsgj - foreign key (LAST_MODIFIED_USER_ID) - references CCM_CORE.USERS; - - alter table CCM_DOCREPO.RESOURCES - add constraint FKap5pdovro7cgbn4jrs77nqa6o - foreign key (PARENT_ID) - references CCM_DOCREPO.FOLDERS; - - alter table CCM_DOCREPO.RESOURCES - add constraint FKpn78v9bfo6ak34kqbe3g6nb1n - foreign key (REPOSITORY_ID) - references CCM_DOCREPO.REPOSITORIES; - - alter table CCM_DOCREPO.RESOURCES - add constraint FKbjdf8pm4frth8r06ev2qjm88f - foreign key (OBJECT_ID) - references CCM_CORE.CCM_OBJECTS; \ No newline at end of file diff --git a/ccm-docrepo/src/test/resources-wildfly-remote-pgsql/test-persistence.xml b/ccm-docrepo/src/test/resources-wildfly-remote-pgsql/test-persistence.xml deleted file mode 100644 index 9c977817e..000000000 --- a/ccm-docrepo/src/test/resources-wildfly-remote-pgsql/test-persistence.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - org.hibernate.jpa.HibernatePersistenceProvider - - java:/comp/env/jdbc/org/libreccm/ccm-docrepo/pgsql - - - - - - - - - - - - diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml index 3355da8f7..0ca828b20 100644 --- a/ccm-shortcuts/pom.xml +++ b/ccm-shortcuts/pom.xml @@ -373,7 +373,7 @@ src/test/resources - src/test/resources-wildfly-remote-h2-mem + src/test/resources-wildfly-h2mem ${project.build.directory}/generated-resources @@ -494,7 +494,6 @@ - @@ -522,7 +521,7 @@ src/test/resources - src/test/resources-wildfly-remote-pgsql + src/test/resources-wildfly-pgsql ${project.build.directory}/generated-resources @@ -675,180 +674,9 @@ - + - wildfly-managed-h2-mem - - - org.wildfly.arquillian - wildfly-arquillian-container-managed - test - - - org.jboss.shrinkwrap.resolver - shrinkwrap-resolver-impl-maven - test - - - org.jacoco - org.jacoco.core - test - - - org.jboss.arquillian.extension - arquillian-jacoco - - - net.sf.saxon - Saxon-HE - - - - - - - src/test/resources - - - src/test/resources-wildfly-remote-h2-mem - - - ${project.build.directory}/generated-resources - - - - - - de.jpdigital - hibernate53-ddl-maven-plugin - - - h2 - postgresql9 - - - org.libreccm - - true - - - - - gen-ddl - - process-classes - - - - - org.apache.maven.plugins - maven-surefire-plugin - - always - 999 - true - - org.jboss.logmanager.LogManager - - - false - false - - org.libreccm.tests.categories.UnitTest, - org.libreccm.tests.categories.IntegrationTest - - - - - - - - - wildfly-managed-pgsql - - - org.wildfly.arquillian - wildfly-arquillian-container-managed - test - - - org.jacoco - org.jacoco.core - test - - - org.jboss.arquillian.extension - arquillian-jacoco - - - net.sf.saxon - Saxon-HE - - - - - - - src/test/resources - - - src/test/resources-wildfly-remote-pgsql - - - ${project.build.directory}/generated-resources - - - - - - de.jpdigital - hibernate53-ddl-maven-plugin - - - h2 - postgresql9 - - - org.libreccm - - true - - - - - gen-ddl - - process-classes - - - - - org.apache.maven.plugins - maven-surefire-plugin - - always - 999 - true - - org.jboss.logmanager.LogManager - - - false - false - - org.libreccm.tests.categories.UnitTest, - org.libreccm.tests.categories.IntegrationTest - - - - - - - - - wildfly-remote-h2-mem + run-its-in-remote-wildfly-h2mem org.wildfly.arquillian @@ -860,15 +688,6 @@ shrinkwrap-resolver-impl-maven test - - org.jacoco - org.jacoco.core - test - - - org.jboss.arquillian.extension - arquillian-jacoco - net.sf.saxon Saxon-HE @@ -881,7 +700,7 @@ src/test/resources - src/test/resources-wildfly-remote-h2-mem + src/test/resources-wildfly-h2mem ${project.build.directory}/generated-resources @@ -913,45 +732,55 @@ org.apache.maven.plugins - maven-surefire-plugin + maven-failsafe-plugin + + + + integration-test + verify + + + always 999 true org.jboss.logmanager.LogManager - false false - - org.libreccm.tests.categories.UnitTest, - org.libreccm.tests.categories.IntegrationTest - + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + + + integration-tests + + failsafe-report-only + + + + + + - wildfly-remote-pgsql + run-its-in-remote-wildfly-pgsql org.wildfly.arquillian wildfly-arquillian-container-remote test - - org.jacoco - org.jacoco.core - test - - - org.jboss.arquillian.extension - arquillian-jacoco - net.sf.saxon Saxon-HE @@ -964,7 +793,7 @@ src/test/resources - src/test/resources-wildfly-remote-pgsql + src/test/resources-wildfly-pgsql ${project.build.directory}/generated-resources @@ -996,26 +825,45 @@ org.apache.maven.plugins - maven-surefire-plugin + maven-failsafe-plugin + + + + integration-test + verify + + + always 999 true org.jboss.logmanager.LogManager - false false - - org.libreccm.tests.categories.UnitTest, - org.libreccm.tests.categories.IntegrationTest - + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + + + integration-tests + + failsafe-report-only + + + + + + diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/arquillian.xml b/ccm-shortcuts/src/test/resources-wildfly-h2mem/arquillian.xml similarity index 100% rename from ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/arquillian.xml rename to ccm-shortcuts/src/test/resources-wildfly-h2mem/arquillian.xml diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql b/ccm-shortcuts/src/test/resources-wildfly-h2mem/scripts/001_create_schema.sql similarity index 100% rename from ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql rename to ccm-shortcuts/src/test/resources-wildfly-h2mem/scripts/001_create_schema.sql diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/002_create_ccm_shortcuts_tables.sql b/ccm-shortcuts/src/test/resources-wildfly-h2mem/scripts/002_create_ccm_shortcuts_tables.sql similarity index 100% rename from ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/002_create_ccm_shortcuts_tables.sql rename to ccm-shortcuts/src/test/resources-wildfly-h2mem/scripts/002_create_ccm_shortcuts_tables.sql diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/003_init_hibernate_sequence.sql b/ccm-shortcuts/src/test/resources-wildfly-h2mem/scripts/003_init_hibernate_sequence.sql similarity index 100% rename from ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/003_init_hibernate_sequence.sql rename to ccm-shortcuts/src/test/resources-wildfly-h2mem/scripts/003_init_hibernate_sequence.sql diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/999_cleanup.sql b/ccm-shortcuts/src/test/resources-wildfly-h2mem/scripts/999_cleanup.sql similarity index 100% rename from ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/999_cleanup.sql rename to ccm-shortcuts/src/test/resources-wildfly-h2mem/scripts/999_cleanup.sql diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/test-persistence.xml b/ccm-shortcuts/src/test/resources-wildfly-h2mem/test-persistence.xml similarity index 100% rename from ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/test-persistence.xml rename to ccm-shortcuts/src/test/resources-wildfly-h2mem/test-persistence.xml diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/arquillian.xml b/ccm-shortcuts/src/test/resources-wildfly-pgsql/arquillian.xml similarity index 100% rename from ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/arquillian.xml rename to ccm-shortcuts/src/test/resources-wildfly-pgsql/arquillian.xml diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/001_create_schema.sql b/ccm-shortcuts/src/test/resources-wildfly-pgsql/scripts/001_create_schema.sql similarity index 100% rename from ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/001_create_schema.sql rename to ccm-shortcuts/src/test/resources-wildfly-pgsql/scripts/001_create_schema.sql diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_shortcuts_tables.sql b/ccm-shortcuts/src/test/resources-wildfly-pgsql/scripts/002_create_ccm_shortcuts_tables.sql similarity index 100% rename from ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_shortcuts_tables.sql rename to ccm-shortcuts/src/test/resources-wildfly-pgsql/scripts/002_create_ccm_shortcuts_tables.sql diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/003_init_hibernate_sequence.sql b/ccm-shortcuts/src/test/resources-wildfly-pgsql/scripts/003_init_hibernate_sequence.sql similarity index 100% rename from ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/003_init_hibernate_sequence.sql rename to ccm-shortcuts/src/test/resources-wildfly-pgsql/scripts/003_init_hibernate_sequence.sql diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/999_cleanup.sql b/ccm-shortcuts/src/test/resources-wildfly-pgsql/scripts/999_cleanup.sql similarity index 100% rename from ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/999_cleanup.sql rename to ccm-shortcuts/src/test/resources-wildfly-pgsql/scripts/999_cleanup.sql diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/test-persistence.xml b/ccm-shortcuts/src/test/resources-wildfly-pgsql/test-persistence.xml similarity index 100% rename from ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/test-persistence.xml rename to ccm-shortcuts/src/test/resources-wildfly-pgsql/test-persistence.xml diff --git a/ccm-testutils/src/site/apt/index.apt b/ccm-testutils/src/site/apt/index.apt deleted file mode 100644 index 0ae2e2845..000000000 --- a/ccm-testutils/src/site/apt/index.apt +++ /dev/null @@ -1,42 +0,0 @@ -LibreCCM TestUtils - - The TestUtils module <<>> package provides several utility - classes for writing tests for specific classes. This includes tests for - the implementations of <<>> and <<>> as well as - <<>>. Also a utility for testing datasets for DBUnit tests - is provided. - - Other modules should import this module for the test - scope only: - -+------------------------------------------------------------------------------+ -... - - ... - - org.libreccm - ccm-testutils - 6.7.0-SNAPSHOT - test - - ... - -+------------------------------------------------------------------------------+ - - At the moment the following utilities are provided: - - * {{{./apidocs/index.html?org/libreccm/testutils/DatasetsVerifier.html} DatasetsVerifier}} - - * {{{./apidocs/index.html?org/libreccm/testutils/EqualsVerifier.html} EqualsVerifier}} - - * {{{./apidocs/index.html?org/libreccm/testutils/ToStringVerifier.html} ToStringVerifier}} - - [] - - Also their are some categories for use with feature of JUnit 4. - They are used to control which tests are executed. At the moment their are - two categories: - - * {{{./apidocs/index.html?org/libreccm/tests/categories/IntegrationTest.html} IntegrationTest}} - - * {{{./apidocs/index.html?org/libreccm/tests/categories/UnitTest.html} UnitTest}} \ No newline at end of file diff --git a/ccm-testutils/src/site/markdown/index.markdown b/ccm-testutils/src/site/markdown/index.markdown new file mode 100644 index 000000000..5a4c87653 --- /dev/null +++ b/ccm-testutils/src/site/markdown/index.markdown @@ -0,0 +1,33 @@ +LibreCCM TestUtils +================== + +The TestUtils module `ccm-testutils` package provides several utility + classes for writing tests for specific classes. This includes tests for +the implementations of `equals` and `hashCode` as well as +`toString`. Also a utility for testing datasets for DBUnit tests +is provided. + +Other modules should import this module for the test +scope only: + +``` + + ... + + org.libreccm + ccm-testutils + 6.7.0-SNAPSHOT + test + + ... + +``` + +At the moment the following utilities are provided: + +* [DataSetsVerifier](./apidocs/index.html?org/libreccm/testutils/DatasetsVerifier.html) + +* [EqualsVerifier](./apidocs/index.html?org/libreccm/testutils/EqualsVerifier.html) + +* [ToStringVerifier](./apidocs/index.html?org/libreccm/testutils/ToStringVerifier.html) + From be2a4ac94cd3ef2588b9dc87267bb9f1061a5b43 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 18 Jul 2020 18:09:47 +0200 Subject: [PATCH 78/92] Removed UnitTest category usage and class --- .../AssetEqualsAndHashCodeTest.java | 2 -- .../AttachmentsEqualsAndHashCodeTest.java | 2 -- .../librecms/contentsection/DatasetsTest.java | 3 -- .../contentsection/EqualsAndHashCodeTest.java | 2 -- .../contenttypes/EqualsAndHashCodeTest.java | 2 -- ccm-core/pom.xml | 18 ++++++++++ .../kernel/EqualsAndHashCodeTest.java | 3 -- .../com/arsdigita/kernel/ToStringTest.java | 3 -- .../java/com/arsdigita/util/AssertTest.java | 7 ++-- .../com/arsdigita/util/StringUtilsTest.java | 12 ++++--- .../java/com/arsdigita/web/WebConfigTest.java | 8 ++--- .../libreccm/categorization/DatasetsTest.java | 3 +- .../categorization/EqualsAndHashCodeTest.java | 2 -- .../RegistrySetupDatasetsTest.java | 3 -- .../libreccm/categorization/ToStringTest.java | 2 -- .../libreccm/configuration/DatasetsTest.java | 4 +-- .../configuration/EqualsAndHashCodeTest.java | 2 -- .../libreccm/configuration/ToStringTest.java | 3 -- .../java/org/libreccm/core/DatasetsTest.java | 3 -- .../libreccm/core/EqualsAndHashCodeTest.java | 2 -- .../org/libreccm/core/ResourceEntityTest.java | 2 -- .../java/org/libreccm/core/ToStringTest.java | 3 -- .../formbuilder/EqualsAndHashCodeTest.java | 2 -- .../libreccm/formbuilder/ToStringTest.java | 3 -- .../actions/EqualsAndHashCodeTest.java | 2 -- .../formbuilder/actions/ToStringTest.java | 3 -- .../libreccm/jpautils/UriConverterTest.java | 3 -- .../libreccm/l10n/EqualsAndHashCodeTest.java | 3 -- .../java/org/libreccm/l10n/ToStringTest.java | 3 -- .../messaging/EqualsAndHashCodeTest.java | 2 -- .../org/libreccm/messaging/ToStringTest.java | 3 -- .../modules/ComparableVersionTest.java | 3 -- .../org/libreccm/modules/DatasetsTest.java | 3 -- ...endencyTreeManagerValidateVersionTest.java | 3 -- .../notification/EqualsAndHashCodeTest.java | 2 -- .../libreccm/notification/ToStringTest.java | 3 -- .../portal/EqualsAndHashCodeTest.java | 2 -- .../org/libreccm/portal/ToStringTest.java | 3 -- .../runtime/EqualsAndHashCodeTest.java | 2 -- .../org/libreccm/runtime/ToStringTest.java | 3 -- .../search/lucene/EqualsAndHashCodeTest.java | 2 -- .../libreccm/search/lucene/ToStringTest.java | 3 -- .../org/libreccm/security/DatasetsTest.java | 3 -- .../libreccm/security/DatasetsXmlTest.java | 3 -- .../security/EqualsAndHashCodeTest.java | 2 -- .../libreccm/security/ListContainsTest.java | 3 -- .../security/PartyConstraintTest.java | 3 -- .../org/libreccm/security/ToStringTest.java | 3 -- .../theming/db/EqualsAndHashCodeTest.java | 2 -- .../libreccm/web/EqualsAndHashCodeTest.java | 2 -- .../java/org/libreccm/web/ToStringTest.java | 3 -- .../workflow/EqualsAndHashCodeTest.java | 3 -- .../org/libreccm/workflow/ToStringTest.java | 3 -- .../org/libreccm/shortcuts/DatasetsTest.java | 4 +-- .../shortcuts/EqualsAndHashCodeTest.java | 3 -- .../org/libreccm/shortcuts/ToStringTest.java | 3 -- .../tests/categories/IntegrationTest.java | 36 ------------------- .../libreccm/tests/categories/UnitTest.java | 34 ------------------ .../tests/categories/package-info.java | 5 --- 59 files changed, 33 insertions(+), 226 deletions(-) delete mode 100644 ccm-testutils/src/main/java/org/libreccm/tests/categories/IntegrationTest.java delete mode 100644 ccm-testutils/src/main/java/org/libreccm/tests/categories/UnitTest.java delete mode 100644 ccm-testutils/src/main/java/org/libreccm/tests/categories/package-info.java diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java index c84168f6d..12ea95743 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java @@ -26,7 +26,6 @@ import org.libreccm.core.CcmObject; import org.libreccm.security.Group; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -40,7 +39,6 @@ import java.util.UUID; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class AssetEqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java index f0122fb1e..870cf818b 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java @@ -24,7 +24,6 @@ import org.junit.runners.Parameterized; import org.libreccm.core.CcmObject; import org.libreccm.security.Group; import org.libreccm.security.Role; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -38,7 +37,6 @@ import java.util.UUID; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class AttachmentsEqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java index 75cd0f9ac..65ebe7dad 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java @@ -22,10 +22,8 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetsVerifier; @@ -37,7 +35,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class DatasetsTest extends DatasetsVerifier { @Parameterized.Parameters(name = "Dataset {0}") diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java index cec043aa3..50ae8e28c 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java @@ -28,7 +28,6 @@ import org.libreccm.core.Resource; import org.libreccm.security.Group; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import org.libreccm.web.CcmApplication; import org.libreccm.workflow.Workflow; @@ -42,7 +41,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java index 80b7b94fa..a097ada32 100644 --- a/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java +++ b/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java @@ -25,7 +25,6 @@ import java.util.Collection; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; /** @@ -33,7 +32,6 @@ import org.libreccm.testutils.EqualsVerifier; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index aa63f14ff..0080ece81 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -29,6 +29,24 @@ + + org.seleniumhq.selenium + selenium-java + test + 2.44.0 + + + com.opera + operadriver + test + 1.5 + + + org.seleniumhq.selenium + selenium-remote-driver + + + javax javaee-api diff --git a/ccm-core/src/test/java/com/arsdigita/kernel/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/com/arsdigita/kernel/EqualsAndHashCodeTest.java index 97d5bba31..c4e8b305c 100644 --- a/ccm-core/src/test/java/com/arsdigita/kernel/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/com/arsdigita/kernel/EqualsAndHashCodeTest.java @@ -18,10 +18,8 @@ */ package com.arsdigita.kernel; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -33,7 +31,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") public static Collection> data() { diff --git a/ccm-core/src/test/java/com/arsdigita/kernel/ToStringTest.java b/ccm-core/src/test/java/com/arsdigita/kernel/ToStringTest.java index 7a66e75ce..7741ed6a7 100644 --- a/ccm-core/src/test/java/com/arsdigita/kernel/ToStringTest.java +++ b/ccm-core/src/test/java/com/arsdigita/kernel/ToStringTest.java @@ -18,10 +18,8 @@ */ package com.arsdigita.kernel; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/com/arsdigita/util/AssertTest.java b/ccm-core/src/test/java/com/arsdigita/util/AssertTest.java index e8b11cc9a..9d9b7eddf 100644 --- a/ccm-core/src/test/java/com/arsdigita/util/AssertTest.java +++ b/ccm-core/src/test/java/com/arsdigita/util/AssertTest.java @@ -23,17 +23,14 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.libreccm.tests.categories.UnitTest; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; /** * * @author Jens Pelzetter */ -@Category(UnitTest.class) public class AssertTest { public AssertTest() { diff --git a/ccm-core/src/test/java/com/arsdigita/util/StringUtilsTest.java b/ccm-core/src/test/java/com/arsdigita/util/StringUtilsTest.java index 3cedd67cd..4f1432878 100644 --- a/ccm-core/src/test/java/com/arsdigita/util/StringUtilsTest.java +++ b/ccm-core/src/test/java/com/arsdigita/util/StringUtilsTest.java @@ -21,24 +21,26 @@ package com.arsdigita.util; import java.util.ArrayList; import java.util.HashMap; import java.util.List; + import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertTrue; + import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.libreccm.tests.categories.UnitTest; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; + /** * * @author Konermann */ -@Category(UnitTest.class) public class StringUtilsTest { public StringUtilsTest() { diff --git a/ccm-core/src/test/java/com/arsdigita/web/WebConfigTest.java b/ccm-core/src/test/java/com/arsdigita/web/WebConfigTest.java index aad370776..ac6c1c7e8 100644 --- a/ccm-core/src/test/java/com/arsdigita/web/WebConfigTest.java +++ b/ccm-core/src/test/java/com/arsdigita/web/WebConfigTest.java @@ -23,19 +23,17 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.libreccm.tests.categories.UnitTest; import java.util.ArrayList; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; /** * * @author Jens Pelzetter */ -@Category(UnitTest.class) public class WebConfigTest { public WebConfigTest() { diff --git a/ccm-core/src/test/java/org/libreccm/categorization/DatasetsTest.java b/ccm-core/src/test/java/org/libreccm/categorization/DatasetsTest.java index f2b0a9f4d..869bc2170 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/DatasetsTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/DatasetsTest.java @@ -20,9 +20,9 @@ package org.libreccm.categorization; import java.util.Arrays; import java.util.Collection; + import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetsVerifier; @@ -34,7 +34,6 @@ import static org.libreccm.testutils.DatasetType.*; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class DatasetsTest extends DatasetsVerifier { @Parameterized.Parameters(name = "Dataset {0}") diff --git a/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java index 92480a450..c8ce5f3fb 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java @@ -25,7 +25,6 @@ import org.libreccm.core.CcmObject; import org.libreccm.security.Group; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import org.libreccm.web.CcmApplication; @@ -37,7 +36,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/categorization/RegistrySetupDatasetsTest.java b/ccm-core/src/test/java/org/libreccm/categorization/RegistrySetupDatasetsTest.java index f579ed543..d94b128c6 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/RegistrySetupDatasetsTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/RegistrySetupDatasetsTest.java @@ -20,10 +20,8 @@ package org.libreccm.categorization; import static org.libreccm.testutils.DatasetType.*; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetsVerifier; @@ -35,7 +33,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class RegistrySetupDatasetsTest extends DatasetsVerifier { @Parameterized.Parameters(name = "Dataset {0}") diff --git a/ccm-core/src/test/java/org/libreccm/categorization/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/categorization/ToStringTest.java index e43c22dcf..234ca8524 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/ToStringTest.java @@ -21,7 +21,6 @@ package org.libreccm.categorization; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.testutils.ToStringVerifier; -import org.libreccm.tests.categories.UnitTest; import java.util.Arrays; import java.util.Collection; @@ -31,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/configuration/DatasetsTest.java b/ccm-core/src/test/java/org/libreccm/configuration/DatasetsTest.java index d788721b4..d1a788c43 100644 --- a/ccm-core/src/test/java/org/libreccm/configuration/DatasetsTest.java +++ b/ccm-core/src/test/java/org/libreccm/configuration/DatasetsTest.java @@ -20,14 +20,13 @@ package org.libreccm.configuration; import java.util.Arrays; import java.util.Collection; + import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetsVerifier; @@ -39,7 +38,6 @@ import static org.libreccm.testutils.DatasetType.*; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class DatasetsTest extends DatasetsVerifier { @Parameterized.Parameters(name = "Dataset {0}") diff --git a/ccm-core/src/test/java/org/libreccm/configuration/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/configuration/EqualsAndHashCodeTest.java index 2c4bd15d9..e862c886c 100644 --- a/ccm-core/src/test/java/org/libreccm/configuration/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/configuration/EqualsAndHashCodeTest.java @@ -23,7 +23,6 @@ import java.util.Collection; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; /** @@ -33,7 +32,6 @@ import org.libreccm.testutils.EqualsVerifier; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/configuration/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/configuration/ToStringTest.java index 4f92ca584..b0ee7c8d4 100644 --- a/ccm-core/src/test/java/org/libreccm/configuration/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/configuration/ToStringTest.java @@ -21,10 +21,8 @@ package org.libreccm.configuration; import java.util.Arrays; import java.util.Collection; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; /** @@ -34,7 +32,6 @@ import org.libreccm.testutils.ToStringVerifier; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/core/DatasetsTest.java b/ccm-core/src/test/java/org/libreccm/core/DatasetsTest.java index 914d84527..688635a0e 100644 --- a/ccm-core/src/test/java/org/libreccm/core/DatasetsTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/DatasetsTest.java @@ -22,10 +22,8 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.DatasetsVerifier; import java.util.Arrays; @@ -37,7 +35,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class DatasetsTest extends DatasetsVerifier { @Parameterized.Parameters(name = "Dataset {0}") diff --git a/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java index 9b3d52dcc..dfdc745a5 100644 --- a/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java @@ -21,7 +21,6 @@ package org.libreccm.core; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import java.util.Arrays; import java.util.Collection; @@ -39,7 +38,6 @@ import org.libreccm.testutils.EqualsVerifier; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java b/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java index 9f8809ef5..a75375a2c 100644 --- a/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java @@ -26,7 +26,6 @@ import org.libreccm.l10n.LocalizedString; import org.libreccm.security.Group; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -42,7 +41,6 @@ import java.util.Locale; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class ResourceEntityTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/core/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/core/ToStringTest.java index 4f6a7b06d..ab7952e4e 100644 --- a/ccm-core/src/test/java/org/libreccm/core/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/ToStringTest.java @@ -18,11 +18,9 @@ */ package org.libreccm.core; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.testutils.ToStringVerifier; -import org.libreccm.tests.categories.UnitTest; import java.util.Arrays; import java.util.Collection; @@ -34,7 +32,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java index 350578c1f..56a43e5bd 100644 --- a/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java @@ -26,7 +26,6 @@ import org.libreccm.core.CcmObject; import org.libreccm.security.Group; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -37,7 +36,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/formbuilder/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/formbuilder/ToStringTest.java index ef58b3c4c..f36bf88aa 100644 --- a/ccm-core/src/test/java/org/libreccm/formbuilder/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/formbuilder/ToStringTest.java @@ -18,11 +18,9 @@ */ package org.libreccm.formbuilder; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.testutils.ToStringVerifier; -import org.libreccm.tests.categories.UnitTest; import java.util.Arrays; import java.util.Collection; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java index 19d43cf35..af1392972 100644 --- a/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java @@ -23,7 +23,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.formbuilder.Component; import org.libreccm.formbuilder.FormSection; -import org.libreccm.tests.categories.UnitTest; import java.util.Arrays; import java.util.Collection; @@ -40,7 +39,6 @@ import org.libreccm.testutils.EqualsVerifier; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/formbuilder/actions/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/formbuilder/actions/ToStringTest.java index 0758a4567..f9b975b08 100644 --- a/ccm-core/src/test/java/org/libreccm/formbuilder/actions/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/formbuilder/actions/ToStringTest.java @@ -18,11 +18,9 @@ */ package org.libreccm.formbuilder.actions; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.testutils.ToStringVerifier; -import org.libreccm.tests.categories.UnitTest; import java.util.Arrays; import java.util.Collection; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/jpautils/UriConverterTest.java b/ccm-core/src/test/java/org/libreccm/jpautils/UriConverterTest.java index d1e29b55b..bfb392cf3 100644 --- a/ccm-core/src/test/java/org/libreccm/jpautils/UriConverterTest.java +++ b/ccm-core/src/test/java/org/libreccm/jpautils/UriConverterTest.java @@ -24,8 +24,6 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.libreccm.tests.categories.UnitTest; import java.net.URI; import java.net.URISyntaxException; @@ -38,7 +36,6 @@ import static org.hamcrest.Matchers.*; * * @author Jens Pelzetter */ -@Category(UnitTest.class) public class UriConverterTest { private static final String WWW_EXAMPLE_ORG = "http://www.example.org"; diff --git a/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java index 6c709cda9..02ed5ef56 100644 --- a/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java @@ -19,11 +19,9 @@ package org.libreccm.l10n; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.messaging.Message; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -34,7 +32,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/l10n/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/l10n/ToStringTest.java index 215d70843..74a3928e4 100644 --- a/ccm-core/src/test/java/org/libreccm/l10n/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/l10n/ToStringTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.l10n; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java index 2e4272eea..6a8306b4b 100644 --- a/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java @@ -26,7 +26,6 @@ import org.libreccm.core.CcmObject; import org.libreccm.security.Group; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -37,7 +36,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/messaging/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/messaging/ToStringTest.java index 7fd022cda..744f04238 100644 --- a/ccm-core/src/test/java/org/libreccm/messaging/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/messaging/ToStringTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.messaging; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/modules/ComparableVersionTest.java b/ccm-core/src/test/java/org/libreccm/modules/ComparableVersionTest.java index b1efc5e25..8743c7784 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/ComparableVersionTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/ComparableVersionTest.java @@ -27,8 +27,6 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.libreccm.tests.categories.UnitTest; import java.util.ArrayList; import java.util.Collections; @@ -40,7 +38,6 @@ import static org.junit.Assert.*; * * @author Jens Pelzetter */ -@Category(UnitTest.class) public class ComparableVersionTest { public ComparableVersionTest() { diff --git a/ccm-core/src/test/java/org/libreccm/modules/DatasetsTest.java b/ccm-core/src/test/java/org/libreccm/modules/DatasetsTest.java index fa7b0955b..48e0c7d05 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/DatasetsTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/DatasetsTest.java @@ -24,10 +24,8 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetsVerifier; @@ -40,7 +38,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class DatasetsTest extends DatasetsVerifier { @Parameterized.Parameters(name = "Dataset {0}") diff --git a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerValidateVersionTest.java b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerValidateVersionTest.java index cbae578f9..16dedd1f2 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerValidateVersionTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerValidateVersionTest.java @@ -26,8 +26,6 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.libreccm.tests.categories.UnitTest; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -38,7 +36,6 @@ import static org.junit.Assert.*; * * @author Jens Pelzetter */ -@Category(UnitTest.class) public class DependencyTreeManagerValidateVersionTest { public DependencyTreeManagerValidateVersionTest() { diff --git a/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java index c799c4929..ebd391bca 100644 --- a/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java @@ -27,7 +27,6 @@ import org.libreccm.messaging.Message; import org.libreccm.security.Party; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -38,7 +37,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/notification/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/notification/ToStringTest.java index bcf244356..48d0be9e8 100644 --- a/ccm-core/src/test/java/org/libreccm/notification/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/notification/ToStringTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.notification; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java index f538c008f..da421ed04 100644 --- a/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java @@ -26,7 +26,6 @@ import org.libreccm.core.CcmObject; import org.libreccm.core.Resource; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -37,7 +36,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/portal/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/portal/ToStringTest.java index 4ad9d9738..1c250ff00 100644 --- a/ccm-core/src/test/java/org/libreccm/portal/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/portal/ToStringTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.portal; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java index dfb1ce0ce..2a64d023c 100644 --- a/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java @@ -21,7 +21,6 @@ package org.libreccm.runtime; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -32,7 +31,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/runtime/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/runtime/ToStringTest.java index c3c192835..74f15094b 100644 --- a/ccm-core/src/test/java/org/libreccm/runtime/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/runtime/ToStringTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.runtime; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java index bd2dc37d1..1ca8df3c6 100644 --- a/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java @@ -23,7 +23,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.security.Group; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -34,7 +33,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/search/lucene/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/search/lucene/ToStringTest.java index 2ca7077b8..e180d3b46 100644 --- a/ccm-core/src/test/java/org/libreccm/search/lucene/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/search/lucene/ToStringTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.search.lucene; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/security/DatasetsTest.java b/ccm-core/src/test/java/org/libreccm/security/DatasetsTest.java index 1d33f1346..2ddd6a21e 100644 --- a/ccm-core/src/test/java/org/libreccm/security/DatasetsTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/DatasetsTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.security; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import static org.libreccm.testutils.DatasetType.*; @@ -36,7 +34,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class DatasetsTest extends DatasetsVerifier { @Parameterized.Parameters(name = "Dataset {0}") diff --git a/ccm-core/src/test/java/org/libreccm/security/DatasetsXmlTest.java b/ccm-core/src/test/java/org/libreccm/security/DatasetsXmlTest.java index ccf99d489..e2c224088 100644 --- a/ccm-core/src/test/java/org/libreccm/security/DatasetsXmlTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/DatasetsXmlTest.java @@ -20,10 +20,8 @@ package org.libreccm.security; import static org.libreccm.testutils.DatasetType.*; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetsVerifier; @@ -35,7 +33,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class DatasetsXmlTest extends DatasetsVerifier { @Parameterized.Parameters(name = "Dataset {0}") diff --git a/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java index e9fdb8543..75eb1b7ec 100644 --- a/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java @@ -22,7 +22,6 @@ import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.core.CcmObject; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import org.libreccm.workflow.AssignableTask; @@ -35,7 +34,6 @@ import java.util.Locale; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/security/ListContainsTest.java b/ccm-core/src/test/java/org/libreccm/security/ListContainsTest.java index 827602255..ab94910c7 100644 --- a/ccm-core/src/test/java/org/libreccm/security/ListContainsTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/ListContainsTest.java @@ -23,9 +23,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.libreccm.core.EmailAddress; -import org.libreccm.tests.categories.UnitTest; import java.util.ArrayList; import java.util.List; @@ -37,7 +35,6 @@ import static org.junit.Assert.*; * * @author Jens Pelzetter */ -@Category(UnitTest.class) public class ListContainsTest { public ListContainsTest() { diff --git a/ccm-core/src/test/java/org/libreccm/security/PartyConstraintTest.java b/ccm-core/src/test/java/org/libreccm/security/PartyConstraintTest.java index 4b178c5be..0f5bc9d63 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PartyConstraintTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PartyConstraintTest.java @@ -25,8 +25,6 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.libreccm.tests.categories.UnitTest; import java.util.Set; @@ -40,7 +38,6 @@ import static org.junit.Assert.*; * * @author Jens Pelzetter */ -@Category(UnitTest.class) public class PartyConstraintTest { public PartyConstraintTest() { diff --git a/ccm-core/src/test/java/org/libreccm/security/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/security/ToStringTest.java index 082a3a8d9..aff5da1dd 100644 --- a/ccm-core/src/test/java/org/libreccm/security/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/ToStringTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.security; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java index 74b04eac1..0d43dd378 100644 --- a/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java @@ -21,7 +21,6 @@ package org.libreccm.theming.db; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -33,7 +32,6 @@ import java.util.Objects; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java index abe3727bb..352ce7c71 100644 --- a/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java @@ -28,7 +28,6 @@ import org.libreccm.core.Resource; import org.libreccm.security.Group; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -39,7 +38,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/web/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/web/ToStringTest.java index 8e89990b0..062c41947 100644 --- a/ccm-core/src/test/java/org/libreccm/web/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/web/ToStringTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.web; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java index 36124b50b..2ccca5cfa 100644 --- a/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java @@ -19,14 +19,12 @@ package org.libreccm.workflow; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.core.CcmObject; import org.libreccm.security.Group; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -38,7 +36,6 @@ import java.util.Locale; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/workflow/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/workflow/ToStringTest.java index 438f46909..96dc2f8ae 100644 --- a/ccm-core/src/test/java/org/libreccm/workflow/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/workflow/ToStringTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.workflow; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/DatasetsTest.java b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/DatasetsTest.java index 7c00b9215..47710d531 100644 --- a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/DatasetsTest.java +++ b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/DatasetsTest.java @@ -20,14 +20,13 @@ package org.libreccm.shortcuts; import java.util.Arrays; import java.util.Collection; + import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetsVerifier; @@ -36,7 +35,6 @@ import org.libreccm.testutils.DatasetsVerifier; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class DatasetsTest extends DatasetsVerifier { @Parameterized.Parameters(name = "Dataset {0}") diff --git a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/EqualsAndHashCodeTest.java b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/EqualsAndHashCodeTest.java index 4b3524578..750cb25da 100644 --- a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/EqualsAndHashCodeTest.java +++ b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/EqualsAndHashCodeTest.java @@ -23,11 +23,9 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -38,7 +36,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ToStringTest.java b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ToStringTest.java index 7e604d59e..9c3d971c1 100644 --- a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ToStringTest.java +++ b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ToStringTest.java @@ -22,10 +22,8 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -37,7 +35,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-testutils/src/main/java/org/libreccm/tests/categories/IntegrationTest.java b/ccm-testutils/src/main/java/org/libreccm/tests/categories/IntegrationTest.java deleted file mode 100644 index 4de21a89d..000000000 --- a/ccm-testutils/src/main/java/org/libreccm/tests/categories/IntegrationTest.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2015 LibreCCM Foundation. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA - */ -package org.libreccm.tests.categories; - -import org.junit.experimental.categories.Category; - -/** - * A marker interface for use with JUnit's {@link Category} annotation to mark - * the tests which should be only executed when using one of the Arquillian - * profiles. - * - * Tests with this category are only executed in the Arquillian profiles and - * are executed by Arquillian inside a Java EE container. The tests are usually - * used to test CDI beans and EJBs. - * - * @author Jens Pelzetter - */ -public interface IntegrationTest { - -} diff --git a/ccm-testutils/src/main/java/org/libreccm/tests/categories/UnitTest.java b/ccm-testutils/src/main/java/org/libreccm/tests/categories/UnitTest.java deleted file mode 100644 index 9bbcf1723..000000000 --- a/ccm-testutils/src/main/java/org/libreccm/tests/categories/UnitTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2015 LibreCCM Foundation. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA - */ -package org.libreccm.tests.categories; - -import org.junit.experimental.categories.Category; - -/** - * A marker interface for use with JUnit's {@link Category} annotation to mark - * the tests which should be executed in every case. - * - * Tests which are grouped into this category are used to test an - * individual class. All external dependencies should be mocked. - * - * @author Jens Pelzetter - */ -public interface UnitTest { - -} diff --git a/ccm-testutils/src/main/java/org/libreccm/tests/categories/package-info.java b/ccm-testutils/src/main/java/org/libreccm/tests/categories/package-info.java deleted file mode 100644 index 0decdba5b..000000000 --- a/ccm-testutils/src/main/java/org/libreccm/tests/categories/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * The interfaces in this package are used to control which test are executed - * in the default module and which ones are executed in special profiles. - */ -package org.libreccm.tests.categories; From 85f3d901b5ff91e7f7bf7afb7815ddcea04ad6b7 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 18 Jul 2020 18:11:49 +0200 Subject: [PATCH 79/92] Removed obsolete ccm.sh script, refactored build-site.sh to use new profile --- build-site.sh | 2 +- ccm.sh | 501 -------------------------------------------------- 2 files changed, 1 insertion(+), 502 deletions(-) delete mode 100755 ccm.sh diff --git a/build-site.sh b/build-site.sh index a7e755ab7..2aa5a6bbe 100755 --- a/build-site.sh +++ b/build-site.sh @@ -1 +1 @@ -mvn clean package site site:stage -Dmaven.test.failure.ignore=true -Pwildfly-remote-h2-mem +mvn clean verify site site:stage -Dmaven.test.failure.ignore=true -Prun-its-with-wildfly-h2mem diff --git a/ccm.sh b/ccm.sh deleted file mode 100755 index b44fe5dc4..000000000 --- a/ccm.sh +++ /dev/null @@ -1,501 +0,0 @@ -#!/bin/bash - -# Provides shortcuts for working with LibreCCM - -wildfly_version="16.0.0.Final" -wildfly_pid_file="./WILDFLY_PID" -wildfly_home="" - -# Helper function for finding Wildfly. First the function checks if the -# environment variable JBOSS_HOME is set. If JBOSS_HOME is set is make sure -# that JBOSS_HOME points to a valid Wildfly installation. If JBOSS_HOME is not -# set the function checks if Wildfly is installed in ./runtime. If there is no -# Wildfly in runtime the function exits the script. -find_wildfly_home() { - #local wildfly_home="" - if [[ -n $JBOSS_HOME ]]; then - echo "JBOSS_HOME = $JBOSS_HOME" - if [ -f "$JBOSS_HOME/bin/standalone.sh" ]; then - echo $JBOSS_HOME - else - echo -e "\e[41mJBOSS_HOME is set but there is no $JBOSS_HOME/bin/standalone.sh. Please make sure that JBOSS_HOME points to a valid Wildfly installation.\e[0m" - exit 1 - fi - elif [[ -d "./runtime/wildfly-$wildfly_version" ]]; then - wildfly_home="./runtime/wildfly-$wildfly_version" - echo "wildfly_home is '$wildfly_home'" - pushd $wildfly_home - wildfly_home=$(pwd) - echo "wildfly_home is '$wildfly_home'" - popd - #echo $wildfly_home - else - echo -e "\e[41mThere is no Wildfly in ./runtime/ neither is JBOSS_HOME set. Please install Wildfly $wildfly_version into ./runtime/ using install-runtime or set the JBOSS_HOME enviroment variable.\e[0m" - exit 1 - fi -} - -# Build the project site. -# -# @param $1 (optional): Maven profile to use. -# -build_site() { - echo "build_site_param1: $1" - echo "build_site_param2: $2" - - if [ -n "$1" ]; then - echo "Building project site with profile $1..." - mvn clean package site site:stage -Dmaven.test.failure.ignore=true -P$1 - else - echo "Building project site without a profile..." - mvn clean package site site:stage -Dmaven.test.failure.ignore=true - fi -} - -# Build all modules -# -# @param $1 (optional): Maven profile to use. -# -build() { - if [ -n "$1" ]; then - mvn clean package -P$1 - else - mvn clean package - fi -} - -# Build a module -# -# @param $1 (mandantory): The artifact ID of the module to build. -# @param $2 (optional) : The profile to use. -# -build_module() { - if [ -n "$1" ]; then - if [ -n "$2" ]; then - mvn clean package -P$2 -pl $1 -am - else - mvn clean package -pl $1 -am - fi - else - echo "Usage: ccm.sh build-module MODULE [PROFILE]" - exit 1 - fi -} - -# Helper method for starting runtime for integration tests -# @param $1 (mandantory): Runtime to start -# -start_test_runtime() { - if [ "$1"="wildfly" ]; then - echo "Starting Wildfly running tests..." - #local wildfly_home=$(find_wildfly_home) - - find_wildfly_home - #pushd $(find_wildfly_home) - pushd $wildfly_home - LAUNCH_JBOSS_IN_BACKGROUND=1 JBOSS_PIDFILE=$wildfly_pid_file ./bin/standalone.sh & - popd - echo "Waiting 120s for Wildfly to start up..." - sleep 120 - - if [ -n "$profile" ]; then - mvn clean test -P$profile - else - mvn clean test - fi - - echo "Stopping Wildfly..." - pushd $wildfly_home - kill $(<"$wildfly_pid_file") - popd - - elif [ "$1"="tomee" ]; then - echo "Not implemented yet." - exit 1 - else - echo "Unsupported runtime $1. Supported runtimes are wildfly and tomee." - exit 1 - fi - -} - -# Helper method for stopping the test runtime -# -# @param $1 (mandantory): Runtime to stop -# -stop_test_runtime() { - if [ "$1" = "wildfly" ]; then - echo "Stopping Wildfly..." - find_wildfly_home - #local wildfly_home=$(find_wildfly_home) - - pushd $wildfly_home - kill $(<"$wildfly_pid_file") - popd - elif [ "$1" = "tomee" ]; then - echo "Not implemented yet." - exit 1 - else - echo "Unsupported runtime $1. Supported runtime are wildfly and tomee." - exit 1 - fi - -} - -# Run all tests -test_all() { - echo "Running all tests for all modules..." - if [[ $1 =~ ^wildfly-managed.* ]]; then - echo "...using a managed Wildfly container" - find_wildfly_home - #local wildfly_home=$(find_wildfly_home) - - echo "...using profile $1" - echo "" - if [ -n $STARTUP_TIMEOUT ]; then - mvn clean test -Djboss.home=$wildfly_home -DstartuptimeoutInSeconds=$STARTUP_TIMEOUT -P$1 - else - mvn clean test -Djboss.home=$wildfly_home -P$1 - fi - - elif [[ $1 =~ ^wildfly-remote.* ]]; then - echo "...using a remote Wildfly container" - if [[ $2 == "start" ]]; then - echo "...starting runtime" - start_test_runtime wildfly - else - echo "...runtime is started manually" - fi - - echo "...using profile $1" - mvn clean test -P$1 - - if [[ $2 == "start" ]]; then - echo "...stopping runtime" - fi - else - if [[ -n $1 ]]; then - echo -n -e "\e[43m" - echo "Warning: " - echo "The provided profile starts with an unknown prefix. Tests" - echo "which require a running application server may fail. " - echo -n -e "\e[0m" - - fi - - mvn clean test - fi -} - -# Run tests for a module -test_module() { - - if [[ -z $1 ]]; then - echo -e "\e[41mUsage: ccm.sh test-module MODULE [PROFILE] [start]\e[0m" - exit 1 - fi - - echo "Running tests for module $1..." - if [[ $2 =~ ^wildfly-managed.* ]]; then - echo "...using a managed Wildfly container." - find_wildfly_home - #local wildfly_home=$(find_wildfly_home) - echo "...using profile $2" - echo "" - if [ -n $STARTUP_TIMEOUT ]; then - mvn clean test -Djboss.home=$wildfly_home -DstartupTimeoutInSeconds=$STARTUP_TIMEOUT -pl $1 -am -P$1 - else - mvn clean test -Djboss.home=$wildfly_home -pl $1 -am -P$2 - fi - elif [[ $2 =~ ^wildfly-remote.* ]]; then - echo "Using a remote Wildfly container..." - if [[ $3 == "start" ]]; then - echo "...starting runtime" - start_test_runtime wildfly - else - echo "...runtime is started manually" - fi - - echo "...using profile $2" - mvn clean test -pl $1 -am -P$2 - - if [[ $3 == "start" ]]; then - echo "...stopping runtime" - fi - else - if [[ -n $2 ]]; then - echo -n -e "\e[43m" - echo "Warning: " - echo "The provided profile starts with an unknown prefix. Tests" - echo "which require a running application server may fail. " - echo -n -e "\e[0m" - fi - - mvn clean test -pl $1 -am - fi -} - -# Run a single testsuite or test -run_test() { - - if [ -z "$1" -o -z "$2" ]; then - echo -e "\e[41mUsage: ccm.sh test-module MODULE TEST [PROFILE] [start]\e[0m" - exit 1 - fi - - echo "Running test $2 from module $1..." - if [[ $3 =~ ^wildfly-managed.* ]]; then - echo "...using a managed Wildfly container." - find_wildfly_home - #local wildfly_home=$(find_wildfly_home) - - echo "...using Wildfly in $wildfly_home" - echo "...using profile $3" - echo "" - if [ -n $STARTUP_TIMEOUT ]; then - mvn clean test -Djboss.home=$wildfly_home -DstartupTimeoutInSeconds=$STARTUP_TIMEOUT -Dtest=$2 -DfailIfNoTests=false -pl $1 -am -P$3 - else - mvn clean test -Djboss.home=$wildfly_home -Dtest=$2 -DfailIfNoTests=false -pl $1 -am -P$3 - fi - elif [[ $3 =~ ^wildfly-remote.* ]]; then - echo "Using a remote Wildfly container..." - if [[ $4 == "start" ]]; then - echo "...starting runtime" - start_test_runtime wildfly - else - echo "...runtime is started manually" - fi - - mvn clean test -Dtest=$2 -DfailIfNoTests=false -pl $1 -am -P$3 - - if [[ $4 == "start" ]]; then - echo "...stopping runtime" - stop_test_runtime wildfly - fi - else - if [[ -n $3 ]]; then - echo -n -e "\e[43m" - echo "Warning: " - echo "The provided profile starts with an unknown prefix. Tests" - echo "which require a running application server may fail. " - echo -n -e "\e[0m" - fi - - mvn clean test -Dtest=$2 -DfailIfNoTests=false -pl $1 -am - fi - -} - - - -install_runtime() { - local runtime="" - if [ -z $1 ]; then - runtime="wildfly" - else - runtime=$1 - fi - - echo "Installing runtime $runtime..." - if [ $runtime = wildfly ]; then - - if [ -d ./runtime/wildfly-$wildfly_version ]; then - echo "Wildfly $wildfly_version is already installed as runtime. Exiting" - exit 1 - fi - - if [ ! -d ./runtime ]; then - mkdir ./runtime - fi - - pushd runtime - if [ -f wildfly-$wildfly_version.tar.gz ]; then - echo "Wildfly $wildfly_version has already been downloaded, using existing archive." - else - wget http://download.jboss.org/wildfly/$wildfly_version/wildfly-$wildfly_version.tar.gz - fi - - if [ ! -f wildfly-$wildfly_version.tar.gz ]; then - echo "Failed to download Wildfly." - exit 1 - fi - - tar vxzf wildfly-$wildfly_version.tar.gz - echo "" - echo "Wildfly extracted successfully. Please provide a username and password for a Wildfly management user (admin):" - echo "" - local username="" - while [ -z $username ]; do - echo -n "Username.......: " - read username - if [ -z $username ]; then - echo "Username can't be empty!" - fi - done - local password="" - local passwordrepeat="" - while [ -z $password -o $password != $passwordrepeat ]; do - echo -n "Password.......: " - read -s password - if [ -z $password ]; then - echo "" - echo "Password can't be empty!" - continue - fi - echo "" - echo -n "Repeat password: " - read -s passwordrepeat - if [ $password != $passwordrepeat ]; then - echo "" - echo "Passwords do not match." - continue - fi - done - echo "" - echo "Creating Wildfly management user $username..." - pushd wildfly-$wildfly_version - sh ./bin/add-user.sh $username $password - popd - popd - - echo "" - echo "Wildfly $wildfly_version successfully installed in ./runtime." - echo "Before running LibreCCM you have to configure a datasource." - echo "To do that run" - echo "" - echo "ccm.sh run --with-runtime wildfly " - echo "" - echo "Then open a browser and go to " - echo "" - echo "localhost:9990" - echo "" - echo "and configure a datasource. Refer to the Wildfly documentation for more details." - - elif [ $runtime = tomee ]; then - echo "Not implememented yet." - else - echo "Unsupported runtime. Supported runtimes are wildfly (default) and tomee." - fi - -} - -run() { - local runtime="" - local runtime_only=false - local bundle="" - - if [ "$1" = "-r" ]; then - runtime="$2" - runtime_only=true - else - runtime_only=false - bundle=$1 - fi - - if [ $runtime_only == true ]; then - echo "Starting application server without deploying a bundle..." - if [[ -z "$runtime" ]]; then - echo "No application server set, using default (Wildfly)..." - runtime="wildfly" - fi - - if [ $runtime="wildfly" ]; then - find_wildfly_home - # local wildfly_home=$(find_wildfly_home) - - pushd $wildfly_home - sh ./bin/standalone.sh - popd - elif [ $runtime="tomee" ]; then - echo "Not implemented yet." - exit 0 - else - echo -e "\e[41mUnknown runtime $runtime. Please specify a supported runtime.\e[0m" - exit 1 - fi - else - if [[ -z $bundle ]]; then - echo "No bundle specificed. Please specifiy a bundle." - echo "Usage: ccm.sh run BUNDLE" - exit 1 - fi - - echo "Running bundle $bundle..." - if [[ $bundle=~^.*-wildfly$ ]]; then - find_wildfly_home - # local wildfly_home=$(find_wildfly_home) - echo "Using Wildfly in $wildfly_home..." - mvn package wildfly:run -Djboss-as.home=${wildfly_home} -DskipTests -pl $bundle -am -Pgeneric - elif [[ $bundle=~^.*-wildfly-swarm$ ]]; then - echo "Not implemented yet" - exit 0 - elif [[ $bundle=~^.*-tomee$ ]]; then - echo "Not implemented yet" - exit 0 - else - echo -e "\e[41mThe bundle '$bundle' has an unknown suffix. Are you sure that you specified a valid bundle?\e[0m" - fi - fi -} - -stop_runtime() { - local runtime="" - if [ -n "$1" ]; then - runtime=$1 - else - runtime="wildfly" - fi - - if [ runtime = "wildfly"]; then - echo "Nothing to do, the Wildfly Maven plugins automatically stops Wildfly." - elif [ $runtime = "tomee"]; then - echo "Not implemented yet." - exit 0 - else - echo "Unknown runtime." - exit 1 - fi -} - -show_help() { - echo "ccm.sh is a helper script for building and running LibreCCM in a -development environment. It provides shortcuts for several Maven goals. The available subcommands are: - - build-site [PROFILE] : Builds the Maven project site. - build [PROFILE] : Build all LibreCCM modules. - build-module MODULE [PROFILE] : Build a specific LibreCCM module. - test-all [[PROFILE] [start]] : Run all tests for all modules. - test-module MODULE [[PROFILE] [start]] : Run all tests for a specific - LibreCCM module. - run-test MODULE TEST [[PROFILE] [start]]: Run a specific testsuite or a - single test method. - install-runtime [RUNTIME] : Download and install a runtime - (application server) into - ./runtime - run [-r RUNTIME] [BUNDLE] : Run a runtime (application server) - help : Show this help message. - - A detailed description of the subcommands is provided in ccm-readme.txt" - - - - exit 0; -} - -echo "param1: $1" -echo "param2: $2" - -case $1 in - build-site) build_site $2 ;; - build) build $2 ;; - build-module) build_module $2 ;; - test-all) test_all $2 $3 $4 ;; - test-module) test_module $2 $3 $4 $5 ;; - run-test) run_test $2 $3 $4 $5 ;; - install-runtime) install_runtime $2 ;; - run) run $2 $3 $4 ;; - stop-runtime) stop_runtime $2 ;; - help) show_help ;; - *) show_help ;; - -esac From d37f85940031f8ef6b597bb9c85e5d29cd6058b4 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 18 Jul 2020 18:13:13 +0200 Subject: [PATCH 80/92] Removed obsolete ccm-readme.txt --- ccm-readme.txt | 261 ------------------------------------------------- 1 file changed, 261 deletions(-) delete mode 100644 ccm-readme.txt diff --git a/ccm-readme.txt b/ccm-readme.txt deleted file mode 100644 index b0cd37a63..000000000 --- a/ccm-readme.txt +++ /dev/null @@ -1,261 +0,0 @@ -ccm.sh is a helper script for building and running LibreCCM in a development -environment. It provides shortcuts for several Maven goals. The available -subcommands are: - -build-site [PROFILE] : Builds the Maven project site. -build [PROFILE] : Builds LibreCCM using the provided - profile -build-module MODULE [PROFILE] : Build a specific LibreCCM module. -test-all [[PROFILE] [start]] : Run tests for all modules. -test-module MODULE [[PROFILE] [start]]: Run tests for a specific LibreCCM - module. -test MODULE TEST [[PROFILE] [start]] : Run a specific testsuite or a single - test method. -install-runtime [RUNTIME] : Download and install a runtime - (application server) into ./runtime. -run [-r RUNTIME] [BUNDLE] : Run a runtime (application server) -help : Show this help message. - -build-site [PROFILE] -==================== - -Builds the project site. If a profile is provided it is passed to Maven. With a -profile this subcommand is equivalent to the Maven command: - - mvn clean package site site:stage -Dmaven.test.failure.ignore=true - -P$PROFILE - -Otherwise it equivalent to - - mvn clean package site site:state -Dmaven.test.failure.ignore=true - -build [PROFILE] -=============== - -Builds to complete project, optionally using a Maven profile. Without a -profile this is equivalent to - - mvn clean package - -With a profile it is equivalent to - - mvn clean package -P$PROFILE - -build-module MODULE [PROFILE] -============================= - -Build a specific LibreCCM module. Equivalent to - - mvn clean package -pl MODULE -am - -without a profile and to - - mvn clean package -PPROFILE -pl MODULE -am - -with a profile. - -test-all [[PROFILE] [start]] -============================ - -Run all tests for all modules. The name of the (optional) profile is used to -determine if a runtime (application server) is started and which application -server is started. Some profiles use Arquillian container adapters which don't -require a running application server. Others requires a running a application -server. For those profiles the application server deduced from the profile -name is started if the last parameter is "start". Otherwise the application -server must be started manully before running the tests. Please note that the -use of the "start" parameter is not recommanded because is may causes -problems. It is recommanded to either start the application server manually or -to use a profile which uses an Arquillian container adapter which starts the -application server itself. - -This subcommand is equivalent to the Maven command - - mvn clean test -PPROFILE - -with a profile and to - - mvn clean test - -without a profile. - -test-module MODULE [[PROFILE] [start]] -====================================== - -Runs the tests for a specific module. The name of the module is a mandatory -parameter. - -The name of the (optional) profile is -used to to determine if a runtime (application server) is started and -application server is started. Some profiles use Arquillian container adapters -which dont't require a running application server. Others require a running -application server. For those profiles the application is deduced from the -profile is started if the the last parameter is "start". Otherwise the -application server must be started manually before running the tests. Please -note that the use of the "start" parameter is not recommanded. It is -recommanded to either start the application server manually or to use a -profile which uses a container adapter which starts the application server -itself. - -This subcommand is equivalent to the Maven command - - mvn clean test -pl MODULE -am -PPROFILE - -with a profile and to - - mvn clean test -pl MODULE -am - -without a profile. - -test MODULE TEST [[PROFILE] [start]] -==================================== - -Runs the a specific testsuite or a single test. Module and test are mandatory -parameters. The testsuite or test to run is set using the following syntax: - -fully.qualified.classname.of.testclass[#test-method] - -The name of the (optional) profile is -used to to determine if a runtime (application server) is started and -application server is started. Some profiles use Arquillian container adapters -which dont't require a running application server. Others require a running -application server. For those profiles the application is deduced from the -profile is started if the the last parameter is "start". Otherwise the -application server must be started manually before running the tests. Please -note that the use of the "start" parameter is not recommanded. It is -recommanded to either start the application server manually or to use a -profile which uses a container adapter which starts the application server -itself. - -This subcommand is equivalent to the Maven command - - mvn clean test -Dtest=TEST -DfailIfNoTests=false -pl MODULE -am -PPROFILE - -with a profile and to - - mvn clean test -Dtest=TEST -DfailIfNoTests=false -pl MODULE -am - -without a profile. - -Some examples: - -Run all tests in the class org.libreccm.configuration.EqualsAndHashCodeTest in -the ccm-core module: - -ccm.sh test ccm-core org.libreccm.configuration.EqualsAndHashCodeTest - -Run all tests in the class org.libreccm.core.CcmObjectRepositoryTest in the -ccm-core module. These tests is run using Arquillian and require a runtime and -is only run when an integration test profile is used. The application server -must be started before the test are invoked. - -ccm.sh test ccm-core org.libreccm.core.CcmObjectRepositoryTest wildfly-remote-h2-mem - -This example runs the same tests as the previous example but uses a managed -profile. The application server will started by Arquillian automatically: - -ccm.sh test ccm-core org.libreccm.core.CcmObjectRepositoryTest -wildfly-managed-h2-mem - -Or if you only want to run the saveChangedCcmObject test: - -ccm.sh test ccm-core -org.libreccm.core.CcmObjectRepositoryTest#saveChangedCcmObject wildfly-managed-h2-mem - - -install-runtime [RUNTIME] -========================= - -Install an runtime (application server) into ./runtime. At the moment only -Wildfly is supported. - -./ccm.sh install-runtime - -or - -./ccm.sh install-runtime wildfly - -will - -a) Create the directory runtime in the current working directory (if it not - exists already) - -b) Download the current version of the Wildfly Application Server - (10.1.0.Final) in ./runtime - -c) Extract Wildfly - -d) Ask for the username and password for a management user for Wildfly (see - the Wildfly documentation for details on that). - -run -r [RUNTIME]| BUNDLE -================================================== - -Starts an application server (at the moment only Wildfly is supported). - -If "-r" is set only the application server will be started and no bundle will -be deployed. This is useful for configuring the application server. If no -runtime is specified Wildfly will be used. - -If a bundle is provided the runtime (application server) to start is deduced -from the name of the bundle. For example if the name of the bundle ends with -'-wildfly' Wildfly is started and the bundle is deployed to Wildfly. - -The method of starting the application server and deploying the bundle depends -on the application server. - -IMPORTANT: You must configure a datasource with the JNDI-URL required by the -bundle you want to run before running LibreCCM. For Wildfly this can be done -using Wildfly's administration UI available at - -http://localhost:9990 - - -Supported Application servers -============================= - -Wildfly -------- - -If the JBOSS_HOME environment variable is set the script will use the server -in the directory provided by JBOSS_HOME for starting Wildfly. -You may provide a value for this variable when calling the script: - - JBOSS_HOME=/path/to/wildfly ./ccm.sh run [wildfly] - -For profiles using the wildfly-arquillian-container-remote adapter Wildfly -must be started manually. The subcommands for running test have an optional -parameter for starting Wildfly automatically if a remote profile is used, but -this is not recommanded. If a profile is used which uses -wildfly-arquillian-container-managed Arquillian starts the container -automatically. - -If JBOSS_HOME is not set the script will look for a Wildfly installation in -./runtime. The install-runtime subcommand can be used to install Wildfly -there. The script passes this parameter to Maven in the required form. - -The datasource configuration is done using Wildfly's administration UI. To -create a datasource open a browser and go to - - localhost:9990 - -You will be asked for the username and password of a management user. Then go -to - - Configuration/Subsystems/Datasources/Non-XA - -and a datasource for the bundle you want to use. - -Some JNDI-Datasource-URLs: - -ccm-bundle-devel-wildfly java:/comp/env/jdbc/libreccm/db - -For running integration tests via Arquillian in Wildfly the -wildfly-arquillian-container-managed container adapter is used for managed -profiles. For remote profiles Wildfly is started by invoking bin/standalone.sh -directly, but only if the "start" parameter is present. - -For running LibreCCM the wildfly-maven-plugin is used. - - - From 94c850bcc8f47b6fbe0b3057ed8167a83083ff8d Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 18 Jul 2020 19:12:05 +0200 Subject: [PATCH 81/92] Adjusted README.md to new test structure and added instructions for running a bundle using the wildfly-maven-plugin --- README.md | 106 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 68 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index d470d98c9..b414d0220 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,13 @@ # LibreCCM -The [https://libreccm.org](LibreCCM) framework and the -[https://librecms.org](LibreCMS) web content management system. +The [https://libreccm.org](LibreCCM) framework and the +[https://librecms.org](LibreCMS) web content management system. -This repository contains the Jakarta EE based, new version of LibreCCM -and LibreCMS. We are now using Maven as build tool. +## Overview + +This repository contains the Jakarta EE based, new version of +[https://libreccm.org](LibreCCM) and [https://librecms.org](LibreCMS). We are +now using Maven as build tool. Some more documentation is provided as Maven project site. To create the site run @@ -15,46 +18,82 @@ and open the ./target/staging/index.html file in your browser. The recreate the site run - mvn clean package site site:stage + mvn package site site:stage again. -To include integration tests into the reports +Note: The ./target/staging folder is left intact when cleaning. If you +want to remove the folder you have delete it manually. - mvn clean package test site site:stage -P$profile-name +To include integration tests into the reports run -Note: If there are test failures the package goal fails and the site is not + mvn clean verifiy site site:stage -P${profileName} + +Note: If there are test failures the build fails and the site is not build. The build the site anywhy use mvn clean package site site:stage -Dmaven.test.failure.ignore=true -or with a profile +or with the integration tests included - mvn clean package site site:stage -Dmaven.test.failure.ignore=true -Pwildfly-remote-h2-mem + mvn clean verify site site:stage -Dmaven.test.failure.ignore=true -P${profileName} -The available profiles are listed in the documentation. All modules should -provide a profile called wildfly-remote-h2-mem. This profile uses a remote -Wildfly application server and its integrated H2 in-memory database for -running the tests. Before you can run the integration tests you must download -Wildfly from http://www.wildfly.org. Unzip the downloaded archive and start -the server using the bin/standalone.sh file. Then go to another terminal, -navigate to the CCM NG directory and run +## Running integration tests - mvn clean package test site site:stage -Pwildfly-remote-h2-mem +Some of the modules provide integration tests which use +[Arquillian](http://arquillian.org/) to run tests inside an application server. +If a module provides integration tests it should have at least four profiles +for running them (at the time of writing): + +* `run-its-with-wildfly-h2mem`: This profile uses the + [wildfly-maven-plugin](https://docs.jboss.org/wildfly/plugins/maven/latest/) + to start a Wildfly and run the integration tests. The H2 database which is + integrated with Wildfly is used for run the tests. No configuration + is necessary. +* `run-its-with-wildfly-pgsql`: This profile uses the + [wildfly-maven-plugin](https://docs.jboss.org/wildfly/plugins/maven/latest/) + to start a Wildfly and run the integration tests. A PostgreSQL database is + used to run the tests. The connection parameters are configured using + the `it-pgsql-datasources.properties` file in the project root. Make sure + to create a database for all modules and configure them before using + this profile. +* `run-its-in-remote-wildfly-h2mem`: This profile uses a remote Wildfly and + the H2 database for + running the tests. The user it responsible for starting the Wildfly container + and for creating the required databases. +* `run-its-in-remote-wildfly-pgsql`: This profile uses a remote Wildfly and + PostgreSQL databases for + running the tests. The user it responsible for starting the Wildfly container + and for creating the required databases. + +To run the integration tests select a profile - we recommend to use the profiles +which use the wildfly-maven-plugin` to manage to Wildfly application server - +and run + + mvn verify site site:stage -P${profileName} + +## Running LibreCCM (development environment) + +Before running a bundle the WAR file has the be generated using + + mvn package To run LibreCCM choose the bundle to run, for instance -ccm-bundle-devel-wildfly. Depending on the bundle and the selected profile -you may have to configure a datasource in the Wildfly server and create a -database. Also you need to configure an environement variable which points to -your Wildfly installation. Then you can run LibreCCM using +`ccm-bundle-devel-wildfly`. You can run the bundle - mvn package wildfly:run -DskipTests -pl ccm-bundle-devel-wildfly -am -Pgeneric + mvn wildfly:run -pl ${bundleName} -am -The above example skips all tests to speed up the start process. The generic -profile used in this example uses an existing Wildfly installation. The -JBOSS_HOME environment variable must either be configured or must be provided. -Alternativly you can provide the location of your Wildfly installation using -the -D switch: mvn -Djboss-as.home=/path/to/wildfly/ +This will start a Wildfly server running the selected bundle. Before running +the bundle the Wildfly container has the be configured. For these purpose, run + + mvn wildfly:run -pl ${bundleName} -am -Psetup-runtime + +This will start the Wildfly server, deploy the bundle WAR, and create a +datasource. At the moment only PostgreSQL is supported as database. The +datasource configuration is provided by the `datasource.properties` file in the +bundle directory. To create one copy the example file and adjust the settings. + +## Archetypes To install the archetypes in your local Maven repository run @@ -64,15 +103,6 @@ for example mvn clean install -pl ccm-cms-archetypes-contenttype -am -Using the managed profiles (example is for testing): - -mvn clean test -Djboss.home=/path/to/wildfly/ -DstartupTimeoutInSeconds=180 -Pwildfly-managed-h2-mem - -You might need to increase the timeout. - -For convience, we also provide a small Bash script which makes calling some Maven tasks easier. For more information please refer to the help of the ccm.sh script: - - ccm.sh --help - + From ca616c485ecb710f6d3fd03327bb376c7eecc847 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 18 Jul 2020 19:14:26 +0200 Subject: [PATCH 82/92] Adjusted Jenkinsfile for use new profile --- Jenkinsfile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 568677614..1834ab2a2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,28 +1,22 @@ pipeline { agent any tools { - maven 'apache-maven-3.6.0' + maven 'apache-maven-3.6.3' } stages { stage('Build and Test') { steps { dir('') { - // sh 'mvn clean package test -Pwildfly-remote-h2-mem' - sh 'mvn clean package -Pwildfly-remote-h2-mem' - } - } - post { - always { - sh 'sudo systemctl restart wildfly' + sh 'mvn clean verify -Prun-its-with-wildfly-h2mem' } } } stage("Analyse") { steps { dir('') { - sh 'mvn package pmd:pmd pmd:cpd spotbugs:spotbugs' + sh 'mvn pmd:pmd pmd:cpd spotbugs:spotbugs' } - } + } } stage("Deploy") { steps { From 7cccd16b2f95d52d893b024fd4bf6628c73a230c Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sun, 16 Aug 2020 10:10:53 +0200 Subject: [PATCH 83/92] Updated README and Jenkinsfile --- Jenkinsfile | 2 +- README.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1834ab2a2..0081a14b9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent any tools { - maven 'apache-maven-3.6.3' + maven 'apache-maven-3.6.0' } stages { stage('Build and Test') { diff --git a/README.md b/README.md index b414d0220..c99cffc42 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,10 @@ datasource. At the moment only PostgreSQL is supported as database. The datasource configuration is provided by the `datasource.properties` file in the bundle directory. To create one copy the example file and adjust the settings. +You also have to create a wildfly.properties file which contains some settings +for the Wildfly server, for isntance the port the Wildfly server binds to. An +example file is provided. + ## Archetypes To install the archetypes in your local Maven repository run From d5ac4dc46c413d96d69a26652db57b707beaacdc Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sun, 16 Aug 2020 10:38:56 +0200 Subject: [PATCH 84/92] Use port 8180 for Wildfly --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0081a14b9..ff45c16ee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ pipeline { stage('Build and Test') { steps { dir('') { - sh 'mvn clean verify -Prun-its-with-wildfly-h2mem' + sh 'mvn clean verify -Prun-its-with-wildfly-h2mem -Dwildfly.port=8180' } } } From a20aee494cfb3a64bd9c7a58e0d2cf9c325d5b84 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sun, 16 Aug 2020 10:42:08 +0200 Subject: [PATCH 85/92] Use port 8180 for Wildfly HTTP --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ff45c16ee..420b1e5bc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ pipeline { stage('Build and Test') { steps { dir('') { - sh 'mvn clean verify -Prun-its-with-wildfly-h2mem -Dwildfly.port=8180' + sh 'mvn clean verify -Prun-its-with-wildfly-h2mem -Djboss.http.port=8180 -Djboss.https.port=8443' } } } From 55de9bce9ab889f730cf69f24a60c1e67007dbf7 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sun, 16 Aug 2020 10:42:33 +0200 Subject: [PATCH 86/92] typo --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 420b1e5bc..868248da0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ pipeline { stage('Build and Test') { steps { dir('') { - sh 'mvn clean verify -Prun-its-with-wildfly-h2mem -Djboss.http.port=8180 -Djboss.https.port=8443' + sh 'mvn clean verify -Prun-its-with-wildfly-h2mem -Djboss.http.port=8180 -Djboss.https.port=8543' } } } From a9645cbe72a73d23ef4106c574670168110a758d Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sun, 16 Aug 2020 11:07:01 +0200 Subject: [PATCH 87/92] Use properties file for configuring Wildfly ports --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 868248da0..91e5ba475 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ pipeline { stage('Build and Test') { steps { dir('') { - sh 'mvn clean verify -Prun-its-with-wildfly-h2mem -Djboss.http.port=8180 -Djboss.https.port=8543' + sh 'mvn clean verify -Prun-its-with-wildfly-h2mem -Dwildfly.propertiesFiles=/srv/libreccm-wildfly.properties' } } } From 46b6bef71e9e6f9b873162d02a29f88a5d0877af Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sun, 16 Aug 2020 12:18:09 +0200 Subject: [PATCH 88/92] Typo --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 91e5ba475..45f33eafb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ pipeline { stage('Build and Test') { steps { dir('') { - sh 'mvn clean verify -Prun-its-with-wildfly-h2mem -Dwildfly.propertiesFiles=/srv/libreccm-wildfly.properties' + sh 'mvn clean verify -Prun-its-with-wildfly-h2mem -Dwildfly.propertiesFile=/srv/libreccm-wildfly.properties' } } } From 7b851b548851116252f8dac2d3546f782b38daa1 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sun, 16 Aug 2020 13:53:48 +0200 Subject: [PATCH 89/92] Fixed another Issue in the Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 45f33eafb..eb40eb969 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,8 +40,8 @@ pipeline { body: "Build ${env.BUILD_URL} failed." } always { - junit testResults: '**/target/surefire-reports/*.xml' - + junit allowEmptyResults testResults: '**/target/surefire-reports/*.xml' + recordIssues enabledForFailure: true, tools: [java(), javaDoc()] recordIssues enabledForFailure: false, tool: spotBugs() recordIssues enabledForFailure: false, tool: cpd(pattern: '**/target/cpd.xml') From bdedb80a8b7c364d405888b9033df5c273708506 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sun, 16 Aug 2020 14:00:39 +0200 Subject: [PATCH 90/92] Typo --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index eb40eb969..1aec98ee3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,7 +40,7 @@ pipeline { body: "Build ${env.BUILD_URL} failed." } always { - junit allowEmptyResults testResults: '**/target/surefire-reports/*.xml' + junit allowEmptyResults: true testResults: '**/target/surefire-reports/*.xml' recordIssues enabledForFailure: true, tools: [java(), javaDoc()] recordIssues enabledForFailure: false, tool: spotBugs() From 2a928b91be442795c1b2c8eb42aba4238dbf9ba9 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sun, 16 Aug 2020 14:01:42 +0200 Subject: [PATCH 91/92] Typo --- Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1aec98ee3..63d9be616 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,7 +40,10 @@ pipeline { body: "Build ${env.BUILD_URL} failed." } always { - junit allowEmptyResults: true testResults: '**/target/surefire-reports/*.xml' + junit { + allowEmptyResults: true + testResults: '**/target/surefire-reports/*.xml' + } recordIssues enabledForFailure: true, tools: [java(), javaDoc()] recordIssues enabledForFailure: false, tool: spotBugs() From 6f473bc48e75c7af674dc7b417259bf3d7547a88 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sun, 16 Aug 2020 14:03:48 +0200 Subject: [PATCH 92/92] typo --- Jenkinsfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 63d9be616..6ee6b771e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,10 +40,8 @@ pipeline { body: "Build ${env.BUILD_URL} failed." } always { - junit { - allowEmptyResults: true - testResults: '**/target/surefire-reports/*.xml' - } + junit allowEmptyResults: true, testResults: '**/target/surefire-reports/*.xml' + recordIssues enabledForFailure: true, tools: [java(), javaDoc()] recordIssues enabledForFailure: false, tool: spotBugs()