From ba0346f39aad03151396dbec65a2f5d8b7d894d4 Mon Sep 17 00:00:00 2001 From: Emanuele Giarlini Date: Sat, 5 Nov 2016 19:36:14 +0100 Subject: [PATCH 1/4] Fixed DB path in pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b3cb0ae5..ce42e06c 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ ${project.build.directory}/${project.name}_resources - /opt/h2/databases + opt/h2/databases UTF-8 From fc9dd2f10a170ddf85d1639158aa666a045a4049 Mon Sep 17 00:00:00 2001 From: Ema-jar Date: Sat, 5 Nov 2016 19:56:27 +0100 Subject: [PATCH 2/4] Update README.txt --- README.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.txt b/README.txt index cb939eb4..3459a3c4 100644 --- a/README.txt +++ b/README.txt @@ -40,4 +40,14 @@ Starting from v0.3 each resource of the system can be searched by using a simple HOUSED Starting from v0.4, you can set for each booking, at the check-in, each person housed in that room. -Have fun with Locanda! \ No newline at end of file +Have fun with Locanda! + +## How to run the application + +First of all you need to use JDK 1.7. I'm using Tomcat 7 as application server, you can download the *CORE* version [here](http://tomcat.apache.org/download-70.cgi). + +Now you need to import all libraries specified in pom.xml and run two maven commands: +* clean +* install + +The install command will create a new folder called Locanda_target in which you can find Locanda.war. Execute this war in your server and, if you had no error, you should see the web application running in your browser (http://localhost:8080/). From cb7ba66a59a03e8b3e021d4692a1c5b0ea653473 Mon Sep 17 00:00:00 2001 From: Emanuele Giarlini Date: Wed, 16 Nov 2016 12:15:47 +0100 Subject: [PATCH 3/4] Rimosso SOLR - commentato il file applicationContext.xml --- .DS_Store | Bin 0 -> 6148 bytes .gitignore | 2 + README.txt | 4 +- global.properties | 6 +- locanda.iml | 193 +++++++++++++++++++++++++ webroot/WEB-INF/applicationContext.xml | 10 +- 6 files changed, 209 insertions(+), 6 deletions(-) create mode 100644 .DS_Store create mode 100644 locanda.iml diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 + + + + + + + + + + + + + + + + + + + + + + file://$MODULE_DIR$/webroot/WEB-INF/applicationContext-infrastructure.xml + file://$MODULE_DIR$/webroot/WEB-INF/dispatcher-servlet.xml + file://$MODULE_DIR$/webroot/WEB-INF/applicationContext.xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/webroot/WEB-INF/applicationContext.xml b/webroot/WEB-INF/applicationContext.xml index 7bcc1aca..38ac3595 100644 --- a/webroot/WEB-INF/applicationContext.xml +++ b/webroot/WEB-INF/applicationContext.xml @@ -45,12 +45,15 @@ - + + + From d76b75ddb3c01bf2ca8d9cfd2cc13a2a5243feb3 Mon Sep 17 00:00:00 2001 From: Emanuele Giarlini Date: Fri, 23 Dec 2016 16:01:07 +0100 Subject: [PATCH 4/4] Risolto problema della porta occupata --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index ce42e06c..8ca6dc73 100644 --- a/pom.xml +++ b/pom.xml @@ -376,7 +376,7 @@ org.springframework spring-jdbc - 3.2.0.RELEASE + 4.1.0.RELEASE com.sun.jersey.contribs @@ -408,7 +408,7 @@ org.springframework spring-context - 3.2.0.RELEASE + 4.1.0.RELEASE org.apache.struts @@ -423,7 +423,7 @@ org.springframework spring-web - 3.2.0.RELEASE + 4.1.0.RELEASE org.apache.solr