mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-11-05 07:03:24 +01:00
Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport
This commit is contained in:
commit
829815f9e9
@ -1,3 +1,7 @@
|
|||||||
|
#
|
||||||
|
# Command: mysql -u root -p < apopulate_schemas.sql
|
||||||
|
#
|
||||||
|
|
||||||
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (1, 'test@wisemapping.org', CURRENT_DATE());
|
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (1, 'test@wisemapping.org', CURRENT_DATE());
|
||||||
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
|
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
|
||||||
VALUES (1, 'Test', 'User', 'ENC:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3', 1237, CURRENT_DATE(), 1,'D');
|
VALUES (1, 'Test', 'User', 'ENC:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3', 1237, CURRENT_DATE(), 1,'D');
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
#
|
||||||
|
# Command: mysql -u root -p < create_database.sql
|
||||||
|
#
|
||||||
DROP DATABASE IF EXISTS wisemapping;
|
DROP DATABASE IF EXISTS wisemapping;
|
||||||
|
|
||||||
CREATE DATABASE IF NOT EXISTS wisemapping
|
CREATE DATABASE IF NOT EXISTS wisemapping
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
#
|
||||||
|
# Command: mysql -u root -p < create_schemas.sql
|
||||||
|
#
|
||||||
|
|
||||||
USE wisemapping;
|
USE wisemapping;
|
||||||
|
|
||||||
CREATE TABLE COLLABORATOR (
|
CREATE TABLE COLLABORATOR (
|
||||||
|
@ -417,7 +417,7 @@
|
|||||||
<srcFiles>
|
<srcFiles>
|
||||||
<srcFile>config/database/mysql/create-database.sql</srcFile>
|
<srcFile>config/database/mysql/create-database.sql</srcFile>
|
||||||
<srcFile>config/database/mysql/create-schemas.sql</srcFile>
|
<srcFile>config/database/mysql/create-schemas.sql</srcFile>
|
||||||
<srcFile>config/database/mysql/test-data.sql</srcFile>
|
<srcFile>config/database/mysql/apopulate-schemas.sql</srcFile>
|
||||||
</srcFiles>
|
</srcFiles>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
@ -507,12 +507,38 @@
|
|||||||
</webResources>
|
</webResources>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.jacoco</groupId>
|
||||||
|
<artifactId>jacoco-maven-plugin</artifactId>
|
||||||
|
<version>0.6.4.201312101107</version>
|
||||||
|
<executions>
|
||||||
|
<!--
|
||||||
|
Prepares the property pointing to the JaCoCo runtime agent which
|
||||||
|
is passed as VM argument when Maven the Surefire plugin is executed.
|
||||||
|
-->
|
||||||
|
<execution>
|
||||||
|
<id>pre-unit-test</id>
|
||||||
|
<goals>
|
||||||
|
<goal>prepare-agent</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
<!--
|
||||||
|
Ensures that the code coverage report for unit tests is created after
|
||||||
|
unit tests have been run.
|
||||||
|
-->
|
||||||
|
<execution>
|
||||||
|
<id>post-unit-test</id>
|
||||||
|
<phase>test</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>report</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.tomcat.maven</groupId>
|
<groupId>org.apache.tomcat.maven</groupId>
|
||||||
<artifactId>tomcat7-maven-plugin</artifactId>
|
<artifactId>tomcat7-maven-plugin</artifactId>
|
||||||
|
Loading…
Reference in New Issue
Block a user