diff --git a/README.md b/README.md index 5bcc5c72..4ce46749 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The goal of this project is to provide a high quality product that can be deploy ### Prerequisites The following products must be installed: - * Java Development Kit 6 or higher (http://java.sun.com/javase/downloads/index.jsp) + * Java Development Kit 7 or higher (http://java.sun.com/javase/downloads/index.jsp) * Maven 2.2.1 or higher (http://maven.apache.org/) ### Compiling @@ -22,7 +22,7 @@ WiseMapping uses Maven as packaging and project management. The project is compo Full compilation of the project can be done executing within : -`mvn install` +`mvn clean install` Once this command is execute, the file /wise-webapp/target/wisemapping.war will be generated. @@ -30,11 +30,12 @@ Once this command is execute, the file /wise-webapp/target/wisemapp The previously generated war can be deployed locally executing within the directory /wise-webapp the following command: -`mvn jetty:run-war` +`mvn jetty:run` -This will start the application on the URL: http://localhost:8080/wise-webapp/. Additionally, a file based database is automatically populated with a test user. +This will start the application on the URL: http://localhost:8080. Additionally, a file based database is automatically populated with a test user. User: test@wisemapping.org +Pass: test ## Running the JS only version diff --git a/config/database/hsql/create-schemas.sql b/config/database/hsql/create-schemas.sql index e2e41662..7102b72b 100644 --- a/config/database/hsql/create-schemas.sql +++ b/config/database/hsql/create-schemas.sql @@ -13,7 +13,6 @@ activation_code BIGINT NOT NULL, activation_date DATE, allow_send_email CHAR(1) NOT NULL, locale varchar(5), -auth_schema INTEGER NOT NULL, FOREIGN KEY(colaborator_id) REFERENCES COLLABORATOR(id) ); @@ -70,4 +69,4 @@ user_id INTEGER NOT NULL, login_date date ); -COMMIT; \ No newline at end of file +COMMIT; diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml index ce9834a6..00090372 100644 --- a/wise-webapp/pom.xml +++ b/wise-webapp/pom.xml @@ -361,7 +361,7 @@ config/database/hsql/drop-schemas.sql config/database/hsql/create-schemas.sql - config/database/hsql/test-data.sql + config/database/hsql/atest-data.sql