dims 01/05/31 13:37:05
Modified: src/org/apache/cocoon/environment AbstractEnvironment.java
Log:
Patch for Weblogic/WAR deployment - relative path issues
from Jiri Luzny ([EMAIL PROTECTED])
One problem left for WebLogic/WAR deployment. Sub-sitemaps are not working.....
Revision Changes Path
1.6 +17 -11
xml-cocoon2/src/org/apache/cocoon/environment/AbstractEnvironment.java
Index: AbstractEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/AbstractEnvironment.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractEnvironment.java 2001/05/29 17:04:54 1.5
+++ AbstractEnvironment.java 2001/05/31 20:37:05 1.6
@@ -117,19 +117,25 @@
this.prefix.append(prefix);
uri = uri.substring(prefix.length());
+ //if the resource is zipped into a war file (e.g. Weblogic temp
deployment)
+ if (this.context.getProtocol().equals("zip")) {
+ this.context = new URL(this.context.toString() + context);
+
// if we got a absolute context or one with a protocol resolve it
- if (context.charAt(0) == '/') {
- this.context = new URL("file:" + context);
- }else if (context.indexOf(':') > 1) {
- this.context = new URL(context);
- }else {
- this.context = new URL(this.context, context);
- }
- File f = new File(this.context.getFile());
- if (f.isFile()) {
- this.context = f.getParentFile().toURL();
} else {
- this.context = f.toURL();
+ if (context.charAt(0) == '/') {
+ this.context = new URL("file:" + context);
+ } else if (context.indexOf(':') > 1) {
+ this.context = new URL(context);
+ } else {
+ this.context = new URL(this.context, context);
+ }
+ File f = new File(this.context.getFile());
+ if (f.isFile()) {
+ this.context = f.getParentFile().toURL();
+ } else {
+ this.context = f.toURL();
+ }
}
} else {
getLogger().error("The current URI ("
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
