activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject activemq git commit: https://issues.apache.org/jira/browse/AMQ-5754 - disable file server by default
Date Thu, 30 Apr 2015 10:08:36 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 977deb42c -> f2c3ebfa0


https://issues.apache.org/jira/browse/AMQ-5754 - disable file server by default


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f2c3ebfa
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f2c3ebfa
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f2c3ebfa

Branch: refs/heads/master
Commit: f2c3ebfa0eca24fc021692428eaf12e0014e01f4
Parents: 977deb4
Author: Dejan Bosanac <dejan@nighttale.net>
Authored: Thu Apr 30 12:08:26 2015 +0200
Committer: Dejan Bosanac <dejan@nighttale.net>
Committed: Thu Apr 30 12:08:26 2015 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/activemq/util/FilenameGuardFilter.java  | 2 +-
 activemq-fileserver/src/main/webapp/index.html                   | 4 ++--
 assembly/src/release/conf/jetty.xml                              | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/f2c3ebfa/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java
----------------------------------------------------------------------
diff --git a/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java
b/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java
index 099fa41..89bfa58 100644
--- a/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java
+++ b/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java
@@ -60,7 +60,7 @@ public class FilenameGuardFilter implements Filter {
         }
 
         private String guard(String filename) {
-            String guarded = filename.replace(":", "_");
+            String guarded = filename.replace(":", "_").replace("\\", "").replace("/", "");
             if (LOG.isDebugEnabled()) {
                 LOG.debug("guarded " + filename + " to " + guarded);
             }

http://git-wip-us.apache.org/repos/asf/activemq/blob/f2c3ebfa/activemq-fileserver/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/activemq-fileserver/src/main/webapp/index.html b/activemq-fileserver/src/main/webapp/index.html
index 56294f6..f30eb69 100644
--- a/activemq-fileserver/src/main/webapp/index.html
+++ b/activemq-fileserver/src/main/webapp/index.html
@@ -16,14 +16,14 @@
 -->
 <html>
 <head>
-<title>ActiveMQ Console</title>
+<title>ActiveMQ File server</title>
 </head>
 <body>
 
 <h1>RESTful file access</h1>
 
 <p>
-	This webapp provides RESTful file access.
+	This webapp provides RESTful file access for <a href="http://activemq.apache.org/blob-messages.html">blob
messages</a>. It's disabled by default, please take a look at web server configuration
on how to enable it.
 </p>
 
 </body>

http://git-wip-us.apache.org/repos/asf/activemq/blob/f2c3ebfa/assembly/src/release/conf/jetty.xml
----------------------------------------------------------------------
diff --git a/assembly/src/release/conf/jetty.xml b/assembly/src/release/conf/jetty.xml
index 2f77ee5..12e104c 100644
--- a/assembly/src/release/conf/jetty.xml
+++ b/assembly/src/release/conf/jetty.xml
@@ -65,12 +65,15 @@
                             <property name="resourceBase" value="${activemq.home}/webapps/admin"
/>
                             <property name="logUrlOnStart" value="true" />
                         </bean>
+                        <!-- Enable embedded file server for Blob messages -->
+                        <!--
                         <bean class="org.eclipse.jetty.webapp.WebAppContext">
                             <property name="contextPath" value="/fileserver" />
                             <property name="resourceBase" value="${activemq.home}/webapps/fileserver"
/>
                             <property name="logUrlOnStart" value="true" />
                             <property name="parentLoaderPriority" value="true" />
                         </bean>
+                        -->
                         <bean class="org.eclipse.jetty.webapp.WebAppContext">
                             <property name="contextPath" value="/api" />
                             <property name="resourceBase" value="${activemq.home}/webapps/api"
/>


Mime
View raw message