You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/09/19 14:59:51 UTC
svn commit: r816913 - in /tiles/framework/trunk: tiles-core/pom.xml
tiles-portlet-wildcard/pom.xml
tiles-servlet-wildcard/src/test/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextTest.java
tiles-servlet/pom.xml
Author: apetrelli
Date: Sat Sep 19 12:59:50 2009
New Revision: 816913
URL: http://svn.apache.org/viewvc?rev=816913&view=rev
Log:
TILES-458
Removed and fixed optional packages that are no more optional.
Fixed test case.
Modified:
tiles/framework/trunk/tiles-core/pom.xml
tiles/framework/trunk/tiles-portlet-wildcard/pom.xml
tiles/framework/trunk/tiles-servlet-wildcard/src/test/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextTest.java
tiles/framework/trunk/tiles-servlet/pom.xml
Modified: tiles/framework/trunk/tiles-core/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/pom.xml?rev=816913&r1=816912&r2=816913&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/pom.xml (original)
+++ tiles/framework/trunk/tiles-core/pom.xml Sat Sep 19 12:59:50 2009
@@ -117,27 +117,6 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jasper-el</artifactId>
- <version>6.0.20</version>
- <scope>compile</scope>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>el-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
Modified: tiles/framework/trunk/tiles-portlet-wildcard/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-portlet-wildcard/pom.xml?rev=816913&r1=816912&r2=816913&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-portlet-wildcard/pom.xml (original)
+++ tiles/framework/trunk/tiles-portlet-wildcard/pom.xml Sat Sep 19 12:59:50 2009
@@ -100,7 +100,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>2.5.6</version>
- <optional>true</optional>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -113,7 +112,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc-portlet</artifactId>
<version>2.5.6</version>
- <optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
Modified: tiles/framework/trunk/tiles-servlet-wildcard/src/test/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet-wildcard/src/test/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextTest.java?rev=816913&r1=816912&r2=816913&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-servlet-wildcard/src/test/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextTest.java (original)
+++ tiles/framework/trunk/tiles-servlet-wildcard/src/test/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextTest.java Sat Sep 19 12:59:50 2009
@@ -109,8 +109,8 @@
assertEquals(TEST_PROPERTIES_SIZE, context.getResources(
"classpath*:/test.properties").size());
- assertEquals(TEST_PROPERTIES_SIZE, context.getResources(
- "classpath*:/org/apache/tiles/servlet/context/Servlet*Test.class").size());
+ assertEquals(1, context.getResources(
+ "classpath*:/org/apache/tiles/servlet/context/wildcard/*Test.class").size());
EasyMock.verify(servletContext);
}
Modified: tiles/framework/trunk/tiles-servlet/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/pom.xml?rev=816913&r1=816912&r2=816913&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-servlet/pom.xml (original)
+++ tiles/framework/trunk/tiles-servlet/pom.xml Sat Sep 19 12:59:50 2009
@@ -108,19 +108,6 @@
<version>1.5.8</version>
<optional>true</optional>
</dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>2.5.6</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>