`svn merge -c1598227 ^/tiles/request/branches/TREQ_1_0_X .`

| restore Java6 compatibility
| - (TREQ-19) Please make the significance of underscore (_) in tiles definition filename more obvious
| - http://article.gmane.org/gmane.comp.apache.tiles.devel/681


git-svn-id: https://svn.apache.org/repos/asf/tiles/request/trunk@1598228 13f79535-47bb-0310-9956-ffa450edef68
`svn merge -c1598381 ^/tiles/request/branches/TREQ_1_0_X .`
| fix test for windows
| 
|  org.junit.ComparisonFailure: expected:<[/]> but was:<[\]>
|        at org.junit.Assert.assertEquals(Assert.java:123)
|        at org.junit.Assert.assertEquals(Assert.java:145)
|        at org.apache.tiles.request.locale.URLApplicationResourceTest.testGetLocalePath(URLApplicationResourceTest.java:71)


git-svn-id: https://svn.apache.org/repos/asf/tiles/request/trunk@1598393 13f79535-47bb-0310-9956-ffa450edef68
merged branches/TREQ_1_0_X r1598921



git-svn-id: https://svn.apache.org/repos/asf/tiles/request/trunk@1598922 13f79535-47bb-0310-9956-ffa450edef68
TREQ-17: Implement a Strategy pattern for locating ApplicationResources
initial attempt
An effort at backwards compatibility

Conflicts:
	tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java