diff --git a/.classpath b/.classpath index da0c080c..47a87cdf 100644 --- a/.classpath +++ b/.classpath @@ -1,163 +1,25 @@ - - - - + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/.classpath.orig b/.classpath.orig new file mode 100644 index 00000000..1038b0e2 --- /dev/null +++ b/.classpath.orig @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +<<<<<<< HEAD +======= + + +>>>>>>> locanda-spikeEJS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<<<<<<< HEAD + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +======= + + + + + + + +>>>>>>> locanda-spikeEJS + + + diff --git a/.project b/.project index 0a8452d6..302e49e5 100644 --- a/.project +++ b/.project @@ -20,12 +20,17 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jem.workbench.JavaEMFNature org.eclipse.wst.common.modulecore.ModuleCoreNature org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope index 000a6e8e..c3e8b267 100644 --- a/.settings/.jsdtscope +++ b/.settings/.jsdtscope @@ -1,6 +1,5 @@ - diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 827c0b92..b873e6e6 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,5 @@ -#Wed Jul 13 11:01:31 CEST 2011 eclipse.preferences.version=1 encoding//src/global_it.properties=ISO-8859-1 +encoding/=UTF-8 +encoding/solr=UTF-8 +encoding/src=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 31a41aea..62492222 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,12 @@ -#Thu Mar 03 11:05:37 CET 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs b/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs new file mode 100644 index 00000000..7c8126d9 --- /dev/null +++ b/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs @@ -0,0 +1,5 @@ +XDOCLETBUILDERACTIVE=true +XDOCLETHOME= +XDOCLETUSEGLOBAL=true +XDOCLETVERSION=1.2.1 +eclipse.preferences.version=1 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..f897a7f1 --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component new file mode 100755 index 00000000..dea9f1ab --- /dev/null +++ b/.settings/org.eclipse.wst.common.component @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index 33361310..bec0f51c 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -3,5 +3,4 @@ - diff --git a/ant/.gitignore b/ant/.gitignore deleted file mode 100644 index 38babe9c..00000000 --- a/ant/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/myBuildProperties_server2.xml -/myBuildProperties.xml -/myBuild.xml -/myBuild_server2.xml diff --git a/ant/build.xml b/ant/build.xml deleted file mode 100644 index 43f8cba6..00000000 --- a/ant/build.xml +++ /dev/null @@ -1,231 +0,0 @@ - - - Locanda build file for Localhost - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ant/buildProperties.xml b/ant/buildProperties.xml deleted file mode 100644 index 1f1e0db3..00000000 --- a/ant/buildProperties.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - Properties file - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ant/buildProperties_server2.xml b/ant/buildProperties_server2.xml deleted file mode 100644 index ef85c13f..00000000 --- a/ant/buildProperties_server2.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - Properties file - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ant/build_server2.xml b/ant/build_server2.xml deleted file mode 100644 index 92078888..00000000 --- a/ant/build_server2.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - Locanda build file for remote server - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ant/rdbmsProperties.xml b/ant/rdbmsProperties.xml deleted file mode 100644 index 5c3ac2c0..00000000 --- a/ant/rdbmsProperties.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - Rdbms Properties file - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build_instructions.txt b/build_instructions.txt new file mode 100644 index 00000000..e334330f --- /dev/null +++ b/build_instructions.txt @@ -0,0 +1,23 @@ +Locanda Build Guide (with Maven) + +-Clone the project from GitHub (https://github.com/labos/locanda) +-In the project root, there are three .properties file to be customized: + -global.properties -> resources paths + -mysql.properties -> mySQL connection parameters + -hsql.properties -> HSQL connection parameters + +-To deploy the webapp, in the shell from the project directory type: + -mvn clean install to create the build in Locanda_Target folder + -mvn clean tomcat7:deploy to create the build in Locanda_Target folder and deploy it in a running Tomcat7 server + +-to accomplish the latter task, you previously need to: + -configure your Tomcat server in ${tomcat.home}/conf/tomcat-users.xml by adding a user with the roles "manager-script" and "manager-gui" + -edit the Maven user config file (${user.home}/.m2/settings.xml) uncommenting the "server" tag and putting "tomcat_server" as id and your manager username and password, like this: + + + tomcat_server + tomcat + tomcat + + + diff --git a/global.properties b/global.properties index e69de29b..af593470 100644 --- a/global.properties +++ b/global.properties @@ -0,0 +1,3 @@ +resource.folder=${project.build.directory}/${project.name}_resources +solr.homeDir=${resource.folder}/${project.name}_solr +solr.configFile=${solr.homeDir}/solr.xml \ No newline at end of file diff --git a/hsql.properties b/hsql.properties new file mode 100644 index 00000000..63df588b --- /dev/null +++ b/hsql.properties @@ -0,0 +1,11 @@ +DBmaxActive=100 +DBmaxIdle=30 +DBmaxWait=10000 + +DBhost=localhost +DBport=3306 +DBusername=SA +DBpassword= +DBdump=sql +DBdriverClassName=org.hsqldb.jdbcDriver +DBurl=jdbc:hsqldb:hsql://localhost/locanda \ No newline at end of file diff --git a/installer/hsql/README b/installer/hsql/README index 6e30df85..e8a8aeda 100644 --- a/installer/hsql/README +++ b/installer/hsql/README @@ -1,5 +1,5 @@ INSTALLATION NOTES 1)copy hsqldaemon.sh and lib directory in you favorite bin path. 2)put hsqldaemon.cfg in /etc -3)copy or create a new hsql database set files in accordtng to your hsqldaemon.cfg configuration +3)copy or create a new hsql database set files in according to your hsqldaemon.cfg configuration 4)run hsqldaemon.sh start or put the service in your init (eg /etc/rc.d; /etc/init.d/ rc*.s) scripts/services (its depends on your linux system) diff --git a/installer/locanda.war b/installer/locanda.war deleted file mode 100644 index cf610185..00000000 Binary files a/installer/locanda.war and /dev/null differ diff --git a/installer/war_placeholder b/installer/war_placeholder new file mode 100755 index 00000000..bd36194a --- /dev/null +++ b/installer/war_placeholder @@ -0,0 +1 @@ +copy here the webapp WAR file before launching the installation script install.sh \ No newline at end of file diff --git a/mysql.properties b/mysql.properties new file mode 100644 index 00000000..1d3aea59 --- /dev/null +++ b/mysql.properties @@ -0,0 +1,11 @@ +DBmaxActive=100 +DBmaxIdle=30 +DBmaxWait=10000 + +DBhost=localhost +DBport=3306 +DBusername=root +DBpassword=root +DBdump=sql +DBdriverClassName=com.mysql.jdbc.Driver +DBurl=jdbc:mysql://localhost:3306/locanda \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..955461c0 --- /dev/null +++ b/pom.xml @@ -0,0 +1,465 @@ + + 4.0.0 + labos + locanda + 0.3 + + + ${project.build.directory}/${project.name}_resources + UTF-8 + + + + + hsql + + + global.properties + hsql.properties + + + + + + + src + ${basedir}/${project.name}_target + ${project.name} + + global.properties + mysql.properties + + + + src + + **/*.java + + + + ${basedir}/solr + ${resource.folder}/${project.name}_solr + + + + + + maven-compiler-plugin + 2.3.2 + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-war-plugin + 2.3 + + + + true + + + webroot\WEB-INF\web.xml + + + webroot + + **/*.class + + true + + + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + 2.0 + + http://localhost:8080/manager/html + tomcat_server + /locanda + + + + + + + + org.apache.struts + struts2-json-plugin + 2.3.8 + + + com.sun.jersey + jersey-client + 1.16 + + + com.sun.jersey + jersey-json + 1.16 + + + com.sun.jersey.contribs + jersey-multipart + 1.16 + + + com.sun.jersey + jersey-servlet + 1.16 + + + org.mybatis + mybatis-spring + 1.1.1 + + + spring-context + org.springframework + + + spring-core + org.springframework + + + spring-tx + org.springframework + + + spring-jdbc + org.springframework + + + + + org.eclipse.birt.runtime.3_7_1 + org.apache.batik.bridge + 1.6.0 + + + org.eclipse.birt.runtime.3_7_1 + org.apache.batik.css + 1.6.0 + + + org.eclipse.birt.runtime.3_7_1 + org.apache.batik.dom + 1.6.0 + + + org.eclipse.birt.runtime.3_7_1 + org.apache.batik.dom.svg + 1.6.0 + + + org.eclipse.birt.runtime.3_7_1 + org.apache.batik.ext.awt + 1.6.0 + + + org.eclipse.birt.runtime.3_7_1 + org.apache.batik.parser + 1.6.0 + + + org.eclipse.birt.runtime.3_7_1 + org.apache.batik.pdf + 1.6.0 + + + org.eclipse.birt.runtime.3_7_1 + org.apache.batik.svggen + 1.6.0 + + + org.eclipse.birt.runtime.3_7_1 + org.apache.batik.transcoder + 1.6.0 + + + org.eclipse.birt.runtime.3_7_1 + org.apache.batik.util + 1.6.0 + + + org.eclipse.birt.runtime.3_7_1 + org.apache.batik.util.gui + 1.6.0 + + + org.eclipse.birt.runtime.3_7_1 + org.apache.batik.xml + 1.6.0 + + + org.eclipse.birt.runtime + org.eclipse.birt.runtime + 4.2.1a + + + org.apache.xerces + org.eclipse.birt.runtime.3_7_1 + + + org.mozilla.javascript + org.eclipse.birt.runtime.3_7_1 + + + + org.eclipse.datatools.enablement.oracle.dbdefinition + + org.eclipse.birt.runtime + + + + org.eclipse.datatools.enablement.oracle + + org.eclipse.birt.runtime + + + + org.eclipse.datatools.enablement.ibm.informix.dbdefinition + + org.eclipse.birt.runtime + + + + org.eclipse.datatools.enablement.ibm.informix + + org.eclipse.birt.runtime + + + + org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition + + org.eclipse.birt.runtime + + + + org.eclipse.datatools.enablement.ibm.db2.luw + + org.eclipse.birt.runtime + + + + org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition + + org.eclipse.birt.runtime + + + + org.eclipse.datatools.enablement.msft.sqlserver + + org.eclipse.birt.runtime + + + org.apache.commons.logging + org.eclipse.birt.runtime + + + org.apache.commons.codec + org.eclipse.birt.runtime.3_7_1 + + + commons-lang + commons-lang + + + javax.xml.stream + org.eclipse.birt.runtime + + + + + org.slf4j + log4j-over-slf4j + 1.7.2 + + + org.eclipse.birt.runtime.3_7_1 + org.w3c.dom.smil + 1.0.0 + + + org.eclipse.birt.runtime.3_7_1 + org.w3c.dom.svg + 1.1.0 + + + org.eclipse.birt.runtime.3_7_1 + org.w3c.css.sac + 1.3.0 + + + commons-beanutils + commons-beanutils + 1.8.3 + + + commons-collections + commons-collections + 3.2.1 + + + commons-httpclient + commons-httpclient + 3.1 + + + commons-codec + commons-codec + + + + + javax.ws.rs + jsr311-api + 1.1.1 + + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + commons-lang + commons-lang + + + + + javax.transaction + jta + 1.1 + + + org.apache.tomcat + tomcat-catalina + 7.0.33 + provided + + + org.hsqldb + hsqldb + 2.2.9 + runtime + + + org.apache.tomcat + tomcat-jdbc + 7.0.33 + provided + + + mysql + mysql-connector-java + 5.1.22 + runtime + + + rhino + js + 1.7R2 + + + org.apache.struts + struts2-convention-plugin + 2.3.8 + + + org.springframework + spring-jdbc + 3.2.0.RELEASE + + + com.sun.jersey.contribs + jersey-spring + 1.16 + + + spring-aop + org.springframework + + + spring-beans + org.springframework + + + spring-context + org.springframework + + + spring-core + org.springframework + + + spring-web + org.springframework + + + + + org.springframework + spring-context + 3.2.0.RELEASE + + + org.apache.struts + struts2-spring-plugin + 2.3.8 + + + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec + 1.0 + + + org.springframework + spring-web + 3.2.0.RELEASE + + + org.apache.solr + solr-core + 3.6.2 + + + servlet-api + javax.servlet + + + + + + Sardegna Ricerche + http://www.sardegnaricerche.it + + Locanda + http://locanda.sourceforge.net/ + Locanda is an innovative booking management system designed for any touristical structure such as hotels, bed and breakfasts, guesthouses, farmhouses. Featuring a user-friendly and dynamic web interface, Locanda allows a seamless management of all the resources an owner has to control: Bookings, Rooms, Room Types, Guests, Extras, Price Lists, Seasons, Conventions. It is a system developed by the Open Source Lab c/o Sardegna Ricerche, Sardinia, Italy. + Booking management system for hotels, bed&breakfasts, guesthouses + war + \ No newline at end of file diff --git a/webroot/META-INF/context.xml b/webroot/META-INF/context.xml index 45a30566..32434e34 100644 --- a/webroot/META-INF/context.xml +++ b/webroot/META-INF/context.xml @@ -41,13 +41,13 @@ --> - + \ No newline at end of file diff --git a/webroot/WEB-INF/.gitignore b/webroot/WEB-INF/.gitignore new file mode 100644 index 00000000..078ac564 --- /dev/null +++ b/webroot/WEB-INF/.gitignore @@ -0,0 +1 @@ +/solr.properties diff --git a/webroot/WEB-INF/applicationContext.xml b/webroot/WEB-INF/applicationContext.xml index 770d6b3c..a7207553 100644 --- a/webroot/WEB-INF/applicationContext.xml +++ b/webroot/WEB-INF/applicationContext.xml @@ -44,11 +44,11 @@ - + - ${homeDir} - ${configFile} + ${solr.homeDir} + ${solr.configFile}