Author: apetrelli
Date: Sun Nov 8 12:54:55 2009
New Revision: 833868
URL: http://svn.apache.org/viewvc?rev=833868&view=rev
Log:
TILESSB-12
Moved tiles-servlet-wildcard as a module of tiles-request.
Modified:
tiles/sandbox/trunk/tiles-request/pom.xml
tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/pom.xml
tiles/sandbox/trunk/tiles3/assembly/pom.xml
tiles/sandbox/trunk/tiles3/assembly/src/main/assembly/src.xml
tiles/sandbox/trunk/tiles3/pom.xml
tiles/sandbox/trunk/tiles3/tiles-extras/pom.xml
Modified: tiles/sandbox/trunk/tiles-request/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/pom.xml?rev=833868&r1=833867&r2=833868&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/pom.xml (original)
+++ tiles/sandbox/trunk/tiles-request/pom.xml Sun Nov 8 12:54:55 2009
@@ -21,6 +21,7 @@
<modules>
<module>tiles-request-api</module>
<module>tiles-request-servlet</module>
+ <module>tiles-request-servlet-wildcard</module>
</modules>
<build>
<pluginManagement>
Modified:
tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/pom.xml?rev=833868&r1=833867&r2=833868&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/pom.xml
(original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/pom.xml
Sun Nov 8 12:54:55 2009
@@ -25,15 +25,15 @@
<parent>
<groupId>org.apache.tiles</groupId>
- <artifactId>tiles-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <artifactId>tiles-request</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tiles-servlet-wildcard</artifactId>
+ <artifactId>tiles-request-servlet-wildcard</artifactId>
<packaging>jar</packaging>
- <name>Tiles - Wildcard file loading in Servlets</name>
- <description>Tiles Wildcard file loading in Servlets: Allows to load
resources using wildcards.</description>
+ <name>Tiles Request - Wildcard file loading in Servlets</name>
+ <description>Wildcard file loading in Servlets: Allows to load resources
using wildcards.</description>
<properties>
<tiles.osgi.symbolicName>org.apache.tiles.servlet.wildcard</tiles.osgi.symbolicName>
@@ -67,24 +67,13 @@
</includes>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
</build>
<dependencies>
<dependency>
<groupId>org.apache.tiles</groupId>
- <artifactId>tiles-servlet</artifactId>
+ <artifactId>tiles-request-servlet</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: tiles/sandbox/trunk/tiles3/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/assembly/pom.xml?rev=833868&r1=833867&r2=833868&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/assembly/pom.xml (original)
+++ tiles/sandbox/trunk/tiles3/assembly/pom.xml Sun Nov 8 12:54:55 2009
@@ -165,12 +165,6 @@
<dependency>
<groupId>org.apache.tiles</groupId>
- <artifactId>tiles-servlet-wildcard</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tiles</groupId>
<artifactId>tiles-portlet</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: tiles/sandbox/trunk/tiles3/assembly/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/assembly/src/main/assembly/src.xml?rev=833868&r1=833867&r2=833868&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/assembly/src/main/assembly/src.xml (original)
+++ tiles/sandbox/trunk/tiles3/assembly/src/main/assembly/src.xml Sun Nov 8
12:54:55 2009
@@ -62,14 +62,6 @@
</includes>
</fileSet>
<fileSet>
- <directory>../tiles-servlet-wildcard</directory>
- <outputDirectory>src/tiles-servlet-wildcard</outputDirectory>
- <includes>
- <include>pom.xml</include>
- <include>src/</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>../tiles-jsp</directory>
<outputDirectory>src/tiles-jsp</outputDirectory>
<includes>
Modified: tiles/sandbox/trunk/tiles3/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/pom.xml?rev=833868&r1=833867&r2=833868&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/pom.xml (original)
+++ tiles/sandbox/trunk/tiles3/pom.xml Sun Nov 8 12:54:55 2009
@@ -51,7 +51,6 @@
<module>tiles-core</module>
<module>tiles-template</module>
<module>tiles-servlet</module>
- <module>tiles-servlet-wildcard</module>
<module>tiles-jsp</module>
<module>tiles-freemarker</module>
<module>tiles-velocity</module>
Modified: tiles/sandbox/trunk/tiles3/tiles-extras/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-extras/pom.xml?rev=833868&r1=833867&r2=833868&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-extras/pom.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-extras/pom.xml Sun Nov 8 12:54:55 2009
@@ -68,8 +68,8 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tiles-servlet-wildcard</artifactId>
- <version>${pom.version}</version>
+ <artifactId>tiles-request-servlet-wildcard</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
