CCM NG: Some adjustments for the ccm-test-bundle module

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@3601 8810af33-2d31-482b-a856-94f89814c4df

ccm-core/src/main/resources/db/migrations/org/libreccm/core/CcmCore/pgsql/V1_0_0_0_create_tables.sql

@@ -21,7 +21,7 @@
         description varchar(255),
         mime_type varchar(255),
         title varchar(255),
-        primary key (message_id)
+        primary key (attachment_id)
     );
 
     create table ccm_core.categories (

ccm-core/src/test/resources-wildfly8-remote-h2-mem/scripts/create_ccm_core_schema.sql

@@ -24,7 +24,7 @@ CREATE SCHEMA ccm_core;
         description varchar(255),
         mime_type varchar(255),
         title varchar(255),
-        primary key (message_id)
+        primary key (attachment_id)
     );
 
     create table ccm_core.categories (

ccm-core/src/test/resources-wildfly8-remote-pgsql/scripts/create_ccm_core_schema.sql

@@ -24,7 +24,7 @@ CREATE SCHEMA ccm_core;
         description varchar(255),
         mime_type varchar(255),
         title varchar(255),
-        primary key (message_id)
+        primary key (attachment_id)
     );
 
     create table ccm_core.categories (

ccm-test-bundle/src/test/java/org/libreccm/CcmModulesTest.java

@@ -108,7 +108,7 @@ public class CcmModulesTest {
                 .create(WebArchive.class,
                         "LibreCCM-org.libreccm.CcmModulesTest.war")
                 .addAsLibraries(libs)
-                .addAsWebInfResource("web.xml")
+                .setWebXML(new File("src/main/webapp/WEB-INF/web.xml"))
                 .addAsWebInfResource("test-persistence.xml")
                 .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
     }