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.

Sign up for GitHub

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

Fixed DB path in pom.xml #3

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fixed DB path in pom.xml #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 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
d76b75d
Risolto problema della porta occupata
emadotjar Dec 23, 2016
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
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
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
View file
Open in desktop
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/).

6 changes: 4 additions & 2 deletions global.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
resource.folder=${project.build.directory}/${project.name}_resources
resource.folder="Locanda_target/Locanda_resources"
# resource.folder=${project.build.directory}/${project.name}_resources
solr.homeDir=${resource.folder}/solr
solr.configFile=${solr.homeDir}/solr.xml
solr.configFile=${solr.homeDir}/solr.xml

193 changes: 193 additions & 0 deletions locanda.iml
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<properties>
<resource.folder>${project.build.directory}/${project.name}_resources</resource.folder>
<db.folder>/opt/h2/databases</db.folder>
<db.folder>opt/h2/databases</db.folder>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down Expand Up @@ -376,7 +376,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>3.2.0.RELEASE</version>
<version>4.1.0.RELEASE</version>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
Expand Down Expand Up @@ -408,7 +408,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>3.2.0.RELEASE</version>
<version>4.1.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
Expand All @@ -423,7 +423,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>3.2.0.RELEASE</version>
<version>4.1.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
Expand Down
10 changes: 7 additions & 3 deletions webroot/WEB-INF/applicationContext.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,15 @@
<import resource="applicationContext-infrastructure.xml"/>

<!-- <context:property-placeholder location="/WEB-INF/solr.properties"/> -->


<!--

<bean id="multiCoreContainer" class="org.apache.solr.core.CoreContainer">
<constructor-arg><value>${solr.homeDir}</value></constructor-arg>
<constructor-arg><value>${solr.configFile}</value></constructor-arg>
</bean>


<bean id="solrServerConvention"
class="org.apache.solr.client.solrj.embedded.EmbeddedSolrServer">
<constructor-arg ref="multiCoreContainer" />
Expand Down Expand Up @@ -104,13 +107,14 @@
<constructor-arg ref="multiCoreContainer" />
<constructor-arg value="image" />
</bean>

<bean id="solrServerHoused"
class="org.apache.solr.client.solrj.embedded.EmbeddedSolrServer">
<constructor-arg ref="multiCoreContainer" />
<constructor-arg value="housed" />
</bean>

-->

<!-- enable autowire -->
<context:annotation-config />

Expand Down