From f4ce0876493310f130707057e59e5513a60e2585 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Wed, 17 Jun 2015 20:48:50 -0400
Subject: [PATCH] moved files

Former-commit-id: 4041a13f94723e6002e82b926916d60946b3a4d2
---
 .../maven/MavenLoggerAdapter.java             | 320 ------------------
 .../maven/MavenLoggerFactory.java             |  38 ---
 2 files changed, 358 deletions(-)
 delete mode 100644 dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/MavenLoggerAdapter.java
 delete mode 100644 dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/MavenLoggerFactory.java

diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/MavenLoggerAdapter.java b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/MavenLoggerAdapter.java
deleted file mode 100644
index 3a34670c7..000000000
--- a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/MavenLoggerAdapter.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * This file is part of dependency-check-ant.
- *
- * Licensed 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.
- *
- * Copyright (c) 2013 Jeremy Long. All Rights Reserved.
- */
-package org.owasp.dependencycheck.maven;
-
-import org.apache.maven.plugin.logging.Log;
-import org.slf4j.helpers.FormattingTuple;
-import org.slf4j.helpers.MarkerIgnoringBase;
-import org.slf4j.helpers.MessageFormatter;
-
-/**
- * Created by colezlaw on 6/14/15.
- */
-public class MavenLoggerAdapter extends MarkerIgnoringBase {
-    private Log log;
-
-    public MavenLoggerAdapter(Log log) {
-        super();
-        this.log = log;
-    }
-
-    @Override
-    public boolean isTraceEnabled() {
-        if (log != null) {
-            return log.isDebugEnabled();
-        }
-        return true;
-    }
-
-    @Override
-    public void trace(String msg) {
-        if (log != null) {
-            log.debug(msg);
-        } else {
-            System.out.println(msg);
-        }
-    }
-
-    @Override
-    public void trace(String format, Object arg) {
-        String message = MessageFormatter.format(format, arg).getMessage();
-        if (log != null) {
-            log.debug(message);
-        } else {
-            System.out.println(message);
-        }
-    }
-
-    @Override
-    public void trace(String format, Object arg1, Object arg2) {
-        String message = MessageFormatter.format(format, arg1, arg2).getMessage();
-        if (log != null) {
-            log.debug(message);
-        } else {
-            System.out.println(message);
-        }
-    }
-
-    @Override
-    public void trace(String format, Object... arguments) {
-        String message = MessageFormatter.format(format, arguments).getMessage();
-        if (log != null) {
-            log.debug(message);
-        } else {
-            System.out.println(message);
-        }
-    }
-
-    @Override
-    public void trace(String msg, Throwable t) {
-        if (log != null) {
-            log.debug(msg, t);
-        } else {
-            System.out.println(msg);
-            t.printStackTrace();
-        }
-    }
-
-    @Override
-    public boolean isDebugEnabled() {
-        if (log != null) {
-            return log.isDebugEnabled();
-        }
-        return true;
-    }
-
-    @Override
-    public void debug(String msg) {
-        if (log != null) {
-            log.debug(msg);
-        } else {
-            System.out.println(msg);
-        }
-    }
-
-    @Override
-    public void debug(String format, Object arg) {
-        String message = MessageFormatter.format(format, arg).getMessage();
-        if (log != null) {
-            log.debug(message);
-        } else {
-            System.out.println(message);
-        }
-    }
-
-    @Override
-    public void debug(String format, Object arg1, Object arg2) {
-        String message = MessageFormatter.format(format, arg1, arg2).getMessage();
-        if (log != null) {
-            log.debug(message);
-        } else {
-            System.out.println(message);
-        }
-    }
-
-    @Override
-    public void debug(String format, Object... arguments) {
-        String message = MessageFormatter.format(format, arguments).getMessage();
-        if (log != null) {
-            log.debug(message);
-        } else {
-            System.out.println(message);
-        }
-    }
-
-    @Override
-    public void debug(String msg, Throwable t) {
-        if (log != null) {
-            log.debug(msg, t);
-        } else {
-            System.out.println(msg);
-            t.printStackTrace();
-        }
-    }
-
-    @Override
-    public boolean isInfoEnabled() {
-        if (log != null) {
-            return log.isInfoEnabled();
-        }
-        return true;
-    }
-
-    @Override
-    public void info(String msg) {
-        if (log != null) {
-            log.info(msg);
-        } else {
-            System.out.println(msg);
-        }
-    }
-
-    @Override
-    public void info(String format, Object arg) {
-        String message = MessageFormatter.format(format, arg).getMessage();
-        if (log != null) {
-            log.info(message);
-        } else {
-            System.out.println(message);
-        }
-    }
-
-    @Override
-    public void info(String format, Object arg1, Object arg2) {
-        String message = MessageFormatter.format(format, arg1, arg2).getMessage();
-        if (log != null) {
-            log.info(message);
-        } else {
-            System.out.println(message);
-        }
-    }
-
-    @Override
-    public void info(String format, Object... arguments) {
-        String message = MessageFormatter.format(format, arguments).getMessage();
-        if (log != null) {
-            log.info(message);
-        } else {
-            System.out.println(message);
-        }
-    }
-
-    @Override
-    public void info(String msg, Throwable t) {
-        if (log != null) {
-            log.info(msg, t);
-        } else {
-            System.out.println(msg);
-            t.printStackTrace();
-        }
-    }
-
-    @Override
-    public boolean isWarnEnabled() {
-        if (log != null) {
-            return log.isWarnEnabled();
-        }
-        return true;
-    }
-
-    @Override
-    public void warn(String msg) {
-        if (log != null) {
-            log.warn(msg);
-        } else {
-            System.out.println(msg);
-        }
-    }
-
-    @Override
-    public void warn(String format, Object arg) {
-        String message = MessageFormatter.format(format, arg).getMessage();
-        if (log != null) {
-            log.warn(message);
-        } else {
-            System.out.println(message);
-        }
-    }
-
-    @Override
-    public void warn(String format, Object arg1, Object arg2) {
-        String message = MessageFormatter.format(format, arg1, arg2).getMessage();
-        if (log != null) {
-            log.warn(message);
-        } else {
-            System.out.println(message);
-        }
-    }
-
-    @Override
-    public void warn(String format, Object... arguments) {
-        String message = MessageFormatter.format(format, arguments).getMessage();
-        if (log != null) {
-            log.warn(message);
-        } else {
-            System.out.println(message);
-        }
-    }
-
-    @Override
-    public void warn(String msg, Throwable t) {
-        if (log != null) {
-            log.warn(msg, t);
-        } else {
-            System.out.println(msg);
-            t.printStackTrace();
-        }
-    }
-
-    @Override
-    public boolean isErrorEnabled() {
-        if (log != null) {
-            return log.isErrorEnabled();
-        }
-        return true;
-    }
-
-    @Override
-    public void error(String msg) {
-        if (log != null) {
-            log.error(msg);
-        } else {
-            System.out.println(msg);
-        }
-    }
-
-    @Override
-    public void error(String format, Object arg) {
-        String message = MessageFormatter.format(format, arg).getMessage();
-        if (log != null) {
-            log.error(message);
-        } else {
-            System.out.println(message);
-        }
-    }
-
-    @Override
-    public void error(String format, Object arg1, Object arg2) {
-        String message = MessageFormatter.format(format, arg1, arg2).getMessage();
-        if (log != null) {
-            log.error(message);
-        } else {
-            System.out.println(message);
-        }
-    }
-
-    @Override
-    public void error(String format, Object... arguments) {
-        String message = MessageFormatter.format(format, arguments).getMessage();
-        if (log != null) {
-            log.error(message);
-        } else {
-            System.out.println(message);
-        }
-    }
-
-    @Override
-    public void error(String msg, Throwable t) {
-        if (log != null) {
-            log.error(msg, t);
-        } else {
-            System.out.println(msg);
-            t.printStackTrace();
-        }
-    }
-}
diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/MavenLoggerFactory.java b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/MavenLoggerFactory.java
deleted file mode 100644
index 4e5a2598e..000000000
--- a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/MavenLoggerFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of dependency-check-ant.
- *
- * Licensed 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.
- *
- * Copyright (c) 2013 Jeremy Long. All Rights Reserved.
- */
-package org.owasp.dependencycheck.maven;
-
-import org.apache.maven.plugin.logging.Log;
-import org.slf4j.ILoggerFactory;
-import org.slf4j.Logger;
-
-/**
- * Created by colezlaw on 6/14/15.
- */
-public class MavenLoggerFactory implements ILoggerFactory {
-    private MavenLoggerAdapter mavenLoggerAdapter;
-
-    public MavenLoggerFactory(Log log) {
-        super();
-        this.mavenLoggerAdapter = new MavenLoggerAdapter(log);
-    }
-
-    public Logger getLogger(String name) {
-        return mavenLoggerAdapter;
-    }
-}