[jboss-svn-commits] JBL Code SVN: r10415 - in labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor: dist and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: rex.sheridan
Date: 2007-03-21 17:52:08 -0400 (Wed, 21 Mar 2007)
New Revision: 10415

Modified:
   labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/WEB-INF/web.xml
   labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/dist/jbossesb-config-editor.war
   labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/src/org/jboss/configapp/ConfigListServlet.java
   labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/src/org/jboss/configapp/DownloadServlet.java
   labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/src/org/jboss/configapp/JBossESBConfigLocator.java
   labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/src/org/jboss/configapp/UploadServlet.java
Log:


Modified: labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/WEB-INF/web.xml
===================================================================
--- labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/WEB-INF/web.xml	2007-03-21 21:13:34 UTC (rev 10414)
+++ labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/WEB-INF/web.xml	2007-03-21 21:52:08 UTC (rev 10415)
@@ -36,12 +36,12 @@
 
 	<servlet-mapping>
 		<servlet-name>DownloadConfig</servlet-name>
-		<url-pattern>/download</url-pattern>
+		<url-pattern>/download/*</url-pattern>
 	</servlet-mapping>
 
 	<servlet-mapping>
 		<servlet-name>UploadConfig</servlet-name>
-		<url-pattern>/upload</url-pattern>
+		<url-pattern>/upload/*</url-pattern>
 	</servlet-mapping>
 
 	<servlet-mapping>

Modified: labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/dist/jbossesb-config-editor.war
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/src/org/jboss/configapp/ConfigListServlet.java
===================================================================
--- labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/src/org/jboss/configapp/ConfigListServlet.java	2007-03-21 21:13:34 UTC (rev 10414)
+++ labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/src/org/jboss/configapp/ConfigListServlet.java	2007-03-21 21:52:08 UTC (rev 10415)
@@ -37,7 +37,7 @@
 		for (File file : configs) {
 			Date lastMod = new Date(file.lastModified());
 			builder.append("  <config name=\"" + file.getName()
-					+ "\" modified=\"" + FORMATTER.format(lastMod) + "\">\n");
+					+ "\" modified=\"" + FORMATTER.format(lastMod) + "\"/>\n");
 		}
 		builder.append("</jbossesb-config-list>");
 		String xml = builder.toString();

Modified: labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/src/org/jboss/configapp/DownloadServlet.java
===================================================================
--- labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/src/org/jboss/configapp/DownloadServlet.java	2007-03-21 21:13:34 UTC (rev 10414)
+++ labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/src/org/jboss/configapp/DownloadServlet.java	2007-03-21 21:52:08 UTC (rev 10415)
@@ -45,7 +45,8 @@
 		File sourceFile;
 
 		// Use parameter to choose file to load.
-		String fileParam = request.getParameter(FILE_PARAM);
+		String uri = request.getRequestURI();
+		String fileParam = uri.substring(uri.lastIndexOf('/') + 1);
 		boolean loadingActions = (fileParam != null)
 				&& (fileParam.equals(ACTIONS_INDICATOR));
 		if (loadingActions) {

Modified: labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/src/org/jboss/configapp/JBossESBConfigLocator.java
===================================================================
--- labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/src/org/jboss/configapp/JBossESBConfigLocator.java	2007-03-21 21:13:34 UTC (rev 10414)
+++ labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/src/org/jboss/configapp/JBossESBConfigLocator.java	2007-03-21 21:52:08 UTC (rev 10415)
@@ -91,7 +91,7 @@
 	 */
 	public static boolean isZippedDeployment(File file) {
 		return (file.getName().endsWith(PACKAGED_CONFIG_SUFFIX))
-				&& (file.isDirectory());
+				&& (!file.isDirectory());
 	}
 
 	/**

Modified: labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/src/org/jboss/configapp/UploadServlet.java
===================================================================
--- labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/src/org/jboss/configapp/UploadServlet.java	2007-03-21 21:13:34 UTC (rev 10414)
+++ labs/jbossesb/workspace/rsheridan/s360/tools/configeditor/editor/src/org/jboss/configapp/UploadServlet.java	2007-03-21 21:52:08 UTC (rev 10415)
@@ -4,6 +4,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.net.URI;
+import java.net.URL;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -30,7 +32,8 @@
 			HttpServletResponse response) throws ServletException, IOException {
 
 		// Use parameter to choose file to load.
-		String fileParam = request.getParameter(FILE_PARAM);
+		String uri = request.getRequestURI();
+		String fileParam = uri.substring(uri.lastIndexOf('/') + 1);
 		if ((fileParam == null) || (fileParam.length() == 0)) {
 			fileParam = DEFAULT_CONFIG;
 		}