2001.09.15 build does not compile in JDK1.2; dependency on JDK1.3 about jmeter HOT 7 CLOSED

--- \jakarta-jmeter-cvs\jakarta-jmeter\src\org\apache\jmeter\protocol\http\config\UrlConfig.java	Thu Aug 30 17:19:02 2001
+++ \jakarta-jmeter-nightly\2001.09.15\jakarta-jmeter\src\org\apache\jmeter\protocol\http\config\UrlConfig.java	Sun Sep 16 18:09:14 2001
@@ -428,7 +428,15 @@
 			{
 				String name = args[i].substring(0,index);
 				String value = args[i].substring(index + 1);
-				addArgument(name, URLDecoder.decode(value));
+				try
+				{
+					addArgument(name, URLDecoder.decode(value));
+				}
+				catch (Exception e)
+				{
+					System.out.println("UrlConfig:parseArguments(): Unable to parse argument=[" + value + "]");
+					System.out.println("UrlConfig:parseArguments(): queryString=[" + queryString + "]");
+				}
 			}
 		}
 	}

--- \jakarta-jmeter-cvs\jakarta-jmeter\src\org\apache\jmeter\gui\MainFrame.java	Thu Jul 26 00:34:44 2001
+++ \jakarta-jmeter-nightly\2001.09.15\jakarta-jmeter\src\org\apache\jmeter\gui\MainFrame.java	Sun Sep 16 19:10:32 2001
@@ -160,7 +160,8 @@
 		JSplitPane treeAndMain = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
 		treeAndMain.setLeftComponent(treePanel);
 		treeAndMain.setRightComponent(new JScrollPane(mainPanel));
-		treeAndMain.setResizeWeight(.2);
+		// Commented out by khammond 2001.09.16 - This method is new in JDK1.3.
+                //treeAndMain.setResizeWeight(.2);
 		treeAndMain.setContinuousLayout(true);
 		{
 			gbc.gridy++;

--- \jakarta-jmeter-cvs\jakarta-jmeter\src\org\apache\jmeter\protocol\http\parser\HtmlParser.java	Fri Aug 31 00:46:44 2001
+++ \jakarta-jmeter-nightly\2001.09.15\jakarta-jmeter\src\org\apache\jmeter\protocol\http\parser\HtmlParser.java	Mon Sep 17 12:07:12 2001
@@ -259,6 +259,22 @@
 		url.setDomain(context.getHost());
 		url.setProtocol(context.getProtocol());
 		url.setPort(context.getPort());
+		
+		// In JDK1.3, we can get the path using getPath(). However, in JDK1.2, we have to parse
+		// the file to obtain the path. In the source for JDK1.3.1, they determine the path to
+		// be from the start of the file up to the LAST question mark (if any).
+		String contextPath = null; 
+		String contextFile = context.getFile();
+		int indexContextQuery = contextFile.lastIndexOf('?');
+		if (indexContextQuery != -1) 
+		{
+			contextPath = contextFile.substring(0, indexContextQuery);
+		} 
+		else
+		{
+			contextPath = contextFile;
+		}
+
 		int queryStarts = parsedUrlString.indexOf("?");
 		if (queryStarts == -1)
 		{
@@ -270,19 +286,33 @@
 		}
 		else if (parsedUrlString.startsWith(".."))
 		{
-			url.setPath(context.getPath().substring(0, context.getPath().substring(0,
-					context.getPath().lastIndexOf("/")).lastIndexOf("/")) +
+			url.setPath(contextPath.substring(0, contextPath.substring(0,
+					contextPath.lastIndexOf("/")).lastIndexOf("/")) +
 					parsedUrlString.substring(2, queryStarts));
 		}
 		else if (!parsedUrlString.toLowerCase().startsWith("http"))
 		{
-			url.setPath(context.getPath().substring(0, context.getPath().lastIndexOf("/")) +
+			url.setPath(contextPath.substring(0, contextPath.lastIndexOf("/")) +
 					"/" + parsedUrlString.substring(0, queryStarts));
 		}
 		else
 		{
 			URL u = new URL(parsedUrlString);
-			url.setPath(u.getPath());
+
+			// Determine the path. (See JDK1.2/1.3 comment above.)
+			String uPath = null; 
+			String uFile = u.getFile();
+			int indexUQuery = uFile.lastIndexOf('?');
+			if (indexUQuery != -1) 
+			{
+				uPath = uFile.substring(0, indexUQuery);
+			} 
+			else
+			{
+				uPath = uFile;
+			}
+
+			url.setPath(uPath);
 			url.setDomain(u.getHost());
 			url.setProtocol(u.getProtocol());
 			url.setPort(u.getPort());