vmassol 2004/05/11 13:41:09
Modified: . Tag: CACTUS_16_BRANCH build-common.xml
default-project.xml
documentation/docs/xdocs Tag: CACTUS_16_BRANCH changes.xml
sitemap.xml
framework Tag: CACTUS_16_BRANCH build.properties.sample
build.xml
framework/src/java/share/org/apache/cactus/server/runner
Tag: CACTUS_16_BRANCH ServletTestRunner.java
framework/src/test/share/org/apache/cactus Tag:
CACTUS_16_BRANCH TestAll.java
integration/maven Tag: CACTUS_16_BRANCH project.xml
Added: documentation/src/java/org/apache/cactus/build/documentation
Tag: CACTUS_16_BRANCH CheckSitemapTask.java
framework/src/test/share/org/apache/cactus/server/runner
Tag: CACTUS_16_BRANCH TestServletTestRunner.java
scratchpad/cactus2/framework/src/test/org/apache/cactus/framework/internal/orchestrator
Tag: CACTUS_16_BRANCH OrchestratorClientTest.java
Log:
merge changes from head and prepare for 1.6.1 release
Revision Changes Path
No revision
No revision
1.40.2.1 +3 -3 jakarta-cactus/build-common.xml
Index: build-common.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/build-common.xml,v
retrieving revision 1.40
retrieving revision 1.40.2.1
diff -u -r1.40 -r1.40.2.1
--- build-common.xml 8 May 2004 18:04:18 -0000 1.40
+++ build-common.xml 11 May 2004 20:41:08 -0000 1.40.2.1
@@ -27,7 +27,7 @@
<property name="project.version.major" value="1"/>
<property name="project.version.minor" value="6"/>
- <property name="project.version.suffix" value=""/>
+ <property name="project.version.suffix" value=".1"/>
<property name="project.version.suffix.timestamp" value=""/>
<property name="project.version"
@@ -39,7 +39,7 @@
be displayed on the web site. -->
<property name="project.doc.version"
value="${project.version.major}.${project.version.minor}${project.version.suffix}"/>
- <property name="project.doc.version.previous" value="1.5"/>
+ <property name="project.doc.version.previous" value="1.7dev"/>
<!-- Prefix to add to all distributable files -->
<property name="project.prefix" value="jakarta"/>
1.12.2.1 +7 -2 jakarta-cactus/default-project.xml
Index: default-project.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/default-project.xml,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- default-project.xml 8 May 2004 18:40:17 -0000 1.12
+++ default-project.xml 11 May 2004 20:41:08 -0000 1.12.2.1
@@ -4,7 +4,7 @@
<name>Jakarta Cactus</name>
<groupId>cactus</groupId>
<id>jakarta-cactus</id>
- <currentVersion>1.6</currentVersion>
+ <currentVersion>1.6.1</currentVersion>
<organization>
<name>Apache Software Foundation</name>
<url>http://jakarta.apache.org/</url>
@@ -61,7 +61,12 @@
<version>
<id>1.6</id>
<name>1.6</name>
- <tag>CACTUS_15_RELEASE</tag>
+ <tag>CACTUS_16_RELEASE</tag>
+ </version>
+ <version>
+ <id>1.6.1</id>
+ <name>1.6.1</name>
+ <tag>CACTUS_161_RELEASE</tag>
</version>
</versions>
No revision
No revision
1.186.2.1 +9 -0 jakarta-cactus/documentation/docs/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/changes.xml,v
retrieving revision 1.186
retrieving revision 1.186.2.1
diff -u -r1.186 -r1.186.2.1
--- changes.xml 8 May 2004 17:32:28 -0000 1.186
+++ changes.xml 11 May 2004 20:41:08 -0000 1.186.2.1
@@ -89,6 +89,15 @@
<person name="Julien Ruaux" email="[EMAIL PROTECTED]" id="JRU"/>
</devs>
+ <release version="1.6.1" date="14 May 2004">
+ <action dev="VMA" type="fix" fixes-bug="CACTUS-107">
+ An error was introduced in the Servlet Test Runner during the
+ internal package refactoring that happened in Cactus 1.6. The
+ <code>XMLTransformer</code> could not be loaded and it resulted
+ in a <code>ClassNotFoundException</code> exception.
+ </action>
+ </release>
+
<release version="1.6" date="08 May 2004">
<action dev="VMA" type="update">
The <code>ServletTestRunner</code> now looks for am optional
1.81.2.1 +3 -3 jakarta-cactus/documentation/docs/xdocs/sitemap.xml
Index: sitemap.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/sitemap.xml,v
retrieving revision 1.81
retrieving revision 1.81.2.1
diff -u -r1.81 -r1.81.2.1
--- sitemap.xml 8 May 2004 19:52:04 -0000 1.81
+++ sitemap.xml 11 May 2004 20:41:08 -0000 1.81.2.1
@@ -488,9 +488,9 @@
<external id="httpunit" url="http://httpunit.sourceforge.net/"/>
<!-- ATM, the maven web site is generated separately. -->
- <external id="integration_maven"
url="http://jakarta.apache.org/cactus/1.6/integration/maven/index.html"/>
- <external id="integration_maven_changes"
url="http://jakarta.apache.org/cactus/1.6/integration/maven/changes-report.html"/>
- <external id="integration_maven_installing"
url="http://jakarta.apache.org/cactus/1.6/integration/maven/installing.html"/>
+ <external id="integration_maven"
url="http://jakarta.apache.org/cactus/1.6.1/integration/maven/index.html"/>
+ <external id="integration_maven_changes"
url="http://jakarta.apache.org/cactus/1.6.1/integration/maven/changes-report.html"/>
+ <external id="integration_maven_installing"
url="http://jakarta.apache.org/cactus/1.6.1/integration/maven/installing.html"/>
<external id="jakarta" url="http://jakarta.apache.org/"/>
<external id="jakarta_roles" url="http://jakarta.apache.org/site/roles.html"/>
No revision
No revision
1.36.2.1 +4 -1 jakarta-cactus/framework/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/build.properties.sample,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -u -r1.36 -r1.36.2.1
--- build.properties.sample 12 Apr 2004 10:48:30 -0000 1.36
+++ build.properties.sample 11 May 2004 20:41:08 -0000 1.36.2.1
@@ -39,6 +39,9 @@
# The location of the Httpunit jar
httpunit.jar = ${lib.repo}/httpunit/jars/httpunit-1.5.4.jar
+# The location of the MockObjects jar (needed for our unit tests)
+mockobjects.jar = ${lib.repo}/mockobjects/jars/mockobjects-core-0.09.jar
+
# -----------------------------------------------------------------------------
# Optional properties
# -----------------------------------------------------------------------------
1.82.2.1 +8 -3 jakarta-cactus/framework/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/build.xml,v
retrieving revision 1.82
retrieving revision 1.82.2.1
diff -u -r1.82 -r1.82.2.1
--- build.xml 10 Apr 2004 16:10:43 -0000 1.82
+++ build.xml 11 May 2004 20:41:08 -0000 1.82.2.1
@@ -99,6 +99,7 @@
<echo> httpunit.jar = [${httpunit.jar}]</echo>
<echo> j2ee.jar = [${j2ee.jar}]</echo>
<echo> junit.jar = [${junit.jar}]</echo>
+ <echo> mockobjects.jar = [${mockobjects.jar}]</echo>
<echo> log4j.jar (optional) = [${log4j.jar}]</echo>
<echo> xmlapis.jar (optional) = [${xmlapis.jar}]</echo>
<echo/>
@@ -124,6 +125,7 @@
<available file="${httpunit.jar}"/>
<available file="${j2ee.jar}"/>
<available file="${junit.jar}"/>
+ <available file="${mockobjects.jar}"/>
<!-- Check for a TraX class instead of the xmlapis.jar file so that
the build works on JDK 1.4 without needing to define the
xmlapis.jar property -->
@@ -209,8 +211,9 @@
optimize="${optimize}">
<src path="${src.test.share.dir}"/>
<classpath>
- <path path="${target.classes.java.dir}"/>
- <path refid="project.classpath"/>
+ <path path="${target.classes.java.dir}"/>
+ <path refid="project.classpath"/>
+ <pathelement location="${mockobjects.jar}"/>
</classpath>
</javac>
@@ -404,6 +407,7 @@
<pathelement path="${target.classes.test.dir}"/>
<pathelement location="${clover.jar}"/>
<pathelement location="${log4j.jar}"/>
+ <pathelement location="${mockobjects.jar}"/>
<path refid="project.classpath"/>
</path>
@@ -416,6 +420,7 @@
<pathelement path="${target.classes.java.dir}"/>
<pathelement path="${target.classes.test.dir}"/>
<pathelement location="${log4j.jar}"/>
+ <pathelement location="${mockobjects.jar}"/>
<path refid="project.classpath"/>
</path>
No revision
No revision
1.20.2.1 +3 -3
jakarta-cactus/framework/src/java/share/org/apache/cactus/server/runner/ServletTestRunner.java
Index: ServletTestRunner.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/server/runner/ServletTestRunner.java,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -r1.20 -r1.20.2.1
--- ServletTestRunner.java 14 Apr 2004 06:55:34 -0000 1.20
+++ ServletTestRunner.java 11 May 2004 20:41:08 -0000 1.20.2.1
@@ -130,8 +130,8 @@
{
try
{
- Class transformerClass = Class.forName(
- "org.apache.cactus.server.runner.XMLTransformer");
+ Class transformerClass = Class.forName("org.apache.cactus."
+ + "internal.server.runner.XMLTransformer");
Constructor transformerCtor =
transformerClass.getConstructor(
new Class[] {InputStream.class});
No revision
No revision
1.22.2.1 +5 -2
jakarta-cactus/framework/src/test/share/org/apache/cactus/TestAll.java
Index: TestAll.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/framework/src/test/share/org/apache/cactus/TestAll.java,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -r1.22 -r1.22.2.1
--- TestAll.java 10 Apr 2004 18:18:58 -0000 1.22
+++ TestAll.java 11 May 2004 20:41:08 -0000 1.22.2.1
@@ -30,6 +30,7 @@
import org.apache.cactus.internal.util.TestStringUtil;
import org.apache.cactus.internal.util.TestTestCaseImplementChecker;
import org.apache.cactus.internal.util.TestUniqueGenerator;
+import org.apache.cactus.server.runner.TestServletTestRunner;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -76,7 +77,9 @@
suite.addTestSuite(TestStringUtil.class);
suite.addTestSuite(TestTestCaseImplementChecker.class);
suite.addTestSuite(TestUniqueGenerator.class);
-
+
+ suite.addTestSuite(TestServletTestRunner.class);
+
return suite;
}
}
No revision
No revision
1.14.2.1 +2 -2 jakarta-cactus/integration/maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/project.xml,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- project.xml 8 May 2004 19:48:26 -0000 1.14
+++ project.xml 11 May 2004 20:41:08 -0000 1.14.2.1
@@ -7,7 +7,7 @@
<!-- Note: Although we inherit from default-project.xml, we still cannot
remove the <currentVersion> tag as this project.xml is parsed at
runtime whenever our plugin is called. -->
- <currentVersion>1.6</currentVersion>
+ <currentVersion>1.6.1</currentVersion>
<name>Maven Cactus plugin</name>
<package>org.apache.cactus.integration.maven</package>
@@ -15,7 +15,7 @@
<shortDescription>Maven plugin for Cactus</shortDescription>
<url>http://jakarta.apache.org/cactus/integration/maven/</url>
<siteAddress>cvs.apache.org</siteAddress>
-
<siteDirectory>/www/jakarta.apache.org/cactus/1.6/integration/maven/</siteDirectory>
+ <siteDirectory>/www/jakarta.apache.org/cactus/integration/maven/</siteDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-cactus/integration/maven/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-cactus/integration/maven</url>
No revision
No revision
1.3.2.1 +1 -1
jakarta-cactus/documentation/src/java/org/apache/cactus/build/documentation/CheckSitemapTask.java
Index: CheckSitemapTask.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/documentation/src/java/org/apache/cactus/build/documentation/CheckSitemapTask.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
No revision
No revision
1.1.2.1 +1 -1
jakarta-cactus/framework/src/test/share/org/apache/cactus/server/runner/TestServletTestRunner.java
Index: TestServletTestRunner.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/framework/src/test/share/org/apache/cactus/server/runner/TestServletTestRunner.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.2.2.1 +0 -0
jakarta-cactus/scratchpad/cactus2/framework/src/test/org/apache/cactus/framework/internal/orchestrator/OrchestratorClientTest.java
Index: OrchestratorClientTest.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/scratchpad/cactus2/framework/src/test/org/apache/cactus/framework/internal/orchestrator/OrchestratorClientTest.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
