This commit is contained in:
Keith Donald
2008-02-26 16:31:54 +00:00
parent 3ec7887fa9
commit a864a58594
5 changed files with 25 additions and 25 deletions

View File

@@ -18,10 +18,10 @@
<dependency org="aopalliance" name="aopalliance" rev="1.0" />
<dependency org="org.springframework" name="spring-faces" rev="latest.integration" conf="global->jsf12"/>
<dependency org="org.springframework" name="spring-webflow" rev="latest.integration" conf="global->default"/>
<dependency org="org.springframework" name="spring-aop" rev="2.5"/>
<dependency org="org.springframework" name="spring-orm" rev="2.5"/>
<dependency org="org.springframework" name="spring-jdbc" rev="2.5"/>
<dependency org="org.springframework" name="spring-tx" rev="2.5"/>
<dependency org="org.springframework" name="spring-aop" rev="2.5.1"/>
<dependency org="org.springframework" name="spring-orm" rev="2.5.1"/>
<dependency org="org.springframework" name="spring-jdbc" rev="2.5.1"/>
<dependency org="org.springframework" name="spring-tx" rev="2.5.1"/>
<dependency org="jboss" name="jboss-el" rev="1.0"/>
<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" />
<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga"/>
@@ -37,7 +37,7 @@
<!-- test-time only dependencies -->
<dependency org="junit" name="junit" rev="3.8.2" conf="test->default" />
<dependency org="org.springframework" name="spring-test" rev="2.5" conf="test->default"/>
<dependency org="org.springframework" name="spring-test" rev="2.5.1" conf="test->default"/>
</dependencies>
</ivy-module>

View File

@@ -44,10 +44,10 @@
<!-- The front controller of the Spring Web application, responsible for handling all application requests -->
<servlet>
<servlet-name>Spring Web Servlet</servlet-name>
<servlet-class>org.springframework.webflow.servlet.SpringWebServlet</servlet-class>
<servlet-name>Spring Web MVC Dispatcher Servlet</servlet-name>
<servlet-class>org.springframework.web.servlet.DispacherServlet</servlet-class>
<init-param>
<param-name>configLocations</param-name>
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/config/web-application-config.xml</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
@@ -55,7 +55,7 @@
<!-- Map all *.spring requests to the Web Servlet for handling -->
<servlet-mapping>
<servlet-name>Spring Web Servlet</servlet-name>
<servlet-name>Spring Web MVC Dispatcher Servlet</servlet-name>
<url-pattern>/spring/*</url-pattern>
</servlet-mapping>