Author: ptahchiev Date: Sat Feb 2 01:04:04 2008 New Revision: 617773 URL: http://svn.apache.org/viewvc?rev=617773&view=rev Log: Added the Jetty samples module.
Added: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/build.xml jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/pom.xml jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/cactus/ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/cactus/org/ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/cactus/org/apache/ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/cactus/org/apache/cactus/ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/cactus/org/apache/cactus/sample/ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/cactus/org/apache/cactus/sample/jetty/ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/cactus/org/apache/cactus/sample/jetty/TestJettyAll.java jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/java/ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/resources/ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/resources/conf/ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/resources/conf/jetty.xml jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/webapp/ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/webapp/WEB-INF/ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/webapp/WEB-INF/web.xml jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/webapp/test/ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/webapp/test/test.jsp Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/servlet/pom.xml Added: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/build.xml URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/build.xml?rev=617773&view=auto ============================================================================== --- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/build.xml (added) +++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/build.xml Sat Feb 2 01:04:04 2008 @@ -0,0 +1,266 @@ +<?xml version="1.0"?> + +<!-- + ============================================================================= + Build file for the Cactus Jetty Sample subproject (it shows how to use + Cactus and Jelly in an integrated way for unit testing the Servlet API : + Servlets, Fitlers, Taglibs). + + The following Ant tasks need to be available in your ant installation (i.e. + the Ant task themselves and their dependent jars need to be put in + ANT_HOME/lib) : + + junit [REQUIRED] JUnit Ant task + + The mandatory and optional Ant properties are defined in + build.properties.sample. Please read and edit that file. + + This script should be started with the following command line : + + ant <target> + + Run "ant -projecthelp" to get a list of available targets. The default + target is "dist" + ============================================================================= +--> +<project name="Cactus Jetty Sample" default="test" basedir="."> + + <!-- Give user a chance to override without editing this file + (and without typing -D each time it compiles it) --> + <property file="build.properties" /> + <property file="${user.home}/build.properties" /> + + <!-- Global project properties --> + <property name="project.name.text" value="Cactus Jetty Sample"/> + <property name="project.name.file" value="sample-jetty"/> + <property name="project.version" value="@version@"/> + + <!-- Prefix to add to all distributable files --> + <property name="project.prefix" value="jakarta-"/> + + <!-- Generic properties --> + <property name="year" value="@year@"/> + <property name="debug" value="on"/> + <property name="optimize" value="off"/> + <property name="deprecation" value="off"/> + + <!-- Properties for the Cactus tests --> + <property name="cactus.port" value="8080"/> + <property name="tools.jar" location="${java.home}/../lib/tools.jar"/> + + <!-- + ======================================================================== + Set the properties related to the source tree. + ======================================================================== + --> + <property name="src.dir" location="src"/> + <property name="src.java.dir" location="${src.dir}/java"/> + <property name="src.conf.dir" location="${src.dir}/conf"/> + <property name="src.cactus.dir" location="${src.dir}/test-cactus"/> + <property name="src.webapp.dir" location="${src.dir}/webapp"/> + + <!-- + ======================================================================== + Set the properties related to the target area + ======================================================================== + --> + <!-- Destination locations for the build --> + <property name="target.dir" location="target"/> + <property name="target.classes.dir" location="${target.dir}/classes"/> + <property name="target.classes.java.dir" + location="${target.classes.dir}/java"/> + <property name="target.classes.cactus.dir" + location="${target.classes.dir}/cactus"/> + <property name="target.testreports.dir" + location="${target.dir}/test-reports"/> + + <!-- Distribution directory, i.e. where the expanded distibutable files + are located --> + <property name="dist.dir" location="dist"/> + + <!-- + ======================================================================== + Set the properties related to the required libraries + ======================================================================== + --> + + <!-- Libraries required for the sample project --> + <property name="servlet.jar" + location="../../lib/@servlet.jar.name@"/> + <path id="project.classpath"> + <pathelement location="${servlet.jar}"/> + </path> + + <!-- Libraries required for the Cactus tests --> + <property name="aspectjrt.jar" + location="../../lib/@aspectjrt.jar.name@"/> + <property name="cactus.jar" + location="../../lib/@cactus.jar.name@"/> + <property name="cargo.jar" + location="../../lib/@cargo.jar.name@"/> + <property name="cargo.ant.jar" + location="../../lib/@cargo.ant.jar.name@"/> + <property name="commons.httpclient.jar" + location="../../lib/@commons.httpclient.jar.name@"/> + <property name="commons.logging.jar" + location="../../lib/@commons.logging.jar.name@"/> + <property name="jasper-compiler.jar" + location="../../lib/@jasper-compiler.jar.name@"/> + <property name="jasper-runtime.jar" + location="../../lib/@jasper-runtime.jar.name@"/> + <property name="jetty.jar" + location="../../lib/@jetty.jar.name@"/> + <property name="junit.jar" + location="../../lib/@junit.jar.name@"/> + <property name="htmlunit.jar" + location="../../lib/@htmlunit.jar.name@"/> + + <path id="cactus.classpath"> + <path refid="project.classpath"/> + <pathelement location="${aspectjrt.jar}"/> + <pathelement location="${cactus.jar}"/> + <pathelement location="${cargo.jar}"/> + <pathelement location="${cargo.ant.jar}"/> + <pathelement location="${commons.httpclient.jar}"/> + <pathelement location="${commons.logging.jar}"/> + <pathelement location="${jasper-compiler.jar}"/> + <pathelement location="${jasper-runtime.jar}"/> + <pathelement location="${jetty.jar}"/> + <pathelement location="${junit.jar}"/> + <pathelement location="${htmlunit.jar}"/> + <@[EMAIL PROTECTED] location="${clover.jar}"/@clover.end@> + </path> + + <!-- + ======================================================================== + Initialize the build. Must be called by all targets + ======================================================================== + --> + <target name="init"> + + <condition property="properties.ok"> + <and> + <available file="${servlet.jar}"/> + </and> + </condition> + <fail unless="properties.ok">Missing property or property pointing to an invalid file +(check your build.properties file)</fail> + + <tstamp/> + + </target> + + <!-- + ======================================================================== + Compiles the sources + ======================================================================== + --> + <!-- Compiles the java sources --> + <target name="compile.java" depends="init"> + + <mkdir dir="${target.classes.java.dir}"/> + <javac destdir="${target.classes.java.dir}" + deprecation="${deprecation}" optimize="${optimize}"> + <src path="${src.java.dir}"/> + <classpath> + <path refid="project.classpath"/> + </classpath> + </javac> + + </target> + + <!-- Compiles the Cactus test sources --> + <target name="compile.cactus" depends="compile.java"> + + <mkdir dir="${target.classes.cactus.dir}"/> + <javac destdir="${target.classes.cactus.dir}" + deprecation="${deprecation}" optimize="${optimize}"> + <src path="${src.cactus.dir}"/> + <classpath> + <path refid="cactus.classpath"/> + <pathelement location="${httpunit.jar}"/> + <pathelement location="${target.classes.java.dir}"/> + </classpath> + </javac> + + </target> + + <target name="compile" depends="compile.java, compile.cactus" + description="Compile the sources"/> + + <!-- + ======================================================================== + Create the runtime war file + ======================================================================== + --> + <target name="war" depends="compile.java" + description="Generate the runtime war"> + + <war warfile="${target.dir}/${project.name.file}.war" + webxml="${src.webapp.dir}/WEB-INF/web.xml"> + <classes dir="${target.classes.java.dir}"/> + </war> + + </target> + + <!-- + ======================================================================== + Generate the distributable files + ======================================================================== + --> + <target name="dist" depends="clean, war, test" + description="Generate the distributable files"> + + <copy todir="${dist.dir}" + file="${target.dir}/${project.name.file}.war"/> + + </target> + + <!-- + ======================================================================== + Clean generated files (including distributables) + ======================================================================== + --> + <target name="clean" depends="init" description="Clean all generated files"> + + <delete dir="${target.dir}"/> + <delete dir="${dist.dir}"/> + + </target> + + <!-- + ======================================================================== + Run the tests on Jetty. + ======================================================================== + --> + <target name="test" depends="compile"> + + <mkdir dir="${target.testreports.dir}"/> + + <junit fork="yes" failureproperty="tests.failed"> + <sysproperty key="cactus.contextURL" + value="http://localhost:${cactus.port}/test"/> + <sysproperty key="cactus.jetty.resourceDir" file="${src.webapp.dir}"/> + <sysproperty key="cactus.jetty.config" file="${src.conf.dir}/jetty.xml"/> + <classpath> + <path refid="cactus.classpath"/> + <pathelement location="${target.classes.java.dir}"/> + <pathelement location="${target.classes.cactus.dir}"/> + <pathelement location="${tools.jar}"/> + </classpath> + <formatter type="brief" usefile="false"/> + <formatter type="xml"/> + <test todir="${target.testreports.dir}" + name="org.apache.cactus.sample.jetty.TestJettyAll"/> + </junit> + + <junitreport todir="${target.testreports.dir}"> + <fileset dir="${target.testreports.dir}" includes="TEST-*.xml"/> + <report todir="${target.testreports.dir}" format="frames"/> + </junitreport> + + <fail if="tests.failed">At least one test failed!</fail> + + </target> + +</project> Added: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/pom.xml URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/pom.xml?rev=617773&view=auto ============================================================================== --- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/pom.xml (added) +++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/pom.xml Sat Feb 2 01:04:04 2008 @@ -0,0 +1,100 @@ +<?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> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.cactus</groupId> + <artifactId>cactus.samples</artifactId> + <version>1.8.0-SNAPSHOT</version> + </parent> + <artifactId>cactus.samples.jetty</artifactId> + <name>Cactus Jetty Samples</name> + <description>Cactus Jetty Sample Projects</description> + <packaging>war</packaging> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + </dependency> + <dependency> + <groupId>org.apache.cactus</groupId> + <artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.6.2</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>httpunit</groupId> + <artifactId>httpunit</artifactId> + <version>1.6</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>taglibs</groupId> + <artifactId>standard</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>org.apache.ivy</groupId> + <artifactId>ivy</artifactId> + <version>2.0.0-beta1</version> + </dependency> + </dependencies> + <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> Added: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/cactus/org/apache/cactus/sample/jetty/TestJettyAll.java URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/cactus/org/apache/cactus/sample/jetty/TestJettyAll.java?rev=617773&view=auto ============================================================================== --- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/cactus/org/apache/cactus/sample/jetty/TestJettyAll.java (added) +++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/cactus/org/apache/cactus/sample/jetty/TestJettyAll.java Sat Feb 2 01:04:04 2008 @@ -0,0 +1,58 @@ +/* + * ======================================================================== + * + * Copyright 2001-2003 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. + * + * ======================================================================== + */ +package org.apache.cactus.sample.jetty; + +import org.apache.cactus.extension.jetty.JettyTestSetup; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Run all tests inside the Jetty container. + * + * @version $Id: TestJettyAll.java 238816 2004-02-29 16:36:46Z vmassol $ + */ +public class TestJettyAll extends TestCase +{ + /** + * @return a <code>JettyTestSetup</code> test suite that wraps all our + * tests so that Jetty will be started before the tests execute + */ + public static Test suite() + { + TestSuite suite = new TestSuite( + "Cactus unit tests executing in Jetty"); + + // Functional tests + suite.addTestSuite( + org.apache.cactus.sample.servlet.TestSampleServlet.class); + suite.addTestSuite( + org.apache.cactus.sample.servlet.TestSampleServletConfig.class); + suite.addTestSuite( + org.apache.cactus.sample.servlet.TestSampleTag.class); + suite.addTestSuite( + org.apache.cactus.sample.servlet.TestSampleBodyTag.class); + suite.addTestSuite( + org.apache.cactus.sample.servlet.TestSampleFilter.class); + + return new JettyTestSetup(suite); + } +} Added: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/resources/conf/jetty.xml URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/resources/conf/jetty.xml?rev=617773&view=auto ============================================================================== --- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/resources/conf/jetty.xml (added) +++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/resources/conf/jetty.xml Sat Feb 2 01:04:04 2008 @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE Configure + PUBLIC "-//Mort Bay Consulting//DTD Configure 1.1//EN" + "http://jetty.mortbay.org/configure_1_2.dtd"> + +<Configure class="org.mortbay.jetty.Server"> + + <Call name="getContext"> + <Arg>/test</Arg> + + <Call name="getWebApplicationHandler"> + <Call name="getServletHolder"> + <Arg>ServletRedirector</Arg> + <Call name="setInitParameter"> + <Arg>param1</Arg> + <Arg>value1 used for testing</Arg> + </Call> + </Call> + </Call> + + <Call name="getWebApplicationHandler"> + <Call name="getServletHolder"> + <Arg>JspRedirector</Arg> + <Call name="setInitParameter"> + <Arg>param1</Arg> + <Arg>value1 used for testing</Arg> + </Call> + </Call> + </Call> + + <Call name="getServletHandler"> + <Call name="newServletHolder"> + <Arg>TestJsp</Arg> + <Arg>org.apache.jasper.servlet.JspServlet</Arg> + <Arg>/test/test.jsp</Arg> + </Call> + </Call> + + <Call name="addServlet"> + <Arg>/ServletRedirectorOverride</Arg> + <Arg>org.apache.cactus.server.ServletTestRedirector</Arg> + <Call name="setInitParameter"> + <Arg>param2</Arg> + <Arg>value2 used for testing</Arg> + </Call> + </Call> + + <Call name="addServlet"> + <Arg>/ServletRedirectorSecure</Arg> + <Arg>org.apache.cactus.server.ServletTestRedirector</Arg> + </Call> + + <Call name="setRealm"> + <Arg> + <New class="org.mortbay.http.HashUserRealm"/> + </Arg> + </Call> + + <Call name="getRealm"> + <Call name="put"> + <Arg>testuser</Arg> + <Arg>testpassword</Arg> + </Call> + <Call name="addUserToRole"> + <Arg>testuser</Arg> + <Arg>test</Arg> + </Call> + </Call> + </Call> +</Configure> + + + \ No newline at end of file Added: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/webapp/WEB-INF/web.xml?rev=617773&view=auto ============================================================================== --- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/webapp/WEB-INF/web.xml (added) +++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/webapp/WEB-INF/web.xml Sat Feb 2 01:04:04 2008 @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE web-app + PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" + "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd"> + +<web-app> + + <security-constraint> + <web-resource-collection> + <web-resource-name>SecurityRestriction</web-resource-name> + <description>Protect the Cactus redirector servlet.</description> + <url-pattern>/ServletRedirectorSecure</url-pattern> + <http-method>GET</http-method> + <http-method>POST</http-method> + </web-resource-collection> + <auth-constraint> + <description>Authorized Users Group</description> + <role-name>test</role-name> + </auth-constraint> + <user-data-constraint> + <transport-guarantee>NONE</transport-guarantee> + </user-data-constraint> + </security-constraint> + + <login-config> + <auth-method>BASIC</auth-method> + <realm-name>Sample Cactus Servlet Application</realm-name> + </login-config> + + <security-role> + <description>Test role</description> + <role-name>test</role-name> + </security-role> + +</web-app> Added: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/webapp/test/test.jsp URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/webapp/test/test.jsp?rev=617773&view=auto ============================================================================== --- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/webapp/test/test.jsp (added) +++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/jetty/src/main/webapp/test/test.jsp Sat Feb 2 01:04:04 2008 @@ -0,0 +1,7 @@ +<%-- Test JSP used by the TestServletTestCase test class to test --%> +<%-- RequestDispatcher call. --%> +<html> + <body> + Hello ! + </body> +</html> \ No newline at end of file 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=617773&r1=617772&r2=617773&view=diff ============================================================================== --- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml (original) +++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml Sat Feb 2 01:04:04 2008 @@ -41,6 +41,7 @@ <modules> <module>servlet</module> <module>ejb</module> + <module>jetty</module> </modules> </profile> </profiles> Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/servlet/pom.xml URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/servlet/pom.xml?rev=617773&r1=617772&r2=617773&view=diff ============================================================================== --- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/servlet/pom.xml (original) +++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/servlet/pom.xml Sat Feb 2 01:04:04 2008 @@ -25,7 +25,7 @@ <version>1.8.0-SNAPSHOT</version> </parent> <artifactId>cactus.samples.servlet</artifactId> - <name>Cactus Servlet Samples - Parent Project</name> + <name>Cactus Servlet Samples</name> <description>Cactus Servlet Sample Projects</description> <packaging>war</packaging> <dependencies> @@ -70,10 +70,6 @@ <version>2.0.0-beta1</version> </dependency> </dependencies> - <properties> - <container.id>tomcat5x</container.id> - <container.home>/home/peter/bin/apache/jakarta-tomcat-5.0.28/</container.home> - </properties> <build> <plugins> <plugin> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]