diff --git a/pom.xml b/pom.xml index 9e48676d0e..806b1a0a34 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,6 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.16</version> - <scope>runtime</scope> </dependency> <dependency> @@ -77,7 +76,6 @@ <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> <version>5.1.13</version> - <scope>runtime</scope> </dependency> <!-- Spring Deps --> @@ -85,7 +83,6 @@ <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> <version>${org.springframework.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.springframework</groupId> @@ -112,7 +109,6 @@ <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> <version>${org.springframework.version}</version> - <scope>runtime</scope> </dependency> <dependency> @@ -164,7 +160,6 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId> <version>${hibernate.version}</version> - <scope>runtime</scope> </dependency> <!-- Jackrabbit dependencies --> @@ -187,7 +182,6 @@ <groupId>eu.medsea.mimeutil</groupId> <artifactId>mime-util</artifactId> <version>2.1.3</version> - <scope>runtime</scope> </dependency> <!-- Additional dependencies --> @@ -195,7 +189,6 @@ <groupId>org.apache.wicket</groupId> <artifactId>wicket-extensions</artifactId> <version>${wicket.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.odlabs.wiquery</groupId> diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index f707049090..b00912755d 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -88,8 +88,8 @@ <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect" /> <property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver"></property> <property name="hibernate.connection.url" value="jdbc:mysql://localhost/scipro"></property> - <property name="hibernate.connection.username" value="root"></property> - <property name="hibernate.connection.password" value="juju"></property> + <property name="hibernate.connection.username" value="scipro"></property> + <property name="hibernate.connection.password" value="pighleef"></property> <property name="hibernate.connection.provider_class" value="org.hibernate.connection.C3P0ConnectionProvider"></property> <property name="hibernate.c3p0.min_size" value="3"></property> <property name="hibernate.c3p0.max_size" value="6"></property> diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 942af29253..0a178d1b52 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -64,8 +64,8 @@ <!-- Use deployment for production, development for development --> <context-param> <param-name>configuration</param-name> - <param-value>development</param-value> - <!--<param-value>deployment</param-value>--> + <!--param-value>development</param-value--> + <param-value>deployment</param-value> </context-param>