Author: ptahchiev
Date: Fri Apr 4 15:42:11 2008
New Revision: 644976
URL: http://svn.apache.org/viewvc?rev=644976&view=rev
Log:
Ivy files created for every separate sub-sample. Also the dependency updated
and the cactus tests moved to the java folder.
Added:
jakarta/cactus/trunk/samples/ejb/ivy.xml (with props)
jakarta/cactus/trunk/samples/jetty/ivy.xml (with props)
jakarta/cactus/trunk/samples/servlet/ivy.xml (with props)
Removed:
jakarta/cactus/trunk/samples/ivy.xml
jakarta/cactus/trunk/samples/servlet/src/main/cactus/
Modified:
jakarta/cactus/trunk/samples/build.properties
jakarta/cactus/trunk/samples/ejb/build.xml
jakarta/cactus/trunk/samples/ejb/pom.xml
jakarta/cactus/trunk/samples/jetty/build.xml
jakarta/cactus/trunk/samples/jetty/pom.xml
jakarta/cactus/trunk/samples/jetty/src/main/java/org/apache/cactus/sample/jetty/TestJettyAll.java
jakarta/cactus/trunk/samples/pom.xml
jakarta/cactus/trunk/samples/servlet/build.xml
jakarta/cactus/trunk/samples/servlet/pom.xml
Modified: jakarta/cactus/trunk/samples/build.properties
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/build.properties?rev=644976&r1=644975&r2=644976&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/build.properties (original)
+++ jakarta/cactus/trunk/samples/build.properties Fri Apr 4 15:42:11 2008
@@ -1,3 +1,28 @@
+<!--
+ 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.
+-->
+
+#Cactus general properties:
+#If you call from maven this property will be
+#set to the pom.version. This works like a charm
+#because Ant properties are immutable.
+cactus.version=1.8.0
+
#Here comes the directory properties.
basedir=.
target.dir=${basedir}/target
@@ -10,9 +35,6 @@
src.webapp.dir=${basedir}/src/main/webapp
src.conf.dir=${basedir}/src/main/resources/conf/
-
-#Project Specific Settings
-#cactus.samples.servlet-1.8.0-SNAPSHOT.war
servlet.project.name=samples-servlet-1.8.0-SNAPSHOT
ejb.project.name=samples-ejb-1.8.0-SNAPSHOT
Modified: jakarta/cactus/trunk/samples/ejb/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb/build.xml?rev=644976&r1=644975&r2=644976&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/ejb/build.xml (original)
+++ jakarta/cactus/trunk/samples/ejb/build.xml Fri Apr 4 15:42:11 2008
@@ -87,7 +87,7 @@
-->
<target name="resolve" description="Retrieve dependencies with ivy"
depends="prepare">
<ivy:configure file="../ivysettings.xml" />
- <ivy:retrieve file="../ivy.xml" sync="true"/>
+ <ivy:retrieve file="./ivy.xml" sync="true"/>
</target>
<!--
Added: jakarta/cactus/trunk/samples/ejb/ivy.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb/ivy.xml?rev=644976&view=auto
==============================================================================
--- jakarta/cactus/trunk/samples/ejb/ivy.xml (added)
+++ jakarta/cactus/trunk/samples/ejb/ivy.xml Fri Apr 4 15:42:11 2008
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<ivy-module version="2.0">
+ <info organisation="apache" module="hello-ivy"/>
+
+ <dependencies>
+ <dependency org="org.apache.cactus"
name="cactus.core.framework.uberjar.javaEE.14" rev="${cactus.version}"/>
+ <dependency org="org.apache.cactus"
name="cactus.integration.ant" rev="${cactus.version}"/>
+ <dependency org="org.apache.cactus"
name="cactus.integration.shared.api" rev="${cactus.version}"/>
+
+ <dependency org="commons-httpclient" name="commons-httpclient"
rev="3.1"/>
+ <dependency org="commons-logging" name="commons-logging"
rev="1.1"/>
+ <dependency org="commons-codec" name="commons-codec" rev="1.3"/>
+ <dependency org="aspectj" name="aspectjrt" rev="1.5.3"/>
+ <dependency org="org.codehaus.cargo" name="cargo-core-uberjar"
rev="0.9"/>
+ <dependency org="org.codehaus.cargo" name="cargo-ant"
rev="0.9"/>
+ <dependency org="xerces" name="xercesImpl" rev="2.6.2"/>
+
+ <dependency org="javax.servlet" name="jsp-api" rev="2.0"/>
+ <dependency org="javax.servlet" name="servlet-api" rev="2.5"/>
+ <dependency org="javax.servlet" name="jstl" rev="1.1.2"/>
+ <dependency org="geronimo-spec" name="geronimo-spec-ejb"
rev="2.1-rc4"/>
+ </dependencies>
+</ivy-module>
Propchange: jakarta/cactus/trunk/samples/ejb/ivy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/cactus/trunk/samples/ejb/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb/pom.xml?rev=644976&r1=644975&r2=644976&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/ejb/pom.xml (original)
+++ jakarta/cactus/trunk/samples/ejb/pom.xml Fri Apr 4 15:42:11 2008
@@ -30,16 +30,51 @@
<packaging>jar</packaging>
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <groupId>org.apache.cactus</groupId>
+
<artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.cactus</groupId>
-
<artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId>
+ <artifactId>cactus.integration.ant</artifactId>
<version>${version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.cactus</groupId>
+ <artifactId>cactus.integration.shared.api</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-ant</artifactId>
+ <version>0.9</version>
+ </dependency>
+ <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.6.2</version>
@@ -50,9 +85,9 @@
<version>2.0</version>
</dependency>
<dependency>
- <groupId>httpunit</groupId>
- <artifactId>httpunit</artifactId>
- <version>1.6</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -69,11 +104,12 @@
<artifactId>ivy</artifactId>
<version>2.0.0-beta1</version>
</dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-ejb</artifactId>
+ <version>2.1-rc4</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>
@@ -100,7 +136,9 @@
<phase>test</phase>
<configuration>
<tasks>
- <ant
antfile="build.xml"/>
+ <ant
antfile="build.xml">
+
<property name="cactus.version" value="${pom.version}"/>
+
</ant>
</tasks>
</configuration>
<goals>
Modified: jakarta/cactus/trunk/samples/jetty/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/jetty/build.xml?rev=644976&r1=644975&r2=644976&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/jetty/build.xml (original)
+++ jakarta/cactus/trunk/samples/jetty/build.xml Fri Apr 4 15:42:11 2008
@@ -92,7 +92,7 @@
-->
<target name="resolve" description="Retrieve dependencies with ivy"
depends="prepare">
<ivy:configure file="../ivysettings.xml" />
- <ivy:retrieve file="../ivy.xml" sync="true"/>
+ <ivy:retrieve file="./ivy.xml" sync="true"/>
</target>
<!--
@@ -120,13 +120,6 @@
<javac srcdir="${src.dir}"
destdir="${build.dir}"
classpathref="cactus.classpath"/>
-
- <javac srcdir="${cactus.src.dir}"
- destdir="${build.dir}"
- classpathref="cactus.classpath"/>
- <javac srcdir="${src.webapp.dir}"
- destdir="${build.dir}"
- classpathref="cactus.classpath"/>
</target>
<!--
Added: jakarta/cactus/trunk/samples/jetty/ivy.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/jetty/ivy.xml?rev=644976&view=auto
==============================================================================
--- jakarta/cactus/trunk/samples/jetty/ivy.xml (added)
+++ jakarta/cactus/trunk/samples/jetty/ivy.xml Fri Apr 4 15:42:11 2008
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<ivy-module version="2.0">
+ <info organisation="apache" module="hello-ivy"/>
+
+ <dependencies>
+ <dependency org="org.apache.cactus"
name="cactus.core.framework.uberjar.javaEE.14" rev="${cactus.version}"/>
+ <dependency org="org.apache.cactus"
name="cactus.integration.ant" rev="${cactus.version}"/>
+ <dependency org="org.apache.cactus"
name="cactus.integration.shared.api" rev="${cactus.version}"/>
+ <dependency org="org.apache.cactus"
name="cactus.samples.servlet" rev="${cactus.version}"/>
+
+ <dependency org="commons-httpclient" name="commons-httpclient"
rev="3.1"/>
+ <dependency org="commons-logging" name="commons-logging"
rev="1.1"/>
+ <dependency org="commons-el" name="commons-el" rev="1.0"/>
+ <dependency org="commons-codec" name="commons-codec" rev="1.3"/>
+
+ <dependency org="aspectj" name="aspectjrt" rev="1.5.3"/>
+
+ <dependency org="org.codehaus.cargo" name="cargo-core-uberjar"
rev="0.9"/>
+ <dependency org="org.codehaus.cargo" name="cargo-ant"
rev="0.9"/>
+
+ <dependency org="javax.servlet" name="jsp-api" rev="2.0"/>
+ <dependency org="javax.servlet" name="servlet-api" rev="2.5"/>
+ <dependency org="javax.servlet" name="jstl" rev="1.1.2"/>
+ <dependency org="taglibs" name="standard" rev="1.1.2"/>
+
+ <dependency org="org.mortbay.jetty" name="org.mortbay.jetty"
rev="5.1.9"/>
+ <dependency org="tomcat" name="jasper-compiler" rev="5.5.9"/>
+ <dependency org="tomcat" name="jasper-runtime" rev="5.5.9"/>
+ </dependencies>
+</ivy-module>
Propchange: jakarta/cactus/trunk/samples/jetty/ivy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/cactus/trunk/samples/jetty/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/jetty/pom.xml?rev=644976&r1=644975&r2=644976&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/jetty/pom.xml (original)
+++ jakarta/cactus/trunk/samples/jetty/pom.xml Fri Apr 4 15:42:11 2008
@@ -27,64 +27,101 @@
<artifactId>cactus.samples.jetty</artifactId>
<name>Cactus Jetty Samples</name>
<description>Cactus Jetty Sample Projects</description>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-junit</artifactId>
<version>1.6.5</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ivy</groupId>
+ <artifactId>ivy</artifactId>
+ <version>2.0.0-beta1</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <groupId>org.apache.cactus</groupId>
+
<artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.cactus</groupId>
-
<artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId>
+ <artifactId>cactus.integration.ant</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cactus</groupId>
+ <artifactId>cactus.integration.shared.api</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.cactus</groupId>
<artifactId>cactus.samples.servlet</artifactId>
- <type>war</type>
<version>${version}</version>
</dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.6.2</version>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-ant</artifactId>
+ <version>0.9</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>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</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>
+
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>org.mortbay.jetty</artifactId>
@@ -93,12 +130,12 @@
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
- <version>4.1.30</version>
+ <version>5.5.9</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
- <version>4.1.30</version>
+ <version>5.5.9</version>
</dependency>
</dependencies>
<build>
@@ -127,7 +164,9 @@
<phase>test</phase>
<configuration>
<tasks>
- <ant
antfile="build.xml"/>
+ <ant
antfile="build.xml">
+
<property name="cactus.version" value="${pom.version}"/>
+ </ant>
</tasks>
</configuration>
<goals>
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=644976&r1=644975&r2=644976&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
Fri Apr 4 15:42:11 2008
@@ -20,7 +20,7 @@
*/
package org.apache.cactus.sample.jetty;
-import org.apache.cactus.extension.jetty.JettyTestSetup;
+import org.apache.cactus.extension.jetty.Jetty5xTestSetup;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -54,6 +54,6 @@
suite.addTestSuite(
org.apache.cactus.sample.servlet.TestSampleFilter.class);
- return new JettyTestSetup(suite);
+ return new Jetty5xTestSetup(suite);
}
}
Modified: jakarta/cactus/trunk/samples/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/pom.xml?rev=644976&r1=644975&r2=644976&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/pom.xml (original)
+++ jakarta/cactus/trunk/samples/pom.xml Fri Apr 4 15:42:11 2008
@@ -29,15 +29,96 @@
<description>Cactus Sample Projects</description>
<packaging>pom</packaging>
<dependencies>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-ejb</artifactId>
- <version>2.1-rc4</version>
+ <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>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>1.14</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>
+ <!-- Required by HtmlUnit -->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>5.5.9</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>5.5.9</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>org.mortbay.jetty</artifactId>
- <version>5.1.9</version>
+ <groupId>org.apache.ivy</groupId>
+ <artifactId>ivy</artifactId>
+ <version>2.0.0-beta1</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>1.6.5</version>
</dependency>
</dependencies>
<profiles>
Modified: jakarta/cactus/trunk/samples/servlet/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/servlet/build.xml?rev=644976&r1=644975&r2=644976&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/servlet/build.xml (original)
+++ jakarta/cactus/trunk/samples/servlet/build.xml Fri Apr 4 15:42:11 2008
@@ -86,7 +86,7 @@
-->
<target name="resolve" description="Retrieve dependencies with ivy"
depends="prepare">
<ivy:configure file="../ivysettings.xml" />
- <ivy:retrieve file="../ivy.xml" sync="true"/>
+ <ivy:retrieve file="./ivy.xml" sync="true"/>
</target>
<!--
@@ -113,9 +113,6 @@
destdir="${build.dir}"
classpathref="cactus.classpath"/>
- <javac srcdir="${cactus.src.dir}"
- destdir="${build.dir}"
- classpathref="cactus.classpath"/>
</target>
<!--
@@ -210,7 +207,7 @@
<sysproperty key="prop2" value="value2"/>
<formatter type="${cactus.formatter.type}"/>
<batchtest todir="${reports.dir}">
- <fileset dir="${cactus.src.dir}">
+ <fileset dir="${src.dir}">
<include name="**/Test*.java"/>
</fileset>
</batchtest>
Added: jakarta/cactus/trunk/samples/servlet/ivy.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/servlet/ivy.xml?rev=644976&view=auto
==============================================================================
--- jakarta/cactus/trunk/samples/servlet/ivy.xml (added)
+++ jakarta/cactus/trunk/samples/servlet/ivy.xml Fri Apr 4 15:42:11 2008
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<ivy-module version="2.0">
+ <info organisation="apache" module="hello-ivy"/>
+
+ <dependencies>
+ <dependency org="org.apache.cactus"
name="cactus.core.framework.uberjar.javaEE.14" rev="${cactus.version}"/>
+ <dependency org="org.apache.cactus"
name="cactus.integration.ant" rev="${cactus.version}"/>
+ <dependency org="org.apache.cactus"
name="cactus.integration.shared.api" rev="${cactus.version}"/>
+
+ <dependency org="commons-httpclient" name="commons-httpclient"
rev="3.1"/>
+ <dependency org="commons-logging" name="commons-logging"
rev="1.1"/>
+ <dependency org="commons-io" name="commons-io" rev="1.4"/>
+ <dependency org="commons-lang" name="commons-lang" rev="2.3"/>
+ <dependency org="commons-codec" name="commons-codec" rev="1.3"/>
+
+ <dependency org="ant" name="ant" rev="1.6.5"/>
+ <dependency org="xerces" name="xercesImpl" rev="2.6.2"/>
+ <dependency org="junit" name="junit" rev="3.8.2"/>
+
+ <dependency org="httpunit" name="httpunit" rev="1.6"/>
+ <dependency org="htmlunit" name="htmlunit" rev="1.10"/>
+
+ <dependency org="aspectj" name="aspectjrt" rev="1.5.3"/>
+ <dependency org="org.codehaus.cargo" name="cargo-core-uberjar"
rev="0.9"/>
+ <dependency org="org.codehaus.cargo" name="cargo-ant"
rev="0.9"/>
+
+ <dependency org="javax.servlet" name="jsp-api" rev="2.0"/>
+ <dependency org="javax.servlet" name="servlet-api" rev="2.5"/>
+ <dependency org="javax.servlet" name="jstl" rev="1.1.2"/>
+ <dependency org="taglibs" name="standard" rev="1.1.2"/>
+
+ <dependency org="junitperf" name="junitperf" rev="1.8"/>
+ </dependencies>
+</ivy-module>
Propchange: jakarta/cactus/trunk/samples/servlet/ivy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/cactus/trunk/samples/servlet/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/servlet/pom.xml?rev=644976&r1=644975&r2=644976&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/servlet/pom.xml (original)
+++ jakarta/cactus/trunk/samples/servlet/pom.xml Fri Apr 4 15:42:11 2008
@@ -27,23 +27,81 @@
<artifactId>cactus.samples.servlet</artifactId>
<name>Cactus Servlet Samples</name>
<description>Cactus Servlet Sample Projects</description>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <groupId>org.apache.cactus</groupId>
+
<artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.cactus</groupId>
-
<artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId>
+ <artifactId>cactus.integration.ant</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cactus</groupId>
+ <artifactId>cactus.integration.shared.api</artifactId>
<version>${version}</version>
</dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-ant</artifactId>
+ <version>0.9</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ivy</groupId>
+ <artifactId>ivy</artifactId>
+ <version>2.0.0-beta1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.6.2</version>
</dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
@@ -57,55 +115,31 @@
<dependency>
<groupId>htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>1.14</version>
+ <version>1.10</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>
- <!-- Required by HtmlUnit -->
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
</dependency>
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>5.5.9</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
</dependency>
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>5.5.9</version>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -124,7 +158,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
+ <version>3.8.2</version>
</dependency>
</dependencies>
<executions>
@@ -132,7 +166,9 @@
<phase>test</phase>
<configuration>
<tasks>
- <ant
antfile="build.xml"/>
+ <ant
antfile="build.xml">
+
<property name="cactus.version" value="${pom.version}"/>
+ </ant>
</tasks>
</configuration>
<goals>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
