From f9d1e869b0b27ae12278d64bca7eb82784c035fb Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Thu, 28 Mar 2013 17:06:34 -0300 Subject: [PATCH] Move to WiseMapping 3.1 --- config/database/hsql/atest-data.sql | 8 ++++---- config/database/mysql/test-data.sql | 6 +++--- core-js/pom.xml | 2 +- distribution/package-bin.sh | 2 +- mindplot/pom.xml | 2 +- pom.xml | 4 ++-- web2d/pom.xml | 2 +- wise-editor/pom.xml | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/config/database/hsql/atest-data.sql b/config/database/hsql/atest-data.sql index 64648ea2..e3eeefbf 100644 --- a/config/database/hsql/atest-data.sql +++ b/config/database/hsql/atest-data.sql @@ -1,9 +1,9 @@ INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (1, 'test@wisemapping.org', CURDATE()); -INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email) - VALUES (1, 'Test', 'User', 'ENC:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3', 1237, CURDATE(), 1); +INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type) + VALUES (1, 'Test', 'User', 'ENC:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3', 1237, CURDATE(), 1,'D'); -INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (2, 'admin@wisemapping.org', CURDATE()); -INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email) +INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (2, 'admin@wisemapping.org', CURDATE(),authentication_type); +INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,"D") VALUES (2, 'Admin', 'User', 'admin', 1237, CURDATE(), 1); diff --git a/config/database/mysql/test-data.sql b/config/database/mysql/test-data.sql index 8e6b1b7b..6301d7af 100644 --- a/config/database/mysql/test-data.sql +++ b/config/database/mysql/test-data.sql @@ -1,9 +1,9 @@ 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) - VALUES (1, 'Test', 'User', 'ENC:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3', 1237, CURRENT_DATE(), 1); +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'); INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (2, 'admin@wisemapping.org', CURRENT_DATE()); -INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email) +INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type,'D') VALUES (2, 'Admin', 'User', 'admin', 1237, CURRENT_DATE(), 1); diff --git a/core-js/pom.xml b/core-js/pom.xml index 6297519a..826c747c 100644 --- a/core-js/pom.xml +++ b/core-js/pom.xml @@ -9,7 +9,7 @@ org.wisemapping wisemapping ../pom.xml - 3.0-SNAPSHOT + 3.1-SNAPSHOT diff --git a/distribution/package-bin.sh b/distribution/package-bin.sh index d9dd1041..b1dd9321 100755 --- a/distribution/package-bin.sh +++ b/distribution/package-bin.sh @@ -51,7 +51,7 @@ cp $BASE_DIR/wisemapping.xml $JETTY_DIR/contexts/ # Distribute scripts -cp -r $BASE_DIR/../wise-webapp/src/test/sql $TARGET_DIR/wisemapping-$WISE_VERSION/config +cp -r $BASE_DIR/../config/ $TARGET_DIR/wisemapping-$WISE_VERSION/config cp ./start.sh ${JETTY_DIR}/ # Store version diff --git a/mindplot/pom.xml b/mindplot/pom.xml index d7eeed5f..db8536b4 100644 --- a/mindplot/pom.xml +++ b/mindplot/pom.xml @@ -9,7 +9,7 @@ org.wisemapping wisemapping ../pom.xml - 3.0-SNAPSHOT + 3.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 33f79974..16c8e4d7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,14 +4,14 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 3.0-SNAPSHOT + 3.1-SNAPSHOT 4.0.0 org.wisemapping wisemapping WiseMapping Project - 3.0-SNAPSHOT + 3.1-SNAPSHOT pom diff --git a/web2d/pom.xml b/web2d/pom.xml index 3b64bdfe..8fe54faf 100644 --- a/web2d/pom.xml +++ b/web2d/pom.xml @@ -9,7 +9,7 @@ org.wisemapping wisemapping ../pom.xml - 3.0-SNAPSHOT + 3.1-SNAPSHOT diff --git a/wise-editor/pom.xml b/wise-editor/pom.xml index 53bd1e7c..a7972f77 100644 --- a/wise-editor/pom.xml +++ b/wise-editor/pom.xml @@ -9,7 +9,7 @@ org.wisemapping wisemapping ../pom.xml - 3.0-SNAPSHOT + 3.1-SNAPSHOT