trying to fix maven dependencies

pull/59/head
Justin Richer 2012-01-04 14:57:59 -05:00
parent ceb91123b5
commit d7a3fa1652
4 changed files with 4 additions and 2 deletions

View File

@ -13,7 +13,7 @@
</modules> </modules>
<properties> <properties>
<java-version>1.6</java-version> <java-version>1.6</java-version>
<org.springframework-version>3.0.6.RELEASE</org.springframework-version> <spring-version>3.1.0.RELEASE</spring-version>
<org.slf4j-version>1.5.10</org.slf4j-version> <org.slf4j-version>1.5.10</org.slf4j-version>
<spring.security.version>3.1.0.RELEASE</spring.security.version> <spring.security.version>3.1.0.RELEASE</spring.security.version>
</properties> </properties>

View File

@ -4,6 +4,7 @@
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="src" path="src/main/webapp"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
<attributes> <attributes>

View File

@ -4,6 +4,7 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp"/> <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/webapp"/>
<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/spring-security-oauth2/spring-security-oauth2"> <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/spring-security-oauth2/spring-security-oauth2">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>

View File

@ -6,7 +6,7 @@
<!-- The definition of the Root Spring Container shared by all Servlets and Filters --> <!-- The definition of the Root Spring Container shared by all Servlets and Filters -->
<context-param> <context-param>
<param-name>contextConfigLocation</param-name> <param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/spring/root-context.xml</param-value> <param-value>/WEB-INF/spring/application-context.xml</param-value>
</context-param> </context-param>
<!-- Creates the Spring Container shared by all Servlets and Filters --> <!-- Creates the Spring Container shared by all Servlets and Filters -->