comment out AAA cert & crypt services that are not needed

because they are currently broken, following AAA changing from the
controller to the mdsal APIs.  That could (easily) be fixed, of course,
but may be we can just get rid of AAA here in simple all together...

Signed-off-by: Michael Vorburger <mike@vorburger.ch>

diff --git a/src/main/java/org/opendaylight/aaa/simple/CertWiring.java b/src/main/java/org/opendaylight/aaa/simple/CertWiring.java
index f229f669a2c9d32f115ec30d1c8e5643b392b712..ecf1d62c4dc170a3a2eb5c756ff6962a093b51c0 100644 (file)
--- a/src/main/java/org/opendaylight/aaa/simple/CertWiring.java
+++ b/src/main/java/org/opendaylight/aaa/simple/CertWiring.java
@@ -8,16 +8,6 @@
 package org.opendaylight.aaa.simple;
 
 import com.google.inject.AbstractModule;
-import com.google.inject.Provides;
-import javax.inject.Singleton;
-import org.opendaylight.aaa.cert.api.ICertificateManager;
-import org.opendaylight.aaa.cert.impl.AaaCertRpcServiceImpl;
-import org.opendaylight.aaa.cert.impl.CertificateManagerService;
-import org.opendaylight.aaa.encrypt.AAAEncryptionService;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rev151126.AaaCertServiceConfig;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rev151126.AaaCertServiceConfigBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.AaaCertRpcService;
 
 /**
  * Guice wiring equivalent of AAA Cert BP XML in
@@ -27,6 +17,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215
  */
 public class CertWiring extends AbstractModule {
 
+    @Override
+    protected void configure() {
+    }
+
+/*
     @Override
     protected void configure() {
         // as per aaa-cert-config.xml
@@ -47,4 +42,5 @@ public class CertWiring extends AbstractModule {
     public AaaCertRpcService aaaCertRpcService(AaaCertServiceConfig config, DataBroker db, AAAEncryptionService crypt) {
         return new AaaCertRpcServiceImpl(config, db, crypt);
     }
+*/
 }

diff --git a/src/main/java/org/opendaylight/aaa/simple/EncryptWiring.java b/src/main/java/org/opendaylight/aaa/simple/EncryptWiring.java
index 4c5fbd6b92f4ea8dab5da5f493dba376a5a8364f..6a82f652d8538f2d895e5dd089c0dbac5111583b 100644 (file)
--- a/src/main/java/org/opendaylight/aaa/simple/EncryptWiring.java
+++ b/src/main/java/org/opendaylight/aaa/simple/EncryptWiring.java
@@ -8,16 +8,14 @@
 package org.opendaylight.aaa.simple;
 
 import com.google.inject.AbstractModule;
-import com.google.inject.Provides;
-import javax.inject.Singleton;
-import org.opendaylight.aaa.encrypt.AAAEncryptionService;
-import org.opendaylight.aaa.encrypt.impl.AAAEncryptionServiceImpl;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.yang.gen.v1.config.aaa.authn.encrypt.service.config.rev160915.AaaEncryptServiceConfig;
-import org.opendaylight.yang.gen.v1.config.aaa.authn.encrypt.service.config.rev160915.AaaEncryptServiceConfigBuilder;
 
 public class EncryptWiring extends AbstractModule {
 
+    @Override
+    protected void configure() {
+    }
+
+/*
     @Override
     protected void configure() {
         // as per aaa-encrypt-service-config.xml
@@ -33,4 +31,5 @@ public class EncryptWiring extends AbstractModule {
     public AAAEncryptionService aaaEncryptionService(AaaEncryptServiceConfig config, DataBroker db) {
         return new AAAEncryptionServiceImpl(config, db);
     }
+*/
 }