Removed COPSDebug.java and all remaining references.

Change-Id: Ib233ea8028755359e6e233bd70ef3646d0198836
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>

diff --git a/packetcable-driver/src/main/java/org/pcmm/PCMMPdpAgent.java b/packetcable-driver/src/main/java/org/pcmm/PCMMPdpAgent.java
index bbb74661732a72c7ba38dcd7e4d0c42a233eafe4..7c1f47cf9892cf081cd54e6f760c24f7b6375586 100644 (file)
--- a/packetcable-driver/src/main/java/org/pcmm/PCMMPdpAgent.java
+++ b/packetcable-driver/src/main/java/org/pcmm/PCMMPdpAgent.java
@@ -7,7 +7,6 @@ package org.pcmm;
 import org.pcmm.objects.MMVersionInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.umu.cops.common.COPSDebug;
 import org.umu.cops.prpdp.COPSPdpAgent;
 import org.umu.cops.prpdp.COPSPdpException;
 import org.umu.cops.stack.*;
@@ -16,9 +15,6 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;
 
-// import org.umu.cops.prpdp.COPSPdpDataProcess;
-
-
 /**
  * Core PDP agent for provisioning
  */
@@ -111,7 +107,7 @@ public class PCMMPdpAgent extends COPSPdpAgent {
         try {
             socket = new Socket(addr, psPort);
         } catch (IOException e) {
-            logger.error(COPSDebug.ERROR_SOCKET, e);
+            logger.error("Error creating socket connection", e);
             return (false);
         }
         logger.info("PDP Socket Opened");
@@ -287,6 +283,7 @@ public class PCMMPdpAgent extends COPSPdpAgent {
         try {
             man.initRequestState(conn);
         } catch (COPSPdpException unae) {
+            logger.error("Error initializing the state manager's request state");
         }
         // XXX - End handleRequestMsg
 

diff --git a/packetcable-driver/src/main/java/org/umu/cops/common/COPSDebug.java b/packetcable-driver/src/main/java/org/umu/cops/common/COPSDebug.java
deleted file mode 100644 (file)
index 1ddf18d..0000000
--- a/packetcable-driver/src/main/java/org/umu/cops/common/COPSDebug.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*\r
- * Copyright (c) 2004 University of Murcia.  All rights reserved.\r
- * --------------------------------------------------------------\r
- * For more information, please see <http://www.umu.euro6ix.org/>.\r
- */\r
-package org.umu.cops.common;\r
-\r
-import org.slf4j.Logger;\r
-import org.slf4j.LoggerFactory;\r
-\r
-/**\r
- * Class to print debug and error messages.\r
- *\r
- * @version COPSDebug.java, v 3.00 2004\r
- *\r
- */\r
-public class COPSDebug {\r
-\r
-    static public final String ERROR_NOEXPECTEDMSG = "Message not expected";\r
-    static public final String ERROR_EXCEPTION = "Exception not expected";\r
-    static public final String ERROR_SOCKET = "Error socket";\r
-    static public final String ERROR_NOSUPPORTED = "Object not supported";\r
-\r
-    private static final Logger logger = LoggerFactory.getLogger(COPSDebug.class);\r
-\r
-    /** Prints an error message.\r
-        *\r
-        * @param          cname           Name of class that generated the error\r
-     * @param          str                Error message\r
-     *\r
-       */\r
-    @Deprecated\r
-    public static void err (String cname, String str) {\r
-        logger.info(cname + ":" + str);\r
-    }\r
-\r
-    /** Prints an error message.\r
-        *\r
-        * @param          cname           Name of class that generated the error\r
-     * @param          str                Error message\r
-     * @param           e                  Exception\r
-     *\r
-       */\r
-    @Deprecated\r
-    public static void err (String cname, String str, Exception e) {\r
-        logger.info(cname + ":" + str, e);\r
-    }\r
-\r
-    /** Prints an error message.\r
-        *\r
-        * @param          cname           Name of class that generated the error\r
-     * @param          str                Error message\r
-     * @param          extra           Information\r
-     * @param           e                  Exception\r
-     *\r
-       */\r
-    @Deprecated\r
-    public static void err (String cname, String str, String extra, Exception e) {\r
-        logger.info(cname + ":" + str + " -Info: " + extra, e);\r
-    }\r
-\r
-    /** Prints an error message.\r
-        *\r
-        * @param          cname           Name of class that generated the error\r
-     * @param          str                Error message\r
-     * @param          extra           Information\r
-     *\r
-       */\r
-    @Deprecated\r
-    public static void err (String cname, String str, String extra) {\r
-        logger.info(cname + ":" + str + " -Info: " + extra);\r
-    }\r
-\r
-}\r