diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index 0c8b4c70c..44af040fa 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -420,7 +420,7 @@ postgresql9 - de.jpdigital.research.accessibilitystudy + org.libreccm true @@ -480,11 +480,11 @@ 0.7.5.201505241946 test - + @@ -495,6 +495,9 @@ src/test/resources-wildfly8-embedded + + ${project.build.directory}/generated-resources + @@ -508,7 +511,7 @@ postgresql9 - de.jpdigital.research.accessibilitystudy + org.libreccm true @@ -586,20 +589,23 @@ 0.7.4.201502262128 test - + - /src/test/resources + src/test/resources - /src/test/resources-wildfly8-remote-h2-mem + src/test/resources-wildfly8-remote-h2-mem + + + ${project.build.directory}/generated-resources @@ -614,7 +620,7 @@ postgresql9 - de.jpdigital.research.accessibilitystudy + org.libreccm true @@ -651,6 +657,91 @@ + + + wildfly8-remote-pgsql + + + org.wildfly + wildfly-arquillian-container-remote + 8.2.0.Final + test + + + org.jacoco + org.jacoco.core + 0.7.4.201502262128 + test + + + + + + + + src/test/resources + + + src/test/resources-wildfly8-remote-pgsql + + + ${project.build.directory}/generated-resources + + + + + + de.jpdigital + hibernate4-ddl-maven-plugin + + + h2 + mysql5_innodb + postgresql9 + + + org.libreccm + + true + + + + + gen-ddl + + process-classes + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.18.1 + + always + 999 + true + + org.jboss.logmanager.LogManager + ${project.basedir}/target/wildfly-8.2.0.Final + ${project.basedir}/target/wildfly-8.2.0.Final/modules + + false + + org.libreccm.tests.categories.UnitTest, + org.libreccm.tests.categories.IntegrationTest + + + + + + + + \ No newline at end of file diff --git a/ccm-core/src/main/java/org/libreccm/categorization/Domain.java b/ccm-core/src/main/java/org/libreccm/categorization/Domain.java index 251283aa4..829161d56 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/Domain.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/Domain.java @@ -62,7 +62,7 @@ import org.omg.CORBA.DomainManager; * @author Jens Pelzetter */ @Entity -@Table(name = "domains") +@Table(name = "category_domains") public class Domain extends CcmObject implements Serializable { private static final long serialVersionUID = 4012590760598188732L; diff --git a/ccm-core/src/main/java/org/libreccm/core/UserGroup.java b/ccm-core/src/main/java/org/libreccm/core/Group.java similarity index 94% rename from ccm-core/src/main/java/org/libreccm/core/UserGroup.java rename to ccm-core/src/main/java/org/libreccm/core/Group.java index 65e074c8e..7e50b6c32 100644 --- a/ccm-core/src/main/java/org/libreccm/core/UserGroup.java +++ b/ccm-core/src/main/java/org/libreccm/core/Group.java @@ -43,9 +43,9 @@ import javax.xml.bind.annotation.XmlRootElement; * @author Jens Pelzetter */ @Entity -@Table(name = "user_groups") +@Table(name = "ccm_groups") @XmlRootElement(name = "user-group", namespace = CORE_XML_NS) -public class UserGroup extends Party implements Serializable { +public class Group extends Party implements Serializable { private static final long serialVersionUID = -5555063356689597270L; @@ -64,7 +64,7 @@ public class UserGroup extends Party implements Serializable { @XmlElement(name = "group-membership", namespace = CORE_XML_NS) private List members; - public UserGroup() { + public Group() { super(); roles = new ArrayList<>(); @@ -136,10 +136,10 @@ public class UserGroup extends Party implements Serializable { if (obj == null) { return false; } - if (!(obj instanceof UserGroup)) { + if (!(obj instanceof Group)) { return false; } - final UserGroup other = (UserGroup) obj; + final Group other = (Group) obj; if (!other.canEqual(this)) { return false; } @@ -152,7 +152,7 @@ public class UserGroup extends Party implements Serializable { @Override public boolean canEqual(final Object obj) { - return obj instanceof UserGroup; + return obj instanceof Group; } @Override diff --git a/ccm-core/src/main/java/org/libreccm/core/GroupMembership.java b/ccm-core/src/main/java/org/libreccm/core/GroupMembership.java index 4b8139e1c..7d587c3cd 100644 --- a/ccm-core/src/main/java/org/libreccm/core/GroupMembership.java +++ b/ccm-core/src/main/java/org/libreccm/core/GroupMembership.java @@ -55,7 +55,7 @@ public class GroupMembership implements Serializable { @ManyToOne @XmlTransient - private UserGroup group; + private Group group; @ManyToOne @XmlTransient @@ -69,11 +69,11 @@ public class GroupMembership implements Serializable { this.membershipId = membershipId; } - public UserGroup getGroup() { + public Group getGroup() { return group; } - protected void setGroup(final UserGroup group) { + protected void setGroup(final Group group) { this.group = group; } diff --git a/ccm-core/src/main/java/org/libreccm/core/Role.java b/ccm-core/src/main/java/org/libreccm/core/Role.java index 3cffe6bf6..15e16d167 100644 --- a/ccm-core/src/main/java/org/libreccm/core/Role.java +++ b/ccm-core/src/main/java/org/libreccm/core/Role.java @@ -35,7 +35,7 @@ import org.hibernate.validator.constraints.NotBlank; * @author Jens Pelzetter */ @Entity -@Table(name = "roles") +@Table(name = "ccm_roles") @SuppressWarnings("PMD.ShortClassName") //Role is perfectly fine name. public class Role implements Serializable { @@ -51,10 +51,10 @@ public class Role implements Serializable { private String name; @ManyToOne - private UserGroup sourceGroup; + private Group sourceGroup; @OneToOne - private UserGroup implicitGroup; + private Group implicitGroup; @Column(name = "description") private String description; @@ -79,19 +79,19 @@ public class Role implements Serializable { this.name = name; } - public UserGroup getSourceGroup() { + public Group getSourceGroup() { return sourceGroup; } - protected void setSourceGroup(final UserGroup sourceGroup) { + protected void setSourceGroup(final Group sourceGroup) { this.sourceGroup = sourceGroup; } - public UserGroup getImplicitGroup() { + public Group getImplicitGroup() { return implicitGroup; } - protected void setImplicitGroup(final UserGroup implicitGroup) { + protected void setImplicitGroup(final Group implicitGroup) { this.implicitGroup = implicitGroup; } diff --git a/ccm-core/src/main/java/org/libreccm/core/User.java b/ccm-core/src/main/java/org/libreccm/core/User.java index 95b581524..3362c1cc9 100644 --- a/ccm-core/src/main/java/org/libreccm/core/User.java +++ b/ccm-core/src/main/java/org/libreccm/core/User.java @@ -49,7 +49,7 @@ import javax.xml.bind.annotation.XmlTransient; * @author Jens Pelzetter */ @Entity -@Table(name = "users") +@Table(name = "ccm_users") @XmlRootElement(name = "user", namespace = CORE_XML_NS) //Supressing a few warnings from PMD because they misleading here. //User is perfectly fine class name, and the complexity is not to high... diff --git a/ccm-core/src/main/java/org/libreccm/web/Application.java b/ccm-core/src/main/java/org/libreccm/web/Application.java index b9db8b57d..7626a12f7 100644 --- a/ccm-core/src/main/java/org/libreccm/web/Application.java +++ b/ccm-core/src/main/java/org/libreccm/web/Application.java @@ -19,7 +19,7 @@ package org.libreccm.web; import org.libreccm.core.Resource; -import org.libreccm.core.UserGroup; +import org.libreccm.core.Group; import org.libreccm.jpa.utils.UriConverter; import java.io.Serializable; @@ -49,7 +49,7 @@ public class Application extends Resource implements Serializable { @OneToOne @JoinColumn(name = "container_group_id") - private UserGroup containerGroup; + private Group containerGroup; public URI getPrimaryUrl() { return primaryUrl; @@ -59,11 +59,11 @@ public class Application extends Resource implements Serializable { this.primaryUrl = primaryUrl; } - public UserGroup getContainerGroup() { + public Group getContainerGroup() { return containerGroup; } - public void setContainerGroup(final UserGroup containerGroup) { + public void setContainerGroup(final Group containerGroup) { this.containerGroup = containerGroup; } diff --git a/ccm-core/src/main/java/org/libreccm/workflow/UserTask.java b/ccm-core/src/main/java/org/libreccm/workflow/UserTask.java index 1de17c07d..7f32797b0 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/UserTask.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/UserTask.java @@ -19,7 +19,7 @@ package org.libreccm.workflow; import org.libreccm.core.User; -import org.libreccm.core.UserGroup; +import org.libreccm.core.Group; import java.io.Serializable; import java.util.ArrayList; @@ -89,7 +89,7 @@ public class UserTask extends Task implements Serializable { @JoinColumn(name = "user_task_id")}, inverseJoinColumns = { @JoinColumn(name = "assigned_group_id")}) - private List assignedGroups; + private List assignedGroups; public UserTask() { super(); @@ -182,7 +182,7 @@ public class UserTask extends Task implements Serializable { assignedUsers.remove(user); } - public List getAssignedGroups() { + public List getAssignedGroups() { if (assignedGroups == null) { return null; } else { @@ -190,15 +190,15 @@ public class UserTask extends Task implements Serializable { } } - protected void setAssignedGroups(final List assignedGroups) { + protected void setAssignedGroups(final List assignedGroups) { this.assignedGroups = assignedGroups; } - protected void addAssignedGroup(final UserGroup group) { + protected void addAssignedGroup(final Group group) { assignedGroups.add(group); } - protected void removeAssignedGroup(final UserGroup group) { + protected void removeAssignedGroup(final Group group) { assignedGroups.remove(group); } 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 71243561f..4381e915e 100644 --- a/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java @@ -47,7 +47,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier { Privilege.class, Role.class, User.class, - UserGroup.class}); + Group.class}); } public EqualsAndHashCodeTest(final Class entityClass) { 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 971a870df..cd9581bf0 100644 --- a/ccm-core/src/test/java/org/libreccm/core/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/ToStringTest.java @@ -48,7 +48,7 @@ public class ToStringTest extends ToStringVerifier { Resource.class, Role.class, User.class, - UserGroup.class}); + Group.class}); } public ToStringTest(final Class entityClass) { diff --git a/ccm-core/src/test/resources-wildfly8-embedded/arquillian.xml b/ccm-core/src/test/resources-wildfly8-embedded/arquillian.xml index ed6f9536d..3cde70c3f 100644 --- a/ccm-core/src/test/resources-wildfly8-embedded/arquillian.xml +++ b/ccm-core/src/test/resources-wildfly8-embedded/arquillian.xml @@ -20,7 +20,7 @@ --> NONE - false + true target diff --git a/ccm-core/src/test/resources-wildfly8-remote-h2-mem/arquillian.xml b/ccm-core/src/test/resources-wildfly8-remote-h2-mem/arquillian.xml index 3efc4ec8c..a4df7e384 100644 --- a/ccm-core/src/test/resources-wildfly8-remote-h2-mem/arquillian.xml +++ b/ccm-core/src/test/resources-wildfly8-remote-h2-mem/arquillian.xml @@ -13,7 +13,7 @@ --> - java:/comp/env/jdbc/ccm-core-test/h2/mem + java:/comp/env/jdbc/ccm/h2-mem/ccm-core org.hibernate.jpa.HibernatePersistenceProvider - java:/comp/env/jdbc/ccm-core-test/h2/mem + java:/comp/env/jdbc/ccm/h2-mem/ccm-core diff --git a/ccm-core/src/test/resources-wildfly8-remote-pgsql/arquillian.xml b/ccm-core/src/test/resources-wildfly8-remote-pgsql/arquillian.xml new file mode 100644 index 000000000..9973baba1 --- /dev/null +++ b/ccm-core/src/test/resources-wildfly8-remote-pgsql/arquillian.xml @@ -0,0 +1,38 @@ + + + + + target/deployments + + + + java:/comp/env/jdbc/ccm/pgsql/ccm-core + + + + NONE + + true + target + + + + json + + true + + + + scripts/pgsql-cleanup.sql + + + + \ No newline at end of file diff --git a/ccm-core/src/test/resources-wildfly8-remote-pgsql/test-persistence.xml b/ccm-core/src/test/resources-wildfly8-remote-pgsql/test-persistence.xml new file mode 100644 index 000000000..1db59f74a --- /dev/null +++ b/ccm-core/src/test/resources-wildfly8-remote-pgsql/test-persistence.xml @@ -0,0 +1,32 @@ + + + + + + + + + org.hibernate.jpa.HibernatePersistenceProvider + + java:/comp/env/jdbc/ccm/pgsql/ccm-core + + + + + + + + + \ No newline at end of file diff --git a/ccm-core/src/test/resources/scripts/pgsql-cleanup.sql b/ccm-core/src/test/resources/scripts/pgsql-cleanup.sql new file mode 100644 index 000000000..d9cc30c68 --- /dev/null +++ b/ccm-core/src/test/resources/scripts/pgsql-cleanup.sql @@ -0,0 +1 @@ +DELETE FROM ccm_objects; \ No newline at end of file