Author: wsmoak
Date: Fri Apr 7 14:56:19 2006
New Revision: 392431
URL: http://svn.apache.org/viewcvs?rev=392431&view=rev
Log:
Move the Cactus tests and related webapp out of taglib, to integration.
Added:
struts/action/trunk/integration/
struts/action/trunk/integration/pom.xml (with props)
struts/action/trunk/integration/taglib-it/
struts/action/trunk/integration/taglib-it/pom.xml (with props)
struts/action/trunk/integration/taglib-it/src/
struts/action/trunk/integration/taglib-it/src/test/
struts/action/trunk/integration/taglib-it/src/test/java/
- copied from r392374, struts/action/trunk/taglib/src/test-cactus/
struts/action/trunk/integration/taglib-webapp/
struts/action/trunk/integration/taglib-webapp/pom.xml (with props)
struts/action/trunk/integration/taglib-webapp/src/
struts/action/trunk/integration/taglib-webapp/src/main/
struts/action/trunk/integration/taglib-webapp/src/main/webapp/
- copied from r392374, struts/action/trunk/taglib/src/webapp/
struts/action/trunk/integration/taglib-webapp/src/main/webapp/WEB-INF/web.xml
(with props)
Added: struts/action/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/integration/pom.xml?rev=392431&view=auto
==============================================================================
--- struts/action/trunk/integration/pom.xml (added)
+++ struts/action/trunk/integration/pom.xml Fri Apr 7 14:56:19 2006
@@ -0,0 +1,57 @@
+<?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$
+ */
+-->
+
+<!--
+ Experimental Maven 2 Build for Apache Struts
+ ============================================
+
+To build and install this module into your local repo:
+
+ $ mvn install
+
+For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan
+
+-->
+
+<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.action</groupId>
+ <artifactId>struts-build</artifactId>
+ <version>1.3.2-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>struts-action-it</artifactId>
+ <packaging>pom</packaging>
+ <name>Struts Action - Integration Tests</name>
+
+ <modules>
+ <module>taglib-webapp</module>
+ <module>taglib-it</module>
+ </modules>
+
+ <build>
+ <finalName>${pom.artifactId}</finalName>
+ </build>
+
+</project>
Propchange: struts/action/trunk/integration/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/action/trunk/integration/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/action/trunk/integration/taglib-it/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/integration/taglib-it/pom.xml?rev=392431&view=auto
==============================================================================
--- struts/action/trunk/integration/taglib-it/pom.xml (added)
+++ struts/action/trunk/integration/taglib-it/pom.xml Fri Apr 7 14:56:19 2006
@@ -0,0 +1,126 @@
+<?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$
+ */
+-->
+
+<!--
+ Experimental Maven 2 Build for Apache Struts
+ ============================================
+
+To build and install this module into your local repo:
+
+ $ mvn install
+
+For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan
+
+-->
+
+<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.action</groupId>
+ <artifactId>struts-action-it</artifactId>
+ <version>1.3.2-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>taglib-it</artifactId>
+ <packaging>pom</packaging>
+ <name>Struts Action - Integration - Taglib Tests</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cactus</groupId>
+ <artifactId>cactus</artifactId>
+ <version>13-1.7</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>j2ee</groupId>
+ <artifactId>j2ee</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.5.4</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts.action</groupId>
+ <artifactId>struts-taglib</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>0.8</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-ant</artifactId>
+ <version>0.8</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compiler-it</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: struts/action/trunk/integration/taglib-it/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/action/trunk/integration/taglib-it/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/action/trunk/integration/taglib-webapp/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/integration/taglib-webapp/pom.xml?rev=392431&view=auto
==============================================================================
--- struts/action/trunk/integration/taglib-webapp/pom.xml (added)
+++ struts/action/trunk/integration/taglib-webapp/pom.xml Fri Apr 7 14:56:19
2006
@@ -0,0 +1,66 @@
+<?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$
+ */
+-->
+
+<!--
+ Experimental Maven 2 Build for Apache Struts
+ ============================================
+
+To build and install this module into your local repo:
+
+ $ mvn install
+
+For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan
+
+-->
+
+<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.action</groupId>
+ <artifactId>struts-action-it</artifactId>
+ <version>1.3.2-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>taglib-webapp</artifactId>
+ <packaging>war</packaging>
+ <name>Struts Action - Integration - Taglib Webapp</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>struts-taglib</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${pom.artifactId}</finalName>
+ </build>
+
+</project>
Propchange: struts/action/trunk/integration/taglib-webapp/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/action/trunk/integration/taglib-webapp/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added:
struts/action/trunk/integration/taglib-webapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/integration/taglib-webapp/src/main/webapp/WEB-INF/web.xml?rev=392431&view=auto
==============================================================================
---
struts/action/trunk/integration/taglib-webapp/src/main/webapp/WEB-INF/web.xml
(added)
+++
struts/action/trunk/integration/taglib-webapp/src/main/webapp/WEB-INF/web.xml
Fri Apr 7 14:56:19 2006
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+ <!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd";>
+
+<web-app>
+ <display-name>Struts Taglib Testing Application</display-name>
+</web-app>
\ No newline at end of file
Propchange:
struts/action/trunk/integration/taglib-webapp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/action/trunk/integration/taglib-webapp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
