Skip to content
This repository was archived by the owner on Dec 15, 2021. It is now read-only.

Commit cbc8302

Browse files
author
Dave Syer
committed
Switch to JAR packaging to make it even simpler
1 parent c981426 commit cbc8302

File tree

9 files changed

+27
-221
lines changed

9 files changed

+27
-221
lines changed

SPR-9498/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<artifactId>SPR-9498</artifactId>
66
<version>1.0-SNAPSHOT</version>
77
<name>Spring MVC Issue Reproduction Project</name>
8-
<packaging>war</packaging>
8+
<packaging>jar</packaging>
99

1010
<properties>
1111
<java-version>1.6</java-version>

SPR-9498/src/main/webapp/WEB-INF/jsp/home.jsp

Lines changed: 0 additions & 15 deletions
This file was deleted.

SPR-9498/src/main/webapp/WEB-INF/spring-servlet.xml

Lines changed: 0 additions & 34 deletions
This file was deleted.

SPR-9498/src/main/webapp/WEB-INF/web.xml

Lines changed: 0 additions & 17 deletions
This file was deleted.

SPR-9498/src/main/webapp/index.jsp

Lines changed: 0 additions & 15 deletions
This file was deleted.

SPR-9498/src/main/webapp/main.css

Lines changed: 0 additions & 102 deletions
This file was deleted.

SPR-9498/src/main/webapp/style.css

Whitespace-only changes.

SPR-9498/src/test/java/org/springframework/issues/TestBootstrap.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

SPR-9498/src/test/resources/test-context.xml

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,31 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<beans xmlns="http://www.springframework.org/schema/beans"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
2+
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns:aop="http://www.springframework.org/schema/aop"
4+
xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd
5+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
6+
7+
<bean id="conversionService" class="org.springframework.core.convert.support.DefaultConversionService" />
8+
9+
<!--Basic application beans. -->
10+
<bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
11+
<property name="prefix" value="/WEB-INF/jsp/" />
12+
<property name="suffix" value=".jsp" />
13+
</bean>
14+
15+
<bean class="org.springframework.issues.HomeController">
16+
<property name="foo" ref="foo" />
17+
</bean>
18+
19+
<bean id="foo" class="org.springframework.issues.DefaultFoo" scope="request">
20+
<aop:scoped-proxy proxy-target-class="false" />
21+
<constructor-arg ref="tokenRequest" />
22+
</bean>
23+
24+
<bean id="tokenRequest" class="org.springframework.issues.DefaultBar" scope="request">
25+
<aop:scoped-proxy proxy-target-class="false" />
26+
<constructor-arg value="#{request.parameterMap}" />
27+
</bean>
528

6-
<import resource="file:./src/main/webapp/WEB-INF/spring-servlet.xml"/>
7-
829
<bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
930
<property name="scopes">
1031
<map>

0 commit comments

Comments
 (0)