Author: cziegeler
Date: Tue Mar 1 16:27:05 2016
New Revision: 1733098
URL: http://svn.apache.org/viewvc?rev=1733098&view=rev
Log:
FELIX-5203 : Remove unused org.apache.felix.http.debug configuration property.
Apply patch from Chris Pilsworth
Modified:
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
felix/trunk/httplite/core/src/main/java/org/apache/felix/httplite/osgi/Activator.java
felix/trunk/httplite/core/src/main/java/org/apache/felix/httplite/server/Server.java
Modified:
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
URL:
http://svn.apache.org/viewvc/felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java?rev=1733098&r1=1733097&r2=1733098&view=diff
==============================================================================
---
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
(original)
+++
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
Tue Mar 1 16:27:05 2016
@@ -197,12 +197,6 @@ class ConfigMetaTypeProvider implements
204800,
bundle.getBundleContext().getProperty(JettyConfig.FELIX_JETTY_MAX_FORM_SIZE)));
- adList.add(new AttributeDefinitionImpl(JettyConfig.FELIX_HTTP_DEBUG,
- "Debug Logging",
- "Whether to write DEBUG level messages or not. Defaults to
false.",
- false,
-
bundle.getBundleContext().getProperty(JettyConfig.FELIX_HTTP_DEBUG)));
-
adList.add(new
AttributeDefinitionImpl(JettyConfig.FELIX_HTTP_PATH_EXCLUSIONS,
"Path Exclusions",
"Contains a list of context path prefixes. If a Web
Application Bundle is started with a context path matching any " +
Modified:
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
URL:
http://svn.apache.org/viewvc/felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java?rev=1733098&r1=1733097&r2=1733098&view=diff
==============================================================================
---
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
(original)
+++
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
Tue Mar 1 16:27:05 2016
@@ -44,10 +44,6 @@ public final class JettyConfig
/** Felix specific property to set http reaching timeout limit */
public static final String HTTP_TIMEOUT = "org.apache.felix.http.timeout";
- /** Felix specific property to enable debug messages */
- public static final String FELIX_HTTP_DEBUG =
"org.apache.felix.http.debug";
- public static final String HTTP_DEBUG =
"org.apache.felix.http.jetty.debug";
-
/** Felix specific property to override the keystore file location. */
public static final String FELIX_KEYSTORE =
"org.apache.felix.https.keystore";
private static final String OSCAR_KEYSTORE =
"org.ungoverned.osgi.bundle.https.keystore";
@@ -359,11 +355,6 @@ public final class JettyConfig
return getProperty(FELIX_TRUSTSTORE_TYPE, KeyStore.getDefaultType());
}
- public boolean isDebug()
- {
- return getBooleanProperty(FELIX_HTTP_DEBUG,
getBooleanProperty(HTTP_DEBUG, false));
- }
-
public boolean isRegisterMBeans()
{
return getBooleanProperty(FELIX_HTTP_MBEANS, false);
Modified:
felix/trunk/httplite/core/src/main/java/org/apache/felix/httplite/osgi/Activator.java
URL:
http://svn.apache.org/viewvc/felix/trunk/httplite/core/src/main/java/org/apache/felix/httplite/osgi/Activator.java?rev=1733098&r1=1733097&r2=1733098&view=diff
==============================================================================
---
felix/trunk/httplite/core/src/main/java/org/apache/felix/httplite/osgi/Activator.java
(original)
+++
felix/trunk/httplite/core/src/main/java/org/apache/felix/httplite/osgi/Activator.java
Tue Mar 1 16:27:05 2016
@@ -118,8 +118,6 @@ public class Activator implements Bundle
context.getProperty(Server.CONFIG_PROPERTY_HTTP_ENABLE));
config.put(Server.CONFIG_PROPERTY_HTTPS_ENABLE,
context.getProperty(Server.CONFIG_PROPERTY_HTTPS_ENABLE));
- config.put(Server.CONFIG_PROPERTY_HTTP_DEBUG,
- context.getProperty(Server.CONFIG_PROPERTY_HTTP_DEBUG));
config.put(Server.CONFIG_PROPERTY_THREADPOOL_LIMIT_PROP,
context.getProperty(Server.CONFIG_PROPERTY_THREADPOOL_LIMIT_PROP));
config.put(Server.CONFIG_PROPERTY_THREADPOOL_TIMEOUT_PROP,
Modified:
felix/trunk/httplite/core/src/main/java/org/apache/felix/httplite/server/Server.java
URL:
http://svn.apache.org/viewvc/felix/trunk/httplite/core/src/main/java/org/apache/felix/httplite/server/Server.java?rev=1733098&r1=1733097&r2=1733098&view=diff
==============================================================================
---
felix/trunk/httplite/core/src/main/java/org/apache/felix/httplite/server/Server.java
(original)
+++
felix/trunk/httplite/core/src/main/java/org/apache/felix/httplite/server/Server.java
Tue Mar 1 16:27:05 2016
@@ -53,10 +53,6 @@ public class Server
* Thread pool limit property
*/
public static final String CONFIG_PROPERTY_THREADPOOL_LIMIT_PROP =
"org.apache.felix.http.threadpool.limit";
- /**
- * Flag to enable debugging for this service implementation. The default
is false.
- */
- public static final String CONFIG_PROPERTY_HTTP_DEBUG =
"org.apache.felix.http.debug";
/**
* Flag to enable the user of HTTPS. The default is false.
*/
