Author: echatellier Date: 2011-05-05 11:32:39 +0200 (Thu, 05 May 2011) New Revision: 280 Url: http://chorem.org/repositories/revision/bow/280 Log: #365 : Remove spring Modified: trunk/bow-ui/pom.xml trunk/bow-ui/src/main/resources/struts.properties trunk/bow-ui/src/main/webapp/WEB-INF/web.xml trunk/pom.xml Modified: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml 2011-05-05 09:14:34 UTC (rev 279) +++ trunk/bow-ui/pom.xml 2011-05-05 09:32:39 UTC (rev 280) @@ -134,12 +134,6 @@ <dependency> <groupId>org.apache.struts</groupId> - <artifactId>struts2-spring-plugin</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> <artifactId>struts2-config-browser-plugin</artifactId> <scope>runtime</scope> </dependency> Modified: trunk/bow-ui/src/main/resources/struts.properties =================================================================== --- trunk/bow-ui/src/main/resources/struts.properties 2011-05-05 09:14:34 UTC (rev 279) +++ trunk/bow-ui/src/main/resources/struts.properties 2011-05-05 09:32:39 UTC (rev 280) @@ -24,12 +24,6 @@ struts.locale=fr_FR struts.i18n.encoding=UTF-8 -struts.objectFactory = spring - -struts.objectFactory.spring.autoWire = name - -struts.objectFactory.spring.useClassCache = true - # struts.multipart.parser=cos # struts.multipart.parser=pell struts.multipart.parser=jakarta Modified: trunk/bow-ui/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/web.xml 2011-05-05 09:14:34 UTC (rev 279) +++ trunk/bow-ui/src/main/webapp/WEB-INF/web.xml 2011-05-05 09:32:39 UTC (rev 280) @@ -29,11 +29,6 @@ <display-name>Bow</display-name> - <context-param> - <param-name>contextConfigLocation</param-name> - <param-value>classpath*:applicationContext*.xml</param-value> - </context-param> - <!-- Filters --> <filter> <filter-name>action2-cleanup</filter-name> @@ -60,18 +55,6 @@ <filter-name>struts2</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - - <!-- Listeners --> - <listener> - <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> - </listener> - - <!-- Servlets --> - <servlet> - <servlet-name>jspSupportServlet</servlet-name> - <servlet-class>org.apache.struts2.views.JspSupportServlet</servlet-class> - <load-on-startup>5</load-on-startup> - </servlet> <!-- Welcome file lists --> <welcome-file-list> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-05 09:14:34 UTC (rev 279) +++ trunk/pom.xml 2011-05-05 09:32:39 UTC (rev 280) @@ -229,12 +229,6 @@ <dependency> <groupId>org.apache.struts</groupId> - <artifactId>struts2-spring-plugin</artifactId> - <version>${struts2Version}</version> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> <artifactId>struts2-config-browser-plugin</artifactId> <version>${struts2Version}</version> </dependency>