Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update a versione 0.4.5 #4

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
ba0346f
Fixed DB path in pom.xml
emadotjar Nov 5, 2016
fc9dd2f
Update README.txt
emadotjar Nov 5, 2016
cb7ba66
Rimosso SOLR - commentato il file applicationContext.xml
emadotjar Nov 16, 2016
cb915d9
Rimosso SOLR - commentato il file applicationContext.xml
emadotjar Nov 16, 2016
2ae099e
migrazione a v4.1.0.RELEASE
emadotjar Nov 17, 2016
fc8edde
Risolto problema della porta occupata
emadotjar Dec 23, 2016
69136c7
First commit
emadotjar Jan 11, 2017
2471c39
Correzione JSON formatter
emadotjar Jan 12, 2017
f1f0466
Merged in v4.1.0-RELEASE (pull request #1)
Jan 12, 2017
ba41faa
Fixing export
emadotjar Feb 2, 2017
33e7b20
Variabili da rendere globali
emadotjar Feb 2, 2017
9bfabc9
FS-111 - move db and solr to the .locanda folder in the user home
Feb 3, 2017
b1e1d7b
remove all absolute paths
Feb 6, 2017
a97e42f
FS-111 - fix JDK version defined in pom.xml
Feb 7, 2017
d394185
Merged in FEATURE/FS-111 (pull request #2)
Feb 8, 2017
64f2383
catalina.home nell'applicationContext
emadotjar Feb 17, 2017
52e8e14
FS-189 modifiche export - una prenotazione deve avere obbligatoriamen…
emadotjar Feb 20, 2017
857531f
FS-189 modifiche export - internazionalizzazione del messaggio d'erro…
emadotjar Feb 20, 2017
8ebd516
Merged in FEATURE/FS-189 (pull request #3)
Feb 22, 2017
1bc7e53
FS-111 - fix guest birthdate bug
Feb 28, 2017
4788e2d
Merged in FEATURE/FS-111 (pull request #4)
Feb 28, 2017
03d16ec
fix capogruppo
Feb 28, 2017
c584ba3
Merged in FEATURE/FS-189 (pull request #6)
Feb 28, 2017
5ddc109
FS-197 - Camere disponibili nel SIRED Nell'export SIRED appaiono tutt…
emadotjar Mar 1, 2017
d880ce1
Merged in FEATURE/FS-197 (pull request #7)
Mar 1, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
/Locanda_target
/target
.idea/

13 changes: 12 additions & 1 deletion README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,15 @@ 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!
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/).

5 changes: 2 additions & 3 deletions global.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
resource.folder=${project.build.directory}/${project.name}_resources
solr.homeDir=${resource.folder}/solr
solr.configFile=${solr.homeDir}/solr.xml
#solr.homeDir=${CATALINA_HOME}/webapps/Locanda/WEB-INF/classes/Locanda_resources
#solr.configFile=${CATALINA_HOME}/webapps/Locanda/WEB-INF/classes/Locanda_resources/solr.xml
3 changes: 2 additions & 1 deletion h2.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ db.name=locanda
db.username=locanda
db.password=locanda
db.driverClassName=org.h2.Driver
db.url=jdbc:h2:${db.folder}/${db.name};DATABASE_TO_UPPER=FALSE

#db.url=jdbc:h2:${db.folder}/${db.name};DATABASE_TO_UPPER=FALSE
193 changes: 193 additions & 0 deletions locanda.iml

Large diffs are not rendered by default.

Loading