You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ar...@hyperreal.org on 1999/11/02 02:03:08 UTC
cvs commit: jakarta-tools/moo/src/share/org/apache/tools/moo/jsp MapManager.java
arun 99/11/01 17:03:07
Modified: moo/src/share/org/apache/tools/moo/jsp MapManager.java
Log:
Added support for multiple resource base.
Revision Changes Path
1.4 +14 -5 jakarta-tools/moo/src/share/org/apache/tools/moo/jsp/MapManager.java
Index: MapManager.java
===================================================================
RCS file: /home/cvs/jakarta-tools/moo/src/share/org/apache/tools/moo/jsp/MapManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MapManager.java 1999/10/21 18:41:52 1.3
+++ MapManager.java 1999/11/02 01:03:06 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tools/moo/src/share/org/apache/tools/moo/jsp/MapManager.java,v 1.3 1999/10/21 18:41:52 arun Exp $
- * $Date: 1999/10/21 18:41:52 $
- * $Revision: 1.3 $
+ * $Header: /home/cvs/jakarta-tools/moo/src/share/org/apache/tools/moo/jsp/MapManager.java,v 1.4 1999/11/02 01:03:06 arun Exp $
+ * $Date: 1999/11/02 01:03:06 $
+ * $Revision: 1.4 $
*
* The Apache Software License, Version 1.1
*
@@ -73,6 +73,7 @@
import java.util.Hashtable;
import java.util.Vector;
import java.util.Enumeration;
+import java.util.StringTokenizer;
import java.lang.NullPointerException;
/**
@@ -150,8 +151,15 @@
while (e.hasMoreElements()) {
String key = (String)e.nextElement();
- String value = prefix + maps.get(key);
- maps.put(key, value); //replace the old value
+ String uri = (String)maps.get(key);
+ if (uri.trim().charAt(0) != '/') {
+ String value = prefix + uri;
+ maps.put(key, value);
+ } else {
+ StringTokenizer stok = new StringTokenizer(uri, "/");
+ if (stok.hasMoreElements())
+ this.resourceBase = "/" + (String) stok.nextToken();
+ }
}
}
@@ -169,6 +177,7 @@
*/
public String getGoldenfilePrefix(String mapResource, String goldenFile)
throws FileNotFoundException {
+
String toConnect = get(mapResource);
int index = toConnect.lastIndexOf(this.resourceBase);