OF-946: Don't have abstract Connection Types

Initially, I added a connection type 'admin' that was somewhat abstract. This
poses a practical issue: there's no instantiating an abstract type. As it is
hardly used, it should be removed.

src/java/org/jivesoftware/openfire/clearspace/SSLProtocolSocketFactory.java

@@ -70,7 +70,7 @@ public class SSLProtocolSocketFactory implements SecureProtocolSocketFactory {
                             new ClearspaceX509TrustManager(
                                     host,
                                     manager.getProperties(),
-                                    CertificateStoreManager.getTrustStore( ConnectionType.ADMIN ).getStore() )
+                                    CertificateStoreManager.getTrustStore( ConnectionType.SOCKET_S2S ).getStore() )
                     },
                     null);
             return context;

src/java/org/jivesoftware/openfire/spi/ConnectionListener.java

@@ -187,7 +187,6 @@ public class ConnectionListener
         {
             case SOCKET_S2S:
             case BOSH_C2S:
-            case ADMIN:
             case WEBADMIN:
                 Log.debug( "Not starting a (NIO-based) connection acceptor, as connections of type " + getType() + " depend on another IO technology.");
                 return;

src/java/org/jivesoftware/openfire/spi/ConnectionType.java

@@ -38,25 +38,20 @@ public enum ConnectionType
      */
     BOSH_C2S( "xmpp.bosh.ssl.client.", SOCKET_C2S ),
 
-    /**
-     * Generic administrative services (eg: user providers).
-     */
-    ADMIN( "admin.ssl.", SOCKET_S2S ),
-
     /**
      * Openfire web-admin console.
      */
-    WEBADMIN( "admin.web.ssl.", ADMIN ),
+    WEBADMIN( "admin.web.ssl.", SOCKET_S2S ),
 
     /**
      * Openfire External Component connectivity.
      */
-    COMPONENT( "xmpp.component.", ADMIN ),
+    COMPONENT( "xmpp.component.", SOCKET_S2S ),
 
     /**
      * Openfire Connection Manager (multiplexer) connectivity.
      */
-    CONNECTION_MANAGER( "xmpp.multiplex.", ADMIN );
+    CONNECTION_MANAGER( "xmpp.multiplex.", SOCKET_S2S );
 
     String prefix;
     ConnectionType fallback;