commit 70ee58390d97d6c3f45022c62268b3f465313881
author Jan Willem Janssen <jawi@apache.org> Mon Mar 10 16:06:34 2014 +0000
committer Jan Willem Janssen <jawi@apache.org> Mon Mar 10 16:06:34 2014 +0000
tree f95cb1aa5257a192cd84c66eb9d8efc0c56d88fa
parent a0e662cfeee709ea8d2d6d26bdb1623d378d9df5

Fixed a typo in the inclusion/exclusion of cipher suites:

- added new constants with a fallback to the old constants.



git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1575988 13f79535-47bb-0310-9956-ffa450edef68

http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java

diff --git a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
index 24ae12c..d878333 100644
--- a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
+++ b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
@@ -111,12 +111,17 @@
     /** Felix specific property to set the list of path exclusions for Web Application Bundles */
     public static final String FELIX_HTTP_PATH_EXCLUSIONS = "org.apache.felix.http.path_exclusions";
 
+    /** Felix specific property to configure the excluded cipher suites. @deprecated use {@link #FELIX_JETTY_EXCLUDE_SUITES} instead. */
+    @Deprecated
+    public static final String FELIX_JETTY_EXCLUDED_SUITES_OLD = "org.apache.felix.https.jetty.cipersuites.excluded";
     /** Felix specific property to configure the excluded cipher suites */
-    public static final String FELIX_JETTY_EXCLUDED_SUITES = "org.apache.felix.https.jetty.cipersuites.excluded";
+    public static final String FELIX_JETTY_EXCLUDED_SUITES = "org.apache.felix.https.jetty.ciphersuites.excluded";
 
-    /** Felix specific property to configure the included cipher suites */
-    public static final String FELIX_JETTY_INCLUDED_SUITES = "org.apache.felix.https.jetty.cipersuites.included";
-
+    /** Felix specific property to configure the included cipher suites. @deprecated use {@link #FELIX_JETTY_INCLUDE_SUITES} instead. */
+    @Deprecated
+    public static final String FELIX_JETTY_INCLUDED_SUITES_OLD = "org.apache.felix.https.jetty.cipersuites.included";
+    /** Felix specific property to configure the included cipher suites. */
+    public static final String FELIX_JETTY_INCLUDED_SUITES = "org.apache.felix.https.jetty.ciphersuites.included";
 
     private static String validateContextPath(String ctxPath)
     {
@@ -185,7 +190,7 @@
 
     public String[] getExcludedCipherSuites()
     {
-        return getStringArrayProperty(FELIX_JETTY_EXCLUDED_SUITES, null);
+        return getStringArrayProperty(FELIX_JETTY_EXCLUDED_SUITES, getStringArrayProperty(FELIX_JETTY_EXCLUDED_SUITES_OLD, null));
     }
 
     public int getHeaderSize()
@@ -215,7 +220,7 @@
 
     public String[] getIncludedCipherSuites()
     {
-        return getStringArrayProperty(FELIX_JETTY_INCLUDED_SUITES, null);
+        return getStringArrayProperty(FELIX_JETTY_INCLUDED_SUITES, getStringArrayProperty(FELIX_JETTY_INCLUDED_SUITES_OLD, null));
     }
 
     /**