You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by pt...@apache.org on 2008/01/15 21:11:35 UTC

svn commit: r612198 - in /jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples: ./ samples-ejb/ samples-servlet/ samples-servlet/src/main/webapp/WEB-INF/

Author: ptahchiev
Date: Tue Jan 15 12:11:32 2008
New Revision: 612198

URL: http://svn.apache.org/viewvc?rev=612198&view=rev
Log:
changes on the samples module.

Added:
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/src/main/webapp/WEB-INF/cactus-report.xsl
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/src/main/webapp/WEB-INF/cactus-web.xml
Modified:
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/build.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/build.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/src/main/webapp/WEB-INF/web.xml

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties?rev=612198&r1=612197&r2=612198&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties Tue Jan 15 12:11:32 2008
@@ -8,6 +8,7 @@
 meta.inf.dir=${basedir}/src/main/resources
 
 #Project Specific Settings
+#cactus.samples.servlet-1.8.0-SNAPSHOT.war
 project.name=samples-servlet-1.8.0-SNAPSHOT
 archive.name=${target.dir}/${project.name}.${cactus.sample.archive.type}
 cactified.archive.name=${target.dir}/${project.name}-cactified.${cactus.sample.archive.type}

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml?rev=612198&r1=612197&r2=612198&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml Tue Jan 15 12:11:32 2008
@@ -39,6 +39,33 @@
     <module>samples-ejb</module>
     <module>samples-servlet</module>
   </modules>
+  <build>
+		<plugins>
+		  <plugin>
+			  <artifactId>maven-antrun-plugin</artifactId>
+  			<dependencies>	
+  				<dependency>
+  					<groupId>org.apache.ivy</groupId>
+  					<artifactId>ivy</artifactId>
+  					<version>2.0.0-beta1</version>
+  				</dependency>
+  			</dependencies>
+			   <executions>
+				    <execution>
+					    <phase>test</phase>
+					    <configuration>
+    						<tasks>
+    							    <ant antfile="build.xml"/>
+    						</tasks>
+					    </configuration>
+					    <goals>
+						    <goal>run</goal>
+					    </goals>
+				    </execution>
+  			</executions>
+		   </plugin>
+		</plugins>
+	</build>
 </project>
 
 

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/build.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/build.xml?rev=612198&r1=612197&r2=612198&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/build.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/build.xml Tue Jan 15 12:11:32 2008
@@ -15,28 +15,11 @@
   -->	
 	<target name="init" depends="">
 	
-  	<property name="base.dir" location="samples-${cactus.sample.app.type}"/>
-		<echo>${base.dir}</echo>
-		
-		<property name="target.dir" location="${base.dir}/target"/>
-		<property name="build.dir" location="${target.dir}/classes"/>
-		<property name="cactus.src.dir" location="${base.dir}/src/main/cactus/"/>
-		<property name="src.dir" location="${base.dir}/src/main/java/"/>
-		<property name="src.application.dir" location="${base.dir}/src/main/app"/>
-		<property name="project.name" value="samples-servlet-1.8.0-SNAPSHOT"/>
-		<property name="archive.name" value="${target.dir}/${project.name}.${cactus.sample.archive.type}"/>
-		<property name="cactified.archive.name" value="${target.dir}/${project.name}-cactified.${cactus.sample.archive.type}"/>
-		<property name="maven.repo" location="/home/peter/.m2/repository"/>
-		<property name="container.home" location="C:/apache/tomcat/apache-tomcat-6.0.14"/>
-		<property name="logs.dir" location="${target.dir}/logs"/>
-		<property name="cactus.formatter.type" value="xml"/>
-		<property name="container.id" value="tomcat5x"/>
-		<property name="cargo.servlet.port" value="8080"/>
-		<property name="cargo.logging" value="high"/>
-		
-		<property name="reports.dir" value="${base.dir}/target/reports"/>
-		<property name="ivy.lib.dir" value="${base.dir}/target/lib"/>
-		<property name="meta.inf.dir" value="${base.dir}/src/main/resources"/>
+	
+	  <property name="cactus.sample.app.type" value="ejb"/>
+	  <property name="cactus.sample.archive.type" value="ear"/>
+	  
+	  <property file="../build.properties"/>
 		
 		<path id="cactus.classpath">
 			<fileset dir="${ivy.lib.dir}">
@@ -63,7 +46,7 @@
   -->
 	<target name="resolve" description="Retrieve dependencies with ivy" depends="prepare">
 		<ivy:configure file="${basedir}/../ivysettings.xml" />
-		<ivy:retrieve />
+		<ivy:retrieve file="../ivy.xml" sync="true"/>
   </target>
 
  <!--
@@ -140,7 +123,7 @@
        Execute the tests.
      ========================================================================
   -->
-	<target name="test" depends="cactifywar, cactifyear">
+	<target name="test" depends="cactifyear">
 
 		<cactus earfile="${cactified.archive.name}"
 			printsummary="yes">

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/build.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/build.xml?rev=612198&r1=612197&r2=612198&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/build.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/build.xml Tue Jan 15 12:11:32 2008
@@ -3,8 +3,8 @@
 	<description>
      Cactus Sample
      ---------------------------------------------------------
-     Sample WAR/EAR application that demonstrates how Cactus can
-     be used using the Ant integration for unit testing Servlets/EJBs
+     Sample WAR application that demonstrates how Cactus can
+     be used using the Ant integration for unit testing Servlets
      classes.
   </description>
   
@@ -47,7 +47,7 @@
   -->
 	<target name="resolve" description="Retrieve dependencies with ivy" depends="prepare">
 		<ivy:configure file="${basedir}/../ivysettings.xml" />
-		<ivy:retrieve file="../ivy.xml"/>
+		<ivy:retrieve file="../ivy.xml" sync="true"/>
   </target>
 
  <!--
@@ -86,9 +86,20 @@
   -->
 	<target name="package-war" depends="compile">
 		<war destfile="${archive.name}" webxml="${basedir}/src/main/webapp/WEB-INF/web.xml">
+		  <fileset dir="${basedir}/src/main/webapp/WEB-INF">
+        <exclude name="cactus-report.xsl"/>
+        <exclude name="cactus-web.xml"/>
+        <exclude name="web.xml"/>
+      </fileset>
+      <fileset dir="${basedir}/src/main/webapp">
+        <include name="test/test.jsp"/>
+        <include name="org/apache/jsp/jspRedirector.jsp"/>
+      </fileset>
 			<classes dir="${build.dir}"/>
 			<lib dir="${ivy.lib.dir}">
 				<include name="**.jar"/>
+				<exclude name="jsp-api-2.0.jar"/>
+        <exclude name="servlet-api-2.5.jar"/>
 			</lib>	
 		</war>
 	</target>
@@ -99,7 +110,30 @@
      ========================================================================
   -->
 	<target name="cactifywar" depends="package-war">
-		<cactifywar srcfile="${archive.name}" destfile="${cactified.archive.name}"/>	
+		<cactifywar srcfile="${archive.name}" destfile="${cactified.archive.name}" mergewebxml="${basedir}/src/main/webapp/WEB-INF/cactus-web.xml"/>
+    
+    <cactifywar srcfile="${archive.name}"
+        destfile="${cactified.archive.name}"
+        mergewebxml="${basedir}/src/main/webapp/WEB-INF/cactus-web.xml">
+      <classes dir="${build.dir}"/>
+      <!-- Provide a secured servlet redirector in addition to the
+           default servlet redirector -->
+      <servletredirector/>
+      <servletredirector name="ServletRedirectorSecure"
+          mapping="/ServletRedirectorSecure" roles="test"/>
+      <!-- Orion fails on a servlet filter that is not mapped to an actual
+           resource, to trick it -->
+      <filterredirector mapping="/test/filterRedirector.jsp"/>
+      <!-- Files needed for JBoss -->
+      <classes dir="${basedir}/src/main/resources/conf/jboss3x">
+        <include name="*.properties"/>
+      </classes>
+      <webinf dir="${basedir}/src/main/resources/conf/jboss3x">
+        <include name="jboss-web.xml"/>
+      </webinf>
+    </cactifywar>
+    
+    	
 	</target>
 	
 

Added: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/src/main/webapp/WEB-INF/cactus-report.xsl
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/src/main/webapp/WEB-INF/cactus-report.xsl?rev=612198&view=auto
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/src/main/webapp/WEB-INF/cactus-report.xsl (added)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/src/main/webapp/WEB-INF/cactus-report.xsl Tue Jan 15 12:11:32 2008
@@ -0,0 +1,355 @@
+<?xml version="1.0"?>
+<!--
+ The Apache Software License, Version 1.1
+
+ Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
+ reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+ 3. The end-user documentation included with the redistribution, if
+    any, must include the following acknowlegement:
+       "This product includes software developed by the
+        Apache Software Foundation (http://www.apache.org/)."
+    Alternately, this acknowlegement may appear in the software itself,
+    if and wherever such third-party acknowlegements normally appear.
+
+ 4. The names "The Jakarta Project", "Cactus", and "Apache Software
+    Foundation" must not be used to endorse or promote products derived
+    from this software without prior written permission. For written
+    permission, please contact apache@apache.org.
+
+ 5. Products derived from this software may not be called "Apache"
+    nor may "Apache" appear in their names without prior written
+    permission of the Apache Group.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+ ====================================================================
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the Apache Software Foundation.  For more
+ information on the Apache Software Foundation, please see
+ <http://www.apache.org/>.
+ -->
+ 
+<!--
+ 
+ Sample stylesheet to be used with the Cactus ServletTestRunner output.
+ Based on the file junit-noframes.xsl from Apache Ant 1.5.
+ 
+ @author Stephane Bailliez <a href="mailto:sbailliez@apache.org"/>
+ @author Erik Hatcher <a href="mailto:ehatcher@apache.org"/>
+ @author Christopher Lenz <a href="mailto:cmlenz@apache.org"/>
+ 
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:output method="html" indent="yes" encoding="US-ASCII"/>
+  <xsl:decimal-format decimal-separator="." grouping-separator="," />
+  <xsl:template match="testsuites">
+    <html>
+      <head>
+        <style type="text/css">
+          body {
+            font:normal 68% verdana,arial,helvetica;
+            color:#000000;
+          }
+          table tr td, table tr th {
+              font-size: 68%;
+          }
+          table.details tr th{
+            font-weight: bold;
+            text-align:left;
+            background:#a6caf0;
+          }
+          table.details tr td{
+            background:#eeeee0;
+          }
+          
+          p {
+            line-height:1.5em;
+            margin-top:0.5em; margin-bottom:1.0em;
+          }
+          h1 {
+            margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
+          }
+          h2 {
+            margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
+          }
+          h3 {
+            margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
+          }
+          h4 {
+            margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+          }
+          h5 {
+            margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+          }
+          h6 {
+            margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+          }
+          .Error {
+            font-weight:bold; color:red;
+          }
+          .Failure {
+            font-weight:bold; color:purple;
+          }
+        </style>
+      </head>
+      <body>
+        <a name="top"></a>
+        <xsl:call-template name="header"/>  
+        <xsl:call-template name="summary"/>
+        <hr size="1" width="95%" align="left"/>
+        <xsl:call-template name="classes"/>
+      </body>
+    </html>
+  </xsl:template>
+  
+  <xsl:template name="header">
+    <h1>Unit Test Results</h1>
+    <table width="100%">
+    <tr>
+      <td align="left"></td>
+      <td align="right">
+        Designed for use with 
+        <a href='http://jakarta.apache.org/cactus/'>Cactus</a>.
+      </td>
+    </tr>
+    </table>
+    <hr size="1"/>
+  </xsl:template>
+  
+  <xsl:template name="summary">
+    <h2>Summary</h2>
+    <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
+    <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
+    <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
+    <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
+    <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/>
+    <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+    <tr valign="top">
+      <th>Tests</th>
+      <th>Failures</th>
+      <th>Errors</th>
+      <th>Success rate</th>
+      <th>Time</th>
+    </tr>
+    <tr valign="top">
+      <xsl:attribute name="class">
+        <xsl:choose>
+          <xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
+          <xsl:when test="$errorCount &gt; 0">Error</xsl:when>
+        </xsl:choose>
+      </xsl:attribute>
+      <td><xsl:value-of select="$testCount"/></td>
+      <td><xsl:value-of select="$failureCount"/></td>
+      <td><xsl:value-of select="$errorCount"/></td>
+      <td>
+        <xsl:call-template name="display-percent">
+          <xsl:with-param name="value" select="$successRate"/>
+        </xsl:call-template>
+      </td>
+      <td>
+        <xsl:call-template name="display-time">
+          <xsl:with-param name="value" select="$timeCount"/>
+        </xsl:call-template>
+      </td>
+    </tr>
+    </table>
+    <table border="0" width="95%">
+    <tr>
+    <td style="text-align: justify;">
+      Note: <i>failures</i> are anticipated and checked for with assertions 
+      while <i>errors</i> are unanticipated.
+    </td>
+    </tr>
+    </table>
+  </xsl:template>
+  
+  <xsl:template name="classes">
+    <xsl:for-each select="testsuite">
+      <xsl:sort select="@name"/>
+      <!-- create an anchor to this class name -->
+      <a name="{@name}"></a>
+      <h3>TestCase <xsl:value-of select="@name"/></h3>
+      
+      <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+        <xsl:call-template name="testcase.test.header"/>
+        <!--
+        test can even not be started at all (failure to load the class)
+        so report the error directly
+        -->
+        <xsl:if test="./error">
+          <tr class="Error">
+            <td colspan="4"><xsl:apply-templates select="./error"/></td>
+          </tr>
+        </xsl:if>
+        <xsl:apply-templates select="./testcase" mode="print.test"/>
+      </table>
+      <p/>
+      <a href="#top">Back to top</a>
+    </xsl:for-each>
+  </xsl:template>
+  
+  <xsl:template match="testsuite" mode="header">
+    <tr valign="top">
+      <th width="80%">Name</th>
+      <th>Tests</th>
+      <th>Errors</th>
+      <th>Failures</th>
+      <th nowrap="nowrap">Time(s)</th>
+    </tr>
+  </xsl:template>
+    
+  <!-- class header -->
+  <xsl:template name="testsuite.test.header">
+    <tr valign="top">
+      <th width="80%">Name</th>
+      <th>Tests</th>
+      <th>Errors</th>
+      <th>Failures</th>
+      <th nowrap="nowrap">Time(s)</th>
+    </tr>
+  </xsl:template>
+
+  <!-- method header -->
+  <xsl:template name="testcase.test.header">
+    <tr valign="top">
+      <th>Name</th>
+      <th>Status</th>
+      <th width="80%">Type</th>
+      <th nowrap="nowrap">Time(s)</th>
+    </tr>
+  </xsl:template>
+  
+  <!-- class information -->
+  <xsl:template match="testsuite" mode="print.test">
+    <tr valign="top">
+      <!-- set a nice color depending if there is an error/failure -->
+      <xsl:attribute name="class">
+        <xsl:choose>
+          <xsl:when test="@failures[.&gt; 0]">Failure</xsl:when>
+          <xsl:when test="@errors[.&gt; 0]">Error</xsl:when>
+        </xsl:choose>
+      </xsl:attribute>
+      <!-- print testsuite information -->
+      <td><a href="#{@name}"><xsl:value-of select="@name"/></a></td>
+      <td><xsl:value-of select="@tests"/></td>
+      <td><xsl:value-of select="@errors"/></td>
+      <td><xsl:value-of select="@failures"/></td>
+      <td>
+        <xsl:call-template name="display-time">
+          <xsl:with-param name="value" select="@time"/>
+        </xsl:call-template>
+      </td>
+    </tr>
+  </xsl:template>
+  
+  <xsl:template match="testcase" mode="print.test">
+    <tr valign="top">
+      <xsl:attribute name="class">
+        <xsl:choose>
+          <xsl:when test="failure | error">Error</xsl:when>
+        </xsl:choose>
+      </xsl:attribute>
+      <td><xsl:value-of select="@name"/></td>
+      <xsl:choose>
+        <xsl:when test="failure">
+          <td>Failure</td>
+          <td><xsl:apply-templates select="failure"/></td>
+        </xsl:when>
+        <xsl:when test="error">
+          <td>Error</td>
+          <td><xsl:apply-templates select="error"/></td>
+        </xsl:when>
+        <xsl:otherwise>
+          <td>Success</td>
+          <td></td>
+        </xsl:otherwise>
+      </xsl:choose>
+      <td>
+        <xsl:call-template name="display-time">
+          <xsl:with-param name="value" select="@time"/>
+        </xsl:call-template>
+      </td>
+    </tr>
+  </xsl:template>
+  
+  <xsl:template match="failure">
+    <xsl:call-template name="display-failures"/>
+  </xsl:template>
+  
+  <xsl:template match="error">
+    <xsl:call-template name="display-failures"/>
+  </xsl:template>
+  
+  <!-- Style for the error and failure in the tescase template -->
+  <xsl:template name="display-failures">
+    <xsl:choose>
+      <xsl:when test="not(@message)">N/A</xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="@message"/>
+      </xsl:otherwise>
+    </xsl:choose>
+    <!-- display the stacktrace -->
+    <code>
+      <p/>
+      <xsl:call-template name="br-replace">
+        <xsl:with-param name="word" select="."/>
+      </xsl:call-template>
+    </code>
+  </xsl:template>
+  
+  <!--
+    template that will convert a carriage return into a br tag
+    @param word the text from which to convert CR to BR tag
+  -->
+  <xsl:template name="br-replace">
+    <xsl:param name="word"/>
+    <xsl:choose>
+      <xsl:when test="contains($word,'&#xA;')">
+        <xsl:value-of select="substring-before($word,'&#xA;')"/>
+        <br/>
+        <xsl:call-template name="br-replace">
+          <xsl:with-param name="word" select="substring-after($word,'&#xA;')"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$word"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  
+  <xsl:template name="display-time">
+    <xsl:param name="value"/>
+    <xsl:value-of select="format-number($value,'0.000')"/>
+  </xsl:template>
+  
+  <xsl:template name="display-percent">
+    <xsl:param name="value"/>
+    <xsl:value-of select="format-number($value,'0.00%')"/>
+  </xsl:template>
+  
+</xsl:stylesheet>
+

Added: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/src/main/webapp/WEB-INF/cactus-web.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/src/main/webapp/WEB-INF/cactus-web.xml?rev=612198&view=auto
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/src/main/webapp/WEB-INF/cactus-web.xml (added)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/src/main/webapp/WEB-INF/cactus-web.xml Tue Jan 15 12:11:32 2008
@@ -0,0 +1,50 @@
+<?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>
+
+    <context-param>
+      <param-name>param</param-name>
+      <param-value>value used for testing</param-value>
+    </context-param>
+    
+    <servlet>
+        <servlet-name>ServletRedirector</servlet-name>
+        <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
+        <init-param>
+          <param-name>param1</param-name>
+          <param-value>value1 used for testing</param-value>
+        </init-param>
+    </servlet>
+    
+    <servlet>
+        <servlet-name>ServletRedirector_TestOverride</servlet-name>
+        <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
+        <init-param>
+          <param-name>param2</param-name>
+          <param-value>value2 used for testing</param-value>
+        </init-param>
+    </servlet>
+
+    <servlet>
+        <servlet-name>TestJsp</servlet-name>
+        <jsp-file>/test/test.jsp</jsp-file>
+    </servlet>
+
+    <servlet>
+        <servlet-name>JspRedirector</servlet-name>
+        <jsp-file>/jspRedirector.jsp</jsp-file>
+        <init-param>
+          <param-name>param1</param-name>
+          <param-value>value1 used for testing</param-value>
+        </init-param>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>ServletRedirector_TestOverride</servlet-name>
+        <url-pattern>/ServletRedirectorOverride</url-pattern>
+    </servlet-mapping>
+
+</web-app>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/src/main/webapp/WEB-INF/web.xml?rev=612198&r1=612197&r2=612198&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/src/main/webapp/WEB-INF/web.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/src/main/webapp/WEB-INF/web.xml Tue Jan 15 12:11:32 2008
@@ -4,47 +4,4 @@
     "http://java.sun.com/dtd/web-app_2_3.dtd">
 
 <web-app>
-
-    <context-param>
-      <param-name>param</param-name>
-      <param-value>value used for testing</param-value>
-    </context-param>
-    
-    <servlet>
-        <servlet-name>ServletRedirectorPepo</servlet-name>
-        <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
-        <init-param>
-          <param-name>param1</param-name>
-          <param-value>value1 used for testing</param-value>
-        </init-param>
-    </servlet>
-    
-    <servlet>
-        <servlet-name>ServletRedirector_TestOverride</servlet-name>
-        <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
-        <init-param>
-          <param-name>param2</param-name>
-          <param-value>value2 used for testing</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet>
-        <servlet-name>TestJsp</servlet-name>
-        <jsp-file>/test/test.jsp</jsp-file>
-    </servlet>
-
-    <servlet>
-        <servlet-name>JspRedirectorPepo</servlet-name>
-        <jsp-file>/jspRedirector.jsp</jsp-file>
-        <init-param>
-          <param-name>param1</param-name>
-          <param-value>value1 used for testing</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>ServletRedirector_TestOverride</servlet-name>
-        <url-pattern>/ServletRedirectorOverride</url-pattern>
-    </servlet-mapping>
-
 </web-app>



---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org