vmassol 2003/08/29 10:27:58
Modified: integration/ant/src/test/org/apache/cactus/integration/ant/container
Tag: CACTUS_15_BRANCH TestAll.java
integration/ant/src/java/org/apache/cactus/integration/ant/container
Tag: CACTUS_15_BRANCH AbstractContainer.java
documentation/docs/xdocs Tag: CACTUS_15_BRANCH changes.xml
Added: integration/ant/src/test/org/apache/cactus/integration/ant/container
Tag: CACTUS_15_BRANCH TestAbstractContainer.java
Log:
Merged from CVS HEAD
Revision Changes Path
No revision
No revision
1.3.2.1 +3 -12
jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/container/TestAll.java
Index: TestAll.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/container/TestAll.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- TestAll.java 26 May 2003 13:27:20 -0000 1.3
+++ TestAll.java 29 Aug 2003 17:27:57 -0000 1.3.2.1
@@ -64,22 +64,12 @@
* Run all the unit tests for the container support classes.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Christopher Lenz</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Massol</a>
*
* @version $Id$
*/
public final class TestAll extends TestCase
{
-
- /**
- * Start the tests.
- *
- * @param theArgs the arguments. Not used
- */
- public static void main(String[] theArgs)
- {
- junit.swingui.TestRunner.main(new String[] {TestAll.class.getName()});
- }
-
/**
* @return a test suite (<code>TestSuite</code>) that includes all methods
* starting with "test"
@@ -90,6 +80,7 @@
"Unit tests for the container support classes");
suite.addTestSuite(TestContainerRunner.class);
+ suite.addTestSuite(TestAbstractContainer.class);
return suite;
}
No revision
Index: TestAll.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/container/TestAll.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- TestAll.java 26 May 2003 13:27:20 -0000 1.3
+++ TestAll.java 29 Aug 2003 17:27:57 -0000 1.3.2.1
@@ -64,22 +64,12 @@
* Run all the unit tests for the container support classes.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Christopher Lenz</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Massol</a>
*
* @version $Id$
*/
public final class TestAll extends TestCase
{
-
- /**
- * Start the tests.
- *
- * @param theArgs the arguments. Not used
- */
- public static void main(String[] theArgs)
- {
- junit.swingui.TestRunner.main(new String[] {TestAll.class.getName()});
- }
-
/**
* @return a test suite (<code>TestSuite</code>) that includes all methods
* starting with "test"
@@ -90,6 +80,7 @@
"Unit tests for the container support classes");
suite.addTestSuite(TestContainerRunner.class);
+ suite.addTestSuite(TestAbstractContainer.class);
return suite;
}
No revision
Index: TestAll.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/container/TestAll.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- TestAll.java 26 May 2003 13:27:20 -0000 1.3
+++ TestAll.java 29 Aug 2003 17:27:57 -0000 1.3.2.1
@@ -64,22 +64,12 @@
* Run all the unit tests for the container support classes.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Christopher Lenz</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Massol</a>
*
* @version $Id$
*/
public final class TestAll extends TestCase
{
-
- /**
- * Start the tests.
- *
- * @param theArgs the arguments. Not used
- */
- public static void main(String[] theArgs)
- {
- junit.swingui.TestRunner.main(new String[] {TestAll.class.getName()});
- }
-
/**
* @return a test suite (<code>TestSuite</code>) that includes all methods
* starting with "test"
@@ -90,6 +80,7 @@
"Unit tests for the container support classes");
suite.addTestSuite(TestContainerRunner.class);
+ suite.addTestSuite(TestAbstractContainer.class);
return suite;
}
1.1.2.1 +1 -1
jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/container/TestAbstractContainer.java
Index: TestAbstractContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/container/TestAbstractContainer.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.6.2.1 +14 -12
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/AbstractContainer.java
Index: AbstractContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/AbstractContainer.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- AbstractContainer.java 11 Jun 2003 16:17:26 -0000 1.6
+++ AbstractContainer.java 29 Aug 2003 17:27:58 -0000 1.6.2.1
@@ -318,23 +318,25 @@
{
ReplaceTokens.Token token = null;
FilterChain filterChain = new FilterChain();
+
+ // Token for the cactus port
ReplaceTokens replacePort = new ReplaceTokens();
token = new ReplaceTokens.Token();
token.setKey("cactus.port");
token.setValue(String.valueOf(getPort()));
replacePort.addConfiguredToken(token);
filterChain.addReplaceTokens(replacePort);
- if (isWar(getDeployableFile()))
- {
- ReplaceTokens replaceContext = new ReplaceTokens();
- token = new ReplaceTokens.Token();
- token.setKey("cactus.context");
- String contextPath = getDeployableFile().getName();
- contextPath = contextPath.substring(0, contextPath.length() - 4);
- token.setValue(contextPath);
- replaceContext.addConfiguredToken(token);
- filterChain.addReplaceTokens(replaceContext);
- }
+
+ // Token for the cactus webapp context
+ ReplaceTokens replaceContext = new ReplaceTokens();
+ token = new ReplaceTokens.Token();
+ token.setKey("cactus.context");
+ String contextPath = getDeployableFile().getName();
+ contextPath = contextPath.substring(0, contextPath.length() - 4);
+ token.setValue(contextPath);
+ replaceContext.addConfiguredToken(token);
+ filterChain.addReplaceTokens(replaceContext);
+
return filterChain;
}
No revision
No revision
1.120.2.4 +6 -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.120.2.3
retrieving revision 1.120.2.4
diff -u -r1.120.2.3 -r1.120.2.4
--- changes.xml 9 Aug 2003 16:51:39 -0000 1.120.2.3
+++ changes.xml 29 Aug 2003 17:27:58 -0000 1.120.2.4
@@ -68,6 +68,12 @@
</devs>
<release version="1.5-rc1" date="in CVS">
+ <action dev="VMA" type="fix" fixes-bug="22794" due-to="Jonathan Kovacs"
due-to-email="[EMAIL PROTECTED]">
+ In the Ant integration, the <code>cactus.context</code> filter token
+ was not correctly defined for EAR files. However, it is needed. For
+ example the default Orion's <code>application.xml</code> config file
+ provided by Cactus needs it.
+ </action>
<action dev="VMA" type="fix" fixes-bug="22249" due-to="James Stangler"
due-to-email="[EMAIL PROTECTED]">
Fixed the <code>JettyTestSetup</code> class so that it stops the
running Jetty server at the end of the test suite execution.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
