Author: ddewolf
Date: Tue Oct 31 10:44:37 2006
New Revision: 469603
URL: http://svn.apache.org/viewvc?view=rev&rev=469603
Log:
adding functional webapp tests for the container; this will ensure that while
we're working on the container, we are not breaking the TilesUtil approache.
Added:
struts/sandbox/trunk/tiles/tiles-container-test/
struts/sandbox/trunk/tiles/tiles-container-test/pom.xml (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/
struts/sandbox/trunk/tiles/tiles-container-test/src/main/
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/ (with
props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/.externals
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/
(with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/.externals
Modified:
struts/sandbox/trunk/tiles/pom.xml
Modified: struts/sandbox/trunk/tiles/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/pom.xml?view=diff&rev=469603&r1=469602&r2=469603
==============================================================================
--- struts/sandbox/trunk/tiles/pom.xml (original)
+++ struts/sandbox/trunk/tiles/pom.xml Tue Oct 31 10:44:37 2006
@@ -63,6 +63,7 @@
<module>tiles-api</module>
<module>tiles-core</module>
<module>tiles-test</module>
+ <module>tiles-container-test</module>
</modules>
<licenses>
Added: struts/sandbox/trunk/tiles/tiles-container-test/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/pom.xml?view=auto&rev=469603
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/pom.xml (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/pom.xml Tue Oct 31 10:44:37
2006
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<!--
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Id$
+ */
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <parent>
+ <groupId>org.apache.struts.tiles</groupId>
+ <artifactId>tiles-parent</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>tiles-container-test</artifactId>
+ <packaging>war</packaging>
+ <name>Tiles - Contain - Test</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tiles-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <configuration>
+ <container>
+ <containerId>tomcat5x</containerId>
+ <home>${cargo.tomcat5x.home}</home>
+ <log>${project.build.directory}/tomcat5x.log</log>
+ <output>${project.build.directory}/tomcat5x.out</output>
+ </container>
+ <configuration>
+ <home>${project.build.directory}/tomcat5x</home>
+ </configuration>
+ </configuration>
+ </plugin>
+ </plugins>
+ <finalName>${pom.artifactId}</finalName>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>selenium</id>
+ <activation>
+ <property>
+ <name>selenium</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-selenium</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+
<groupId>org.openqa.selenium.core</groupId>
+
<artifactId>selenium-core</artifactId>
+ <version>0.7.0</version>
+ </artifactItem>
+ </artifactItems>
+
<outputDirectory>${project.build.directory}/selenium</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-selenium</id>
+ <phase>process-resources</phase>
+ <configuration>
+ <tasks>
+ <copy
todir="${project.build.directory}/${artifactId}/selenium/core">
+ <fileset
dir="${project.build.directory}/selenium/core"/>
+ </copy>
+ <copy
todir="${project.build.directory}/${artifactId}/selenium/tests">
+ <fileset dir="src/test/selenium"/>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <id>OpenQA</id>
+ <url>http://maven.openqa.org</url>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
+
+
+</project>
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Tue Oct 31 10:44:37 2006
@@ -0,0 +1,18 @@
+body.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/body.jsp
+header.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/header.jsp
+index.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp
+layout.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/layout.jsp
+override.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/override.jsp
+putattributeslayout.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/putattributeslayout.jsp
+testdef.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testdef.jsp
+testimportattribute.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testimportattribute.jsp
+testinsertdefinition.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition.jsp
+testinsertdefinition_composite.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp
+testinsertdefinition_componsite_tags_includes_configured.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_componsite_tags_includes_configured.jsp
+testinsertdefinition_componsite_tags_includes_configured_notype.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_componsite_tags_includes_configured_notype.jsp
+testinsertdefinition_componsite_tags_notype.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_componsite_tags_notype.jsp
+testinsertdefinition_inline.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp
+testinsertdefinition_notype.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_notype.jsp
+testinsertdefinition_override.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_override.jsp
+testput.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput.jsp
+testput_servlet.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_servlet.jsp
Added:
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/.externals
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/.externals?view=auto&rev=469603
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/.externals
(added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/.externals
Tue Oct 31 10:44:37 2006
@@ -0,0 +1,18 @@
+body.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/body.jsp
+header.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/header.jsp
+index.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp
+layout.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/layout.jsp
+override.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/override.jsp
+putattributeslayout.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/putattributeslayout.jsp
+testdef.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testdef.jsp
+testimportattribute.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testimportattribute.jsp
+testinsertdefinition.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition.jsp
+testinsertdefinition_composite.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp
+testinsertdefinition_componsite_tags_includes_configured.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_componsite_tags_includes_configured.jsp
+testinsertdefinition_componsite_tags_includes_configured_notype.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_componsite_tags_includes_configured_notype.jsp
+testinsertdefinition_componsite_tags_notype.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_componsite_tags_notype.jsp
+testinsertdefinition_inline.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp
+testinsertdefinition_notype.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_notype.jsp
+testinsertdefinition_override.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_override.jsp
+testput.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput.jsp
+testput_servlet.jsp
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_servlet.jsp
Propchange:
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Tue Oct 31 10:44:37 2006
@@ -0,0 +1 @@
+tiles-defs.xml
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
Added:
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/.externals
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/.externals?view=auto&rev=469603
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/.externals
(added)
+++
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/.externals
Tue Oct 31 10:44:37 2006
@@ -0,0 +1 @@
+tiles-defs.xml
https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
