Author: ptahchiev
Date: Sun Jan 18 08:01:08 2009
New Revision: 735479
URL: http://svn.apache.org/viewvc?rev=735479&view=rev
Log:
Changes to include the servlet samles jar and also a README file added.
Added:
jakarta/cactus/trunk/samples/jetty/README (with props)
Modified:
jakarta/cactus/trunk/samples/jetty/build.xml
jakarta/cactus/trunk/samples/jetty/ivy.xml
jakarta/cactus/trunk/samples/jetty/pom.xml
jakarta/cactus/trunk/samples/jetty/src/main/java/org/apache/cactus/sample/jetty/TestJettyAll.java
Added: jakarta/cactus/trunk/samples/jetty/README
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/jetty/README?rev=735479&view=auto
==============================================================================
--- jakarta/cactus/trunk/samples/jetty/README (added)
+++ jakarta/cactus/trunk/samples/jetty/README Sun Jan 18 08:01:08 2009
@@ -0,0 +1,4 @@
+To run this example application you need first compiled
+and executed the servlet application. This is because we
+use the servlet application test-cases to run them here
+with Jetty!
\ No newline at end of file
Propchange: jakarta/cactus/trunk/samples/jetty/README
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/cactus/trunk/samples/jetty/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/jetty/build.xml?rev=735479&r1=735478&r2=735479&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/jetty/build.xml (original)
+++ jakarta/cactus/trunk/samples/jetty/build.xml Sun Jan 18 08:01:08 2009
@@ -68,7 +68,7 @@
<include name="*.jar"/>
</fileset>
<dirset dir="../servlet/target/">
- <include name="classes"/>
+ <include name="test-classes"/>
</dirset>
</path>
Modified: jakarta/cactus/trunk/samples/jetty/ivy.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/jetty/ivy.xml?rev=735479&r1=735478&r2=735479&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/jetty/ivy.xml (original)
+++ jakarta/cactus/trunk/samples/jetty/ivy.xml Sun Jan 18 08:01:08 2009
@@ -18,7 +18,7 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="apache" module="hello-ivy"/>
+ <info organisation="apache" module="cactus-samples-jetty-ivy"/>
<dependencies>
<dependency org="org.apache.cactus"
name="cactus.core.framework.uberjar.javaEE.14" rev="${cactus.version}"/>
Modified: jakarta/cactus/trunk/samples/jetty/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/jetty/pom.xml?rev=735479&r1=735478&r2=735479&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/jetty/pom.xml (original)
+++ jakarta/cactus/trunk/samples/jetty/pom.xml Sun Jan 18 08:01:08 2009
@@ -64,7 +64,12 @@
<artifactId>cactus.samples.servlet</artifactId>
<version>${version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.cactus</groupId>
+ <artifactId>cactus.samples.servlet</artifactId>
+ <version>${version}</version>
+ <type>test-jar</type>
+ </dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
Modified:
jakarta/cactus/trunk/samples/jetty/src/main/java/org/apache/cactus/sample/jetty/TestJettyAll.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/jetty/src/main/java/org/apache/cactus/sample/jetty/TestJettyAll.java?rev=735479&r1=735478&r2=735479&view=diff
==============================================================================
---
jakarta/cactus/trunk/samples/jetty/src/main/java/org/apache/cactus/sample/jetty/TestJettyAll.java
(original)
+++
jakarta/cactus/trunk/samples/jetty/src/main/java/org/apache/cactus/sample/jetty/TestJettyAll.java
Sun Jan 18 08:01:08 2009
@@ -43,14 +43,14 @@
"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.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);
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: cactus-dev-h...@jakarta.apache.org
