diff --git a/navalplanner-webapp/pom.xml b/navalplanner-webapp/pom.xml index d45d7e7ea..be920e184 100644 --- a/navalplanner-webapp/pom.xml +++ b/navalplanner-webapp/pom.xml @@ -1,67 +1,71 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - 4.0.0 - - org.navalplanner - navalplanner - 1.0.0 - - navalplanner-webapp - war - Naval Planner Web Client Module + 4.0.0 + + org.navalplanner + navalplanner + 1.0.0 + + navalplanner-webapp + war + Naval Planner Web Client Module - - navalplanner-webapp - + + navalplanner-webapp + - - - - org.springframework - spring - - - - org.beanshell - bsh - - - - commons-fileupload - commons-fileupload - - - - org.zkoss.zk - zul - - - org.zkoss.zk - zkplus - - - org.zkoss.zk - zk - - - - org.navalplanner - navalplanner-gantt-zk - - - - org.navalplanner - navalplanner-business - - - org.easymock - easymock - - - junit - junit - - + + + + org.springframework + spring + + + + org.beanshell + bsh + + + + commons-fileupload + commons-fileupload + + + + org.zkoss.zk + zul + + + org.zkoss.zk + zkplus + + + org.zkoss.zk + zk + + + + org.navalplanner + navalplanner-gantt-zk + + + + org.navalplanner + navalplanner-business + + + org.easymock + easymock + + + junit + junit + + + javax.servlet + servlet-api + + diff --git a/pom.xml b/pom.xml index ccda3c0b5..f3c556804 100644 --- a/pom.xml +++ b/pom.xml @@ -1,405 +1,410 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - 4.0.0 - org.navalplanner - navalplanner - pom - 1.0.0 - Naval Planner + 4.0.0 + org.navalplanner + navalplanner + pom + 1.0.0 + Naval Planner - - - - navalplanner-business - navalplanner-gantt-zk - navalplanner-webapp - + + + + navalplanner-business + navalplanner-gantt-zk + navalplanner-webapp + - - - - - naval - naval - jdbc/navalplanner-ds - ${dataSource.user} - ${dataSource.password} - + + + + + naval + naval + jdbc/navalplanner-ds + ${dataSource.user} + ${dataSource.password} + - - - + + + - - - dev - - true - - - - dev - - true - true - true - update - - + + + dev + + true + + + + dev + + true + true + true + update + + - - - prod - - - prod - - false - false - false - update - - + + + prod + + + prod + + false + false + false + update + + - - - postgresql - - true - - - - postgresql - postgresql - 8.3-603.jdbc4 - org.postgresql.Driver - - jdbc:postgresql://localhost/naval${navalplanner.mode} - ${dataSource.url}test - - org.hibernate.dialect.PostgreSQLDialect - - + + + postgresql + + true + + + + postgresql + postgresql + 8.3-603.jdbc4 + org.postgresql.Driver + + jdbc:postgresql://localhost/naval${navalplanner.mode} + ${dataSource.url}test + + org.hibernate.dialect.PostgreSQLDialect + + - - - mysql - - - mysql - mysql-connector-java - 5.0.5 - com.mysql.jdbc.Driver - - jdbc:mysql://localhost/naval${navalplanner.mode} - ${dataSource.url}test - - org.hibernate.dialect.MySQLDialect - - + + + mysql + + + mysql + mysql-connector-java + 5.0.5 + com.mysql.jdbc.Driver + + jdbc:mysql://localhost/naval${navalplanner.mode} + ${dataSource.url}test + + org.hibernate.dialect.MySQLDialect + + - - - hsqldb - - - hsqldb - hsqldb - 1.8.0.7 - org.hsqldb.jdbcDriver - - sa - - jdbc:hsqldb:${java.io.tmpdir}/naval${navalplanner.mode};shutdown=true - jdbc:hsqldb:${java.io.tmpdir}/naval${navalplanner.mode}test;shutdown=true - - org.hibernate.dialect.HSQLDialect - - + + + hsqldb + + + hsqldb + hsqldb + 1.8.0.7 + org.hsqldb.jdbcDriver + + sa + + jdbc:hsqldb:${java.io.tmpdir}/naval${navalplanner.mode};shutdown=true + jdbc:hsqldb:${java.io.tmpdir}/naval${navalplanner.mode}test;shutdown=true + + org.hibernate.dialect.HSQLDialect + + - + - - - - - - - ${jdbcDriver.groupId} - ${jdbcDriver.artifactId} - ${jdbcDriver.version} - test - - - - org.hibernate - hibernate - 3.2.6.ga - - - - - junit - junit - 4.4 - test - + + + + + + + ${jdbcDriver.groupId} + ${jdbcDriver.artifactId} + ${jdbcDriver.version} + test + + + + org.hibernate + hibernate + 3.2.6.ga + + + + + junit + junit + 4.4 + test + - - - org.easymock - easymock - 2.4 - test - + + + org.easymock + easymock + 2.4 + test + - - - org.springframework - spring - 2.5.6 - - - org.springframework - spring-test - 2.5.6 - test - - - - commons-logging - commons-logging - 1.0.4 - - - - org.beanshell - bsh - 2.0b4 - runtime - - - - commons-fileupload - commons-fileupload - 1.2.1 - runtime - - - - org.zkoss.zk - zul - 3.6.1 - - - org.zkoss.zk - zkplus - 3.6.1 - - - org.zkoss.zk - zk - 3.6.1 - - - - org.jgrapht - jgrapht-jdk1.5 - 0.7.3 - - - - org.navalplanner - navalplanner-gantt-zk - 1.0.0 - - - - org.navalplanner - navalplanner-business - 1.0.0 - - - + + + org.springframework + spring + 2.5.6 + + + org.springframework + spring-test + 2.5.6 + test + + + + commons-logging + commons-logging + 1.0.4 + + + + org.beanshell + bsh + 2.0b4 + runtime + + + + commons-fileupload + commons-fileupload + 1.2.1 + runtime + + + + org.zkoss.zk + zul + 3.6.1 + + + org.zkoss.zk + zkplus + 3.6.1 + + + org.zkoss.zk + zk + 3.6.1 + + + + org.jgrapht + jgrapht-jdk1.5 + 0.7.3 + + + + org.navalplanner + navalplanner-gantt-zk + 1.0.0 + + + + org.navalplanner + navalplanner-business + 1.0.0 + + + javax.servlet + servlet-api + 2.5 + jar + provided + + + - + - - - + + + - - - src/main/resources - true - - *spring-config.xml - *hibernate.cfg.xml - - + + + src/main/resources + true + + *spring-config.xml + *hibernate.cfg.xml + + - - - src/main/resources - + + + src/main/resources + - - - ../src/main/jetty - - jetty-env.xml - - ../jetty - true - - + + + ../src/main/jetty + + jetty-env.xml + + ../jetty + true + + - + - - - src/test/resources - true - - *spring-config-test.xml - *hibernate-test.cfg.xml - - + + + src/test/resources + true + + *spring-config-test.xml + *hibernate-test.cfg.xml + + - - - src/test/resources - + + + src/test/resources + - + - + - - - - org.apache.maven.plugins - maven-compiler-plugin - - true - 1.6 - 1.6 - UTF-8 - - + + + + org.apache.maven.plugins + maven-compiler-plugin + + true + 1.6 + 1.6 + UTF-8 + + - - - - maven-assembly-plugin - - - src/main/assembly/src.xml - - - + + + + maven-assembly-plugin + + + src/main/assembly/src.xml + + + - - - + + + - org.mortbay.jetty - maven-jetty-plugin - - 6.1.12.rc2 - - target/jetty/jetty-env.xml - 5 - - - src/main/webapp/WEB-INF - - * - - - + org.mortbay.jetty + maven-jetty-plugin + + 6.1.12.rc2 + + target/jetty/jetty-env.xml + 5 + + + src/main/webapp/WEB-INF + + * + + + - - - - true - - - + + + + true + + + - - - ${jdbcDriver.groupId} - ${jdbcDriver.artifactId} - ${jdbcDriver.version} - - + + + ${jdbcDriver.groupId} + ${jdbcDriver.artifactId} + ${jdbcDriver.version} + + - + - + - +