vmassol 2003/09/13 05:00:38
Modified: integration/ant/src/test/org/apache/cactus/integration/ant/container
TestAbstractContainer.java
integration/ant/src/java/org/apache/cactus/integration/ant/container
EarDeployableFile.java
Log:
Remove leading "/" from context if any. That was causing problems when deploying an
EAR on Orion. Seems to work fine now :-)
Revision Changes Path
1.6 +2 -2
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestAbstractContainer.java 7 Sep 2003 19:54:37 -0000 1.5
+++ TestAbstractContainer.java 13 Sep 2003 12:00:38 -0000 1.6
@@ -143,6 +143,6 @@
helper.setFilterChains(chains);
helper.setPrimaryReader(new StringReader(buffer));
Reader reader = helper.getAssembledReader();
- assertEquals("8080:/empty:", helper.readFully(reader));
+ assertEquals("8080:empty:", helper.readFully(reader));
}
}
1.3 +8 -1
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/EarDeployableFile.java
Index: EarDeployableFile.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/EarDeployableFile.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EarDeployableFile.java 8 Sep 2003 18:56:51 -0000 1.2
+++ EarDeployableFile.java 13 Sep 2003 12:00:38 -0000 1.3
@@ -132,6 +132,13 @@
throw new BuildException("Could not find the Cactus context "
+ "path in the EAR");
}
+
+ // Remove leading "/" if there is one.
+ if (context.startsWith("/"))
+ {
+ context = context.substring(1);
+ }
+
this.contextPath = context;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
