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

Commit bc05400

Browse files
philwebbphilwebb
committed
Merge pull request #42 from dyk/master
# By Przemek Dyk # Via Przemek Dyk * pull42: SPR-10125
2 parents bb15236 + e7c0a3f commit bc05400

File tree

10 files changed

+158
-0
lines changed

10 files changed

+158
-0
lines changed

‎SPR-10125/pom.xml

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>org.springframework.issues</groupId>
5+
<artifactId>SPR-10125</artifactId>
6+
<version>1.0-SNAPSHOT</version>
7+
<packaging>jar</packaging>
8+
<dependencies>
9+
<dependency>
10+
<groupId>org.springframework</groupId>
11+
<artifactId>spring-context</artifactId>
12+
<version>3.0.2.RELEASE</version>
13+
</dependency>
14+
<dependency>
15+
<groupId>log4j</groupId>
16+
<artifactId>log4j</artifactId>
17+
<version>1.2.16</version>
18+
</dependency>
19+
<dependency>
20+
<groupId>junit</groupId>
21+
<artifactId>junit</artifactId>
22+
<version>4.8</version>
23+
<scope>test</scope>
24+
</dependency>
25+
</dependencies>
26+
<repositories>
27+
<!--
28+
<repository>
29+
<id>s2-release</id>
30+
<url>http://repo.springsource.org/release</url>
31+
</repository>
32+
<repository>
33+
<id>s2-milestone</id>
34+
<url>http://repo.springsource.org/milestone</url>
35+
</repository>
36+
<repository>
37+
<id>s2-staging</id>
38+
<url>http://repo.springsource.org/libs-staging-local</url>
39+
</repository>
40+
-->
41+
<repository>
42+
<id>s2-snapshot</id>
43+
<url>http://repo.springsource.org/snapshot</url>
44+
<snapshots><enabled>true</enabled></snapshots>
45+
</repository>
46+
</repositories>
47+
<properties>
48+
<project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
49+
</properties>
50+
<build>
51+
<plugins>
52+
<plugin>
53+
<artifactId>maven-compiler-plugin</artifactId>
54+
<version>2.3.2</version>
55+
<configuration>
56+
<source>1.6</source>
57+
<target>1.6</target>
58+
</configuration>
59+
</plugin>
60+
<plugin>
61+
<artifactId>maven-surefire-plugin</artifactId>
62+
<version>2.7.2</version>
63+
<configuration>
64+
<includes>
65+
<include>**/*Tests.java</include>
66+
</includes>
67+
<excludes>
68+
<exclude>**/*Abstract*.java</exclude>
69+
</excludes>
70+
</configuration>
71+
</plugin>
72+
</plugins>
73+
</build>
74+
</project>
75+

‎SPR-10125/src/main/java/org/springframework/issues/AbstractFoo.java

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package org.springframework.issues;
2+
3+
4+
public abstract class AbstractFoo implements FooId {
5+
6+
}

‎SPR-10125/src/main/java/org/springframework/issues/Bar.java

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package org.springframework.issues;
2+
3+
public class Bar {
4+
5+
private String spel;
6+
7+
public String getSpel() {
8+
return spel;
9+
}
10+
public void setSpel(String spel) {
11+
this.spel = spel;
12+
}
13+
}

‎SPR-10125/src/main/java/org/springframework/issues/Foo.java

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package org.springframework.issues;
2+
3+
4+
public class Foo extends AbstractFoo {
5+
6+
}

‎SPR-10125/src/main/java/org/springframework/issues/FooId.java

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package org.springframework.issues;
2+
3+
4+
public interface FooId {
5+
6+
static final String D_ID = "id";
7+
8+
}

‎SPR-10125/src/main/java/org/springframework/issues/Goo.java

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package org.springframework.issues;
2+
3+
4+
public class Goo extends AbstractFoo implements FooId {
5+
6+
}

‎SPR-10125/src/main/resources/.gitignore

Whitespace-only changes.

‎SPR-10125/src/test/java/org/springframework/issues/ReproTests.java

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package org.springframework.issues;
2+
3+
import org.junit.Test;
4+
import org.springframework.context.support.GenericXmlApplicationContext;
5+
6+
/**
7+
* Unit test that reproduces an issue reported against SPR JIRA. @Test methods within
8+
* need not pass with the green bar! Rather they should fail in such a way that
9+
* demonstrates the reported issue.
10+
*/
11+
public class ReproTests {
12+
13+
@Test
14+
public void repro() {
15+
GenericXmlApplicationContext ctx = new GenericXmlApplicationContext();
16+
ctx.load("classpath:org/springframework/issues/ReproTests-context.xml");
17+
ctx.refresh();
18+
}
19+
20+
}

‎SPR-10125/src/test/resources/log4j.properties

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
log4j.rootCategory=ERROR, stdout
2+
3+
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
4+
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
5+
log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
6+
7+
log4j.category.org.springframework=WARN

‎SPR-10125/src/test/resources/org/springframework/issues/ReproTests-context.xml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="ISO-8859-1"?>
2+
<beans xmlns="http://www.springframework.org/schema/beans"
3+
xmlns:context="http://www.springframework.org/schema/context"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://www.springframework.org/schema/beans
6+
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
7+
8+
9+
<bean id="bar" class="org.springframework.issues.Bar">
10+
<property name="spel" value="#{T(org.springframework.issues.Goo).D_ID}"/>
11+
</bean>
12+
13+
<bean id="bar2" class="org.springframework.issues.Bar">
14+
<property name="spel" value="#{T(org.springframework.issues.Foo).D_ID}"/>
15+
</bean>
16+
17+
</beans>

0 commit comments

Comments
 (0)