Author: veithen
Date: Sun Jan 1 09:43:35 2012
New Revision: 1226221
URL: http://svn.apache.org/viewvc?rev=1226221&view=rev
Log:
Mavenized the build of the WAR file and migrated the httpunit tests. Note that
these tests are not all working yet.
Added:
axis/axis1/java/trunk/axis-war/
axis/axis1/java/trunk/axis-war/pom.xml (with props)
axis/axis1/java/trunk/axis-war/src/
axis/axis1/java/trunk/axis-war/src/main/
axis/axis1/java/trunk/axis-war/src/main/webapp/
- copied from r1226185, axis/axis1/java/trunk/webapps/axis/
axis/axis1/java/trunk/axis-war/src/test/
axis/axis1/java/trunk/axis-war/src/test/java/
axis/axis1/java/trunk/axis-war/src/test/java/test/
axis/axis1/java/trunk/axis-war/src/test/java/test/httpunit/
- copied from r1226185, axis/axis1/java/trunk/test/httpunit/
axis/axis1/java/trunk/axis-war/src/test/web.xml
- copied, changed from r1226185,
axis/axis1/java/trunk/webapps/axis/WEB-INF/web.xml
Removed:
axis/axis1/java/trunk/axis-war/src/test/java/test/httpunit/FunctionalTests.java
axis/axis1/java/trunk/axis-war/src/test/java/test/httpunit/build.xml
axis/axis1/java/trunk/test/httpunit/
axis/axis1/java/trunk/webapps/axis/
Added: axis/axis1/java/trunk/axis-war/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-war/pom.xml?rev=1226221&view=auto
==============================================================================
--- axis/axis1/java/trunk/axis-war/pom.xml (added)
+++ axis/axis1/java/trunk/axis-war/pom.xml Sun Jan 1 09:43:35 2012
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you 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.
+ -->
+<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";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>axis-project</artifactId>
+ <version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>axis-war</artifactId>
+ <packaging>war</packaging>
+ <name>Axis :: WAR</name>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.6.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>7.5.2.v20111006</version>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <stopKey>foo</stopKey>
+ <stopPort>9999</stopPort>
+ <webAppConfig>
+ <contextPath>/axis</contextPath>
+ <descriptor>src/test/web.xml</descriptor>
+ </webAppConfig>
+ </configuration>
+ <executions>
+ <execution>
+ <id>start-jetty</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <scanIntervalSeconds>0</scanIntervalSeconds>
+ <daemon>true</daemon>
+ </configuration>
+ </execution>
+ <execution>
+ <id>stop-jetty</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+
<test.functional.webapp.url>http://localhost:8080/axis</test.functional.webapp.url>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: axis/axis1/java/trunk/axis-war/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied: axis/axis1/java/trunk/axis-war/src/test/web.xml (from r1226185,
axis/axis1/java/trunk/webapps/axis/WEB-INF/web.xml)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-war/src/test/web.xml?p2=axis/axis1/java/trunk/axis-war/src/test/web.xml&p1=axis/axis1/java/trunk/webapps/axis/WEB-INF/web.xml&r1=1226185&r2=1226221&rev=1226221&view=diff
==============================================================================
--- axis/axis1/java/trunk/webapps/axis/WEB-INF/web.xml (original)
+++ axis/axis1/java/trunk/axis-war/src/test/web.xml Sun Jan 1 09:43:35 2012
@@ -5,7 +5,12 @@ Application 2.3//EN" "http://java.sun.co
<web-app>
<display-name>Apache-Axis</display-name>
-
+
+ <context-param>
+ <param-name>axis.development.system</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
<listener>
<listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
</listener>
@@ -60,13 +65,10 @@ Application 2.3//EN" "http://java.sun.co
<url-pattern>/SOAPMonitor</url-pattern>
</servlet-mapping>
- <!-- uncomment this if you want the admin servlet -->
- <!--
<servlet-mapping>
<servlet-name>AdminServlet</servlet-name>
<url-pattern>/servlet/AdminServlet</url-pattern>
</servlet-mapping>
- -->
<session-config>
<!-- Default to 5 minute session timeouts -->
