You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2013/10/28 00:35:15 UTC
svn commit: r1536223 - in
/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin:
DojoHelper.java HttpManagement.java servlet/FileServlet.java
Author: robbie
Date: Sun Oct 27 23:35:14 2013
New Revision: 1536223
URL: http://svn.apache.org/r1536223
Log:
QPID-5207: review feedback + make _usePathInfo field final
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/DojoHelper.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/DojoHelper.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/DojoHelper.java?rev=1536223&r1=1536222&r2=1536223&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/DojoHelper.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/DojoHelper.java Sun Oct 27 23:35:14 2013
@@ -57,7 +57,21 @@ public class DojoHelper
}
else
{
- props.load(propertyStream);
+ try
+ {
+ props.load(propertyStream);
+ }
+ finally
+ {
+ try
+ {
+ propertyStream.close();
+ }
+ catch (IOException e)
+ {
+ _logger.warn("Exception closing InputStream for " + VERSION_FILE + " resource:", e);
+ }
+ }
if (_logger.isDebugEnabled())
{
@@ -70,10 +84,10 @@ public class DojoHelper
_logger.debug("End of property dump");
}
- _version = readPropertyValue(props, DOJO_VERSION_PROPERTY, _version);
- _dojoPath = readPropertyValue(props, DOJO_PATH_PROPERTY, _dojoPath);
- _dijitPath = readPropertyValue(props, DIJIT_PATH_PROPERTY, _dijitPath);
- _dojoxPath = readPropertyValue(props, DOJOX_PATH_PROPERTY, _dojoxPath);
+ _version = props.getProperty(DOJO_VERSION_PROPERTY, _version);
+ _dojoPath = props.getProperty(DOJO_PATH_PROPERTY, _dojoPath);
+ _dijitPath = props.getProperty(DIJIT_PATH_PROPERTY, _dijitPath);
+ _dojoxPath = props.getProperty(DOJOX_PATH_PROPERTY, _dojoxPath);
}
}
catch (IOException e)
@@ -83,17 +97,6 @@ public class DojoHelper
}
}
- private static String readPropertyValue(Properties props, String propertyName, String defaultValue)
- {
- String value = props.getProperty(propertyName);
- if (value == null)
- {
- return defaultValue;
- }
-
- return value;
- }
-
public static String getDojoVersion()
{
return _version;
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1536223&r1=1536222&r2=1536223&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java Sun Oct 27 23:35:14 2013
@@ -317,16 +317,16 @@ public class HttpManagement extends Abst
root.addServlet(new ServletHolder(new FileServlet(DojoHelper.getDijitPath(), true)), "/dojo/dijit/*");
root.addServlet(new ServletHolder(new FileServlet(DojoHelper.getDojoxPath(), true)), "/dojo/dojox/*");
- root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.js");
- root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.css");
- root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.html");
- root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.png");
- root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.gif");
- root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.jpg");
- root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.jpeg");
- root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.json");
- root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.txt");
- root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.xsl");
+ root.addServlet(new ServletHolder(new FileServlet()), "*.js");
+ root.addServlet(new ServletHolder(new FileServlet()), "*.css");
+ root.addServlet(new ServletHolder(new FileServlet()), "*.html");
+ root.addServlet(new ServletHolder(new FileServlet()), "*.png");
+ root.addServlet(new ServletHolder(new FileServlet()), "*.gif");
+ root.addServlet(new ServletHolder(new FileServlet()), "*.jpg");
+ root.addServlet(new ServletHolder(new FileServlet()), "*.jpeg");
+ root.addServlet(new ServletHolder(new FileServlet()), "*.json");
+ root.addServlet(new ServletHolder(new FileServlet()), "*.txt");
+ root.addServlet(new ServletHolder(new FileServlet()), "*.xsl");
root.addServlet(new ServletHolder(new HelperServlet()), "/rest/helper");
root.addServlet(new ServletHolder(new LogFileListingServlet()), "/rest/logfilenames");
root.addServlet(new ServletHolder(new LogFileServlet()), "/rest/logfile");
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java?rev=1536223&r1=1536222&r2=1536223&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java Sun Oct 27 23:35:14 2013
@@ -36,9 +36,6 @@ import javax.servlet.http.HttpServletRes
public class FileServlet extends HttpServlet
{
private static final String RESOURCES_PREFIX = "/resources";
-
- public static final FileServlet INSTANCE = new FileServlet();
-
private static final Map<String, String> CONTENT_TYPES;
static
@@ -56,12 +53,11 @@ public class FileServlet extends HttpSer
}
private final String _resourcePathPrefix;
- private boolean _usePathInfo;
+ private final boolean _usePathInfo;
public FileServlet()
{
- _resourcePathPrefix = RESOURCES_PREFIX;
- _usePathInfo = false;
+ this(RESOURCES_PREFIX, false);
}
public FileServlet(String resourcePathPrefix, boolean usePathInfo)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org