You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by nl...@apache.org on 2012/05/01 23:59:36 UTC
svn commit: r1332859 - in /tiles/framework/trunk: tiles-parent/tiles-api/
tiles-parent/tiles-compat/
tiles-parent/tiles-compat/src/test/java/org/apache/tiles/config/
tiles-parent/tiles-compat/src/test/resources/
tiles-parent/tiles-compat/src/test/resou...
Author: nlebas
Date: Tue May 1 21:59:34 2012
New Revision: 1332859
URL: http://svn.apache.org/viewvc?rev=1332859&view=rev
Log:
restored the src/test/resources configuration to its standard location
Added:
tiles/framework/trunk/tiles-parent/tiles-compat/src/test/resources/
tiles/framework/trunk/tiles-parent/tiles-compat/src/test/resources/org/
tiles/framework/trunk/tiles-parent/tiles-compat/src/test/resources/org/apache/
tiles/framework/trunk/tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/
tiles/framework/trunk/tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/config/
tiles/framework/trunk/tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-1.1.xml
- copied, changed from r1332830, tiles/framework/trunk/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml
tiles/framework/trunk/tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-2.0.xml
- copied, changed from r1332830, tiles/framework/trunk/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.0.xml
tiles/framework/trunk/tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-2.1.xml
- copied, changed from r1332830, tiles/framework/trunk/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/factory/
tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs-key-one.xml
- copied, changed from r1332830, tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-one.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs-key-two.xml
- copied, changed from r1332830, tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-two.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs.xml
- copied, changed from r1332830, tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/test-defs.xml
Removed:
tiles/framework/trunk/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml
tiles/framework/trunk/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.0.xml
tiles/framework/trunk/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-one.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-two.xml
tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/test-defs.xml
Modified:
tiles/framework/trunk/tiles-parent/tiles-api/pom.xml
tiles/framework/trunk/tiles-parent/tiles-compat/pom.xml
tiles/framework/trunk/tiles-parent/tiles-core/pom.xml
tiles/framework/trunk/tiles-parent/tiles-el/pom.xml
tiles/framework/trunk/tiles-parent/tiles-jsp/pom.xml
tiles/framework/trunk/tiles-parent/tiles-mvel/pom.xml
tiles/framework/trunk/tiles-parent/tiles-ognl/pom.xml
tiles/framework/trunk/tiles-parent/tiles-servlet/pom.xml
tiles/framework/trunk/tiles-request/tiles-request-portlet-wildcard/pom.xml
tiles/framework/trunk/tiles-request/tiles-request-portlet/pom.xml
tiles/framework/trunk/tiles-request/tiles-request-servlet-wildcard/pom.xml
Modified: tiles/framework/trunk/tiles-parent/tiles-api/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-api/pom.xml?rev=1332859&r1=1332858&r2=1332859&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-api/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-api/pom.xml Tue May 1 21:59:34 2012
@@ -60,16 +60,6 @@
</resource>
</resources>
- <testResources>
- <testResource>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </testResource>
- </testResources>
-
</build>
<dependencies>
Modified: tiles/framework/trunk/tiles-parent/tiles-compat/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-compat/pom.xml?rev=1332859&r1=1332858&r2=1332859&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-compat/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-compat/pom.xml Tue May 1 21:59:34 2012
@@ -59,16 +59,6 @@
</resource>
</resources>
- <testResources>
- <testResource>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </testResource>
- </testResources>
-
</build>
<reporting>
Copied: tiles/framework/trunk/tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-1.1.xml (from r1332830, tiles/framework/trunk/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-1.1.xml?p2=tiles/framework/trunk/tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-1.1.xml&p1=tiles/framework/trunk/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml&r1=1332830&r2=1332859&rev=1332859&view=diff
==============================================================================
(empty)
Copied: tiles/framework/trunk/tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-2.0.xml (from r1332830, tiles/framework/trunk/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.0.xml)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-2.0.xml?p2=tiles/framework/trunk/tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-2.0.xml&p1=tiles/framework/trunk/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.0.xml&r1=1332830&r2=1332859&rev=1332859&view=diff
==============================================================================
(empty)
Copied: tiles/framework/trunk/tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-2.1.xml (from r1332830, tiles/framework/trunk/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-2.1.xml?p2=tiles/framework/trunk/tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-2.1.xml&p1=tiles/framework/trunk/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml&r1=1332830&r2=1332859&rev=1332859&view=diff
==============================================================================
(empty)
Modified: tiles/framework/trunk/tiles-parent/tiles-core/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/pom.xml?rev=1332859&r1=1332858&r2=1332859&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/pom.xml Tue May 1 21:59:34 2012
@@ -59,16 +59,6 @@
</resource>
</resources>
- <testResources>
- <testResource>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </testResource>
- </testResources>
-
</build>
<reporting>
Copied: tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs-key-one.xml (from r1332830, tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-one.xml)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs-key-one.xml?p2=tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs-key-one.xml&p1=tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-one.xml&r1=1332830&r2=1332859&rev=1332859&view=diff
==============================================================================
(empty)
Copied: tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs-key-two.xml (from r1332830, tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-two.xml)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs-key-two.xml?p2=tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs-key-two.xml&p1=tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-two.xml&r1=1332830&r2=1332859&rev=1332859&view=diff
==============================================================================
(empty)
Copied: tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs.xml (from r1332830, tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/test-defs.xml)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs.xml?p2=tiles/framework/trunk/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs.xml&p1=tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/test-defs.xml&r1=1332830&r2=1332859&rev=1332859&view=diff
==============================================================================
(empty)
Modified: tiles/framework/trunk/tiles-parent/tiles-el/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-el/pom.xml?rev=1332859&r1=1332858&r2=1332859&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-el/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-el/pom.xml Tue May 1 21:59:34 2012
@@ -51,15 +51,6 @@
</resource>
</resources>
- <testResources>
- <testResource>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </testResource>
- </testResources>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
Modified: tiles/framework/trunk/tiles-parent/tiles-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-jsp/pom.xml?rev=1332859&r1=1332858&r2=1332859&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-jsp/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-jsp/pom.xml Tue May 1 21:59:34 2012
@@ -59,15 +59,6 @@
</resource>
</resources>
- <testResources>
- <testResource>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </testResource>
- </testResources>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
Modified: tiles/framework/trunk/tiles-parent/tiles-mvel/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-mvel/pom.xml?rev=1332859&r1=1332858&r2=1332859&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-mvel/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-mvel/pom.xml Tue May 1 21:59:34 2012
@@ -58,15 +58,6 @@
</resource>
</resources>
- <testResources>
- <testResource>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </testResource>
- </testResources>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
Modified: tiles/framework/trunk/tiles-parent/tiles-ognl/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-ognl/pom.xml?rev=1332859&r1=1332858&r2=1332859&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-ognl/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-ognl/pom.xml Tue May 1 21:59:34 2012
@@ -58,15 +58,6 @@
</resource>
</resources>
- <testResources>
- <testResource>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </testResource>
- </testResources>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
Modified: tiles/framework/trunk/tiles-parent/tiles-servlet/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-servlet/pom.xml?rev=1332859&r1=1332858&r2=1332859&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-servlet/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-servlet/pom.xml Tue May 1 21:59:34 2012
@@ -59,15 +59,6 @@
</resource>
</resources>
- <testResources>
- <testResource>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </testResource>
- </testResources>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
Modified: tiles/framework/trunk/tiles-request/tiles-request-portlet-wildcard/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-portlet-wildcard/pom.xml?rev=1332859&r1=1332858&r2=1332859&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-portlet-wildcard/pom.xml (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-portlet-wildcard/pom.xml Tue May 1 21:59:34 2012
@@ -59,15 +59,6 @@
</resource>
</resources>
- <testResources>
- <testResource>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </testResource>
- </testResources>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
Modified: tiles/framework/trunk/tiles-request/tiles-request-portlet/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-portlet/pom.xml?rev=1332859&r1=1332858&r2=1332859&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-portlet/pom.xml (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-portlet/pom.xml Tue May 1 21:59:34 2012
@@ -60,16 +60,6 @@
</resource>
</resources>
- <testResources>
- <testResource>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </testResource>
- </testResources>
-
</build>
<dependencies>
Modified: tiles/framework/trunk/tiles-request/tiles-request-servlet-wildcard/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-servlet-wildcard/pom.xml?rev=1332859&r1=1332858&r2=1332859&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-servlet-wildcard/pom.xml (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-servlet-wildcard/pom.xml Tue May 1 21:59:34 2012
@@ -58,16 +58,6 @@
</resource>
</resources>
- <testResources>
- <testResource>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </testResource>
- </testResources>
-
</build>
<dependencies>