modified nested component rules to use new SSLComponent interface

qos-ch · Apr 11, 2013 · 4228a9e · 4228a9e
1 parent e5acdb7
commit 4228a9e
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/util/DefaultNestedComponentRules.java b/logback-classic/src/main/java/ch/qos/logback/classic/util/DefaultNestedComponentRules.java
@@ -16,14 +16,12 @@
 import ch.qos.logback.classic.PatternLayout;
 import ch.qos.logback.classic.boolex.JaninoEventEvaluator;
 import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
-import ch.qos.logback.classic.net.SSLSocketAppender;
-import ch.qos.logback.classic.net.SSLSocketRemote;
-import ch.qos.logback.classic.net.server.SSLServerSocketAppender;
 import ch.qos.logback.classic.net.server.SocketServerNestedComponentRegistryRules;
 import ch.qos.logback.core.AppenderBase;
 import ch.qos.logback.core.UnsynchronizedAppenderBase;
 import ch.qos.logback.core.filter.EvaluatorFilter;
 import ch.qos.logback.core.joran.spi.DefaultNestedComponentRegistry;
+import ch.qos.logback.core.net.ssl.SSLComponent;
 import ch.qos.logback.core.net.ssl.SSLConfiguration;
 import ch.qos.logback.core.net.ssl.SSLNestedComponentRegistryRules;
 
@@ -47,9 +45,7 @@ static public void addDefaultNestedComponentRegistryRules(
     registry
         .add(EvaluatorFilter.class, "evaluator", JaninoEventEvaluator.class);
 
-    registry.add(SSLSocketAppender.class, "ssl", SSLConfiguration.class);
-    registry.add(SSLSocketRemote.class, "ssl", SSLConfiguration.class);
-    registry.add(SSLServerSocketAppender.class, "ssl", SSLConfiguration.class);
+    registry.add(SSLComponent.class, "ssl", SSLConfiguration.class);
     SSLNestedComponentRegistryRules.addDefaultNestedComponentRegistryRules(registry);
     SocketServerNestedComponentRegistryRules.addDefaultNestedComponentRegistryRules(registry);
   }