Deleted old copyright notice text + Javadocs. DatabaseManager is now a active service

@@ -60,24 +60,8 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSet;
 
 
 /**
 /**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
-
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under
- * the License.
+ * ONOS Cluster messaging based Copycat protocol.
  */
  */
-
 @Component(immediate = true)
 @Component(immediate = true)
 @Service
 @Service
 public class ClusterMessagingProtocol implements Protocol<TcpMember> {
 public class ClusterMessagingProtocol implements Protocol<TcpMember> {

@@ -30,24 +30,8 @@ import org.slf4j.Logger;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 
 /**
 /**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
-
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under
- * the License.
+ * ONOS Cluster messaging based Copycat protocol client.
  */
  */
-
 public class ClusterMessagingProtocolClient implements ProtocolClient {
 public class ClusterMessagingProtocolClient implements ProtocolClient {
 
 
     private final Logger log = getLogger(getClass());
     private final Logger log = getLogger(getClass());

@@ -17,24 +17,8 @@ import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 
 
 /**
 /**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
-
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under
- * the License.
+ * ONOS Cluster messaging based Copycat protocol server.
  */
  */
-
 public class ClusterMessagingProtocolServer implements ProtocolServer {
 public class ClusterMessagingProtocolServer implements ProtocolServer {
 
 
     private final Logger log = getLogger(getClass());
     private final Logger log = getLogger(getClass());

@@ -15,9 +15,11 @@ import net.kuujo.copycat.log.ChronicleLog;
 import net.kuujo.copycat.log.Log;
 import net.kuujo.copycat.log.Log;
 
 
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.apache.felix.scr.annotations.Service;
 import org.onlab.onos.cluster.ClusterService;
 import org.onlab.onos.cluster.ClusterService;
 import org.onlab.onos.cluster.ControllerNode;
 import org.onlab.onos.cluster.ControllerNode;
 import org.onlab.onos.store.service.DatabaseAdminService;
 import org.onlab.onos.store.service.DatabaseAdminService;
@@ -40,8 +42,8 @@ import com.google.common.collect.Lists;
  * Strongly consistent and durable state management service based on
  * Strongly consistent and durable state management service based on
  * Copycat implementation of Raft consensus protocol.
  * Copycat implementation of Raft consensus protocol.
  */
  */
-//@Component(immediate = true)
-//@Service
+@Component(immediate = true)
+@Service
 public class DatabaseManager implements DatabaseService, DatabaseAdminService {
 public class DatabaseManager implements DatabaseService, DatabaseAdminService {
 
 
     private final Logger log = getLogger(getClass());
     private final Logger log = getLogger(getClass());
@@ -59,6 +61,9 @@ public class DatabaseManager implements DatabaseService, DatabaseAdminService {
 
 
     @Activate
     @Activate
     public void activate() {
     public void activate() {
+
+        // TODO: Not every node can be part of the consensus ring.
+
         TcpMember localMember =
         TcpMember localMember =
                 new TcpMember(
                 new TcpMember(
                         clusterService.getLocalNode().ip().toString(),
                         clusterService.getLocalNode().ip().toString(),