From 82efa7f7b2f4b1079d01d0f9c0a2b4ca43e9a24d Mon Sep 17 00:00:00 2001 From: Instrumental Date: Mon, 26 Mar 2018 11:37:12 -0700 Subject: Remove Code from inno, it is now in authz Issue-ID: AAF-193 Change-Id: I5b80daa8344559bc86c82cbaa85c29e0eea54ebb Signed-off-by: Instrumental --- log4j/pom.xml | 192 --------------------- .../org/onap/aaf/inno/env/log4j/LogFileNamer.java | 82 --------- .../org/onap/aaf/inno/env/log4j/PIDAccess.java | 31 ---- .../java/org/onap/aaf/inno/env/log4j/LogTest.java | 46 ----- log4j/src/test/resources/log4j-test.properties | 61 ------- 5 files changed, 412 deletions(-) delete mode 100644 log4j/pom.xml delete mode 100644 log4j/src/main/java/org/onap/aaf/inno/env/log4j/LogFileNamer.java delete mode 100644 log4j/src/main/java/org/onap/aaf/inno/env/log4j/PIDAccess.java delete mode 100644 log4j/src/test/java/org/onap/aaf/inno/env/log4j/LogTest.java delete mode 100644 log4j/src/test/resources/log4j-test.properties (limited to 'log4j') diff --git a/log4j/pom.xml b/log4j/pom.xml deleted file mode 100644 index ffd449b..0000000 --- a/log4j/pom.xml +++ /dev/null @@ -1,192 +0,0 @@ - - - - org.onap.aaf.inno - parent - 1.0.0-SNAPSHOT - .. - - - Log4J Elements - log4j - jar - 4.0.0 - https://github.com/att/AAF - INNO - - - BSD License - - - - - - - Jonathan Gathman - - ATT - - - - - UTF-8 - 1.0.0-SNAPSHOT - java - true - jacoco - ${project.build.directory}/surefire-reports - ${project.build.directory}/coverage-reports/jacoco.exec - ${project.build.directory}/coverage-reports/jacoco-it.exec - true - ${project.version} - https://nexus.onap.org - /content/repositories/snapshots/ - /content/repositories/releases/ - /content/repositories/staging/ - /content/sites/site/org/onap/aaf/inno/${project.artifactId}/${project.version} - - - - org.onap.aaf.inno - env - ${project.version} - - - - net.java.dev.jna - jna-platform - 4.0.0 - - - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.6 - - false - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - - - org.jacoco - jacoco-maven-plugin - 0.7.7.201606060606 - - true - - org.onap.aaf.* - - - - - pre-unit-test - - prepare-agent - - - ${project.build.directory}/coverage-reports/jacoco.exec - - - - - pre-integration-test - pre-integration-test - - prepare-agent - - - ${project.build.directory}/coverage-reports/jacoco-it.exec - - - - - - merge - - post-integration-test - - - - ${project.build.directory}/coverage-reports - - *.exec - - - - ${project.build.directory}/jacoco-dev.exec - - - - - - - - - - ecomp-releases - AAF Release Repository - ${nexusproxy}${releaseNexusPath} - - - ecomp-snapshots - AAF Snapshot Repository - ${nexusproxy}${snapshotNexusPath} - - - ecomp-site - dav:${nexusproxy}${sitePath} - - - - diff --git a/log4j/src/main/java/org/onap/aaf/inno/env/log4j/LogFileNamer.java b/log4j/src/main/java/org/onap/aaf/inno/env/log4j/LogFileNamer.java deleted file mode 100644 index e1abe10..0000000 --- a/log4j/src/main/java/org/onap/aaf/inno/env/log4j/LogFileNamer.java +++ /dev/null @@ -1,82 +0,0 @@ -/******************************************************************************* - * ============LICENSE_START==================================================== - * * org.onap.aaf - * * =========================================================================== - * * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * * =========================================================================== - * * 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. - * * ============LICENSE_END==================================================== - * * - * * ECOMP is a trademark and service mark of AT&T Intellectual Property. - * * - ******************************************************************************/ -package org.onap.aaf.inno.env.log4j; - -import java.io.File; -import java.net.URL; - -public class LogFileNamer { - public static final int pid = PIDAccess.INSTANCE.getpid(); - public final String root; - private boolean printPID; - - public LogFileNamer(String root) { - if(root==null || "".equals(root) || root.endsWith("/")) { - this.root = root; - } else { - this.root = root + "-"; - } - printPID=true; - } - - public LogFileNamer noPID() { - printPID = false; - return this; - } - /** - * Accepts a String. - * If Separated by "|" then first part is the Appender name, and the second is used in the FileNaming - * (This is to allow for shortened Logger names, and more verbose file names) - * - * @param appender - * - * returns the String Appender - */ - public String setAppender(String appender) { - int pipe = appender.indexOf('|'); - if(pipe>=0) { - String rv; - System.setProperty( - "LOG4J_FILENAME_"+(rv=appender.substring(0,pipe)), - root + appender.substring(pipe+1) + (printPID?('-' + pid):"") + ".log"); - return rv; - } else { - System.setProperty( - "LOG4J_FILENAME_"+appender, - root + appender + (printPID?('-' + pid):"") + ".log"); - return appender; - } - - } - - public void configure(String props) { - String fname; - if(new File(fname="etc/"+props).exists()) { - org.apache.log4j.PropertyConfigurator.configureAndWatch(fname,60*1000); - } else { - URL rsrc = ClassLoader.getSystemResource(props); - if(rsrc==null) System.err.println("Neither File: " + fname + " or resource on Classpath " + props + " exist" ); - org.apache.log4j.PropertyConfigurator.configure(rsrc); - } - } -} diff --git a/log4j/src/main/java/org/onap/aaf/inno/env/log4j/PIDAccess.java b/log4j/src/main/java/org/onap/aaf/inno/env/log4j/PIDAccess.java deleted file mode 100644 index 1a949a7..0000000 --- a/log4j/src/main/java/org/onap/aaf/inno/env/log4j/PIDAccess.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * ============LICENSE_START==================================================== - * * org.onap.aaf - * * =========================================================================== - * * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * * =========================================================================== - * * 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. - * * ============LICENSE_END==================================================== - * * - * * ECOMP is a trademark and service mark of AT&T Intellectual Property. - * * - ******************************************************************************/ -package org.onap.aaf.inno.env.log4j; - -import com.sun.jna.Library; -import com.sun.jna.Native; - -public interface PIDAccess extends Library { - PIDAccess INSTANCE = (PIDAccess) Native.loadLibrary("c", PIDAccess.class); - int getpid (); -} diff --git a/log4j/src/test/java/org/onap/aaf/inno/env/log4j/LogTest.java b/log4j/src/test/java/org/onap/aaf/inno/env/log4j/LogTest.java deleted file mode 100644 index d34ed19..0000000 --- a/log4j/src/test/java/org/onap/aaf/inno/env/log4j/LogTest.java +++ /dev/null @@ -1,46 +0,0 @@ -/******************************************************************************* - * ============LICENSE_START==================================================== - * * org.onap.aaf - * * =========================================================================== - * * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * * =========================================================================== - * * 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. - * * ============LICENSE_END==================================================== - * * - * * ECOMP is a trademark and service mark of AT&T Intellectual Property. - * * - ******************************************************************************/ -package org.onap.aaf.inno.env.log4j; - -import java.util.logging.Logger; - -import org.onap.aaf.inno.env.log4j.LogFileNamer; - - -public class LogTest -{ - public static void main(String[] args) throws Exception - { - LogFileNamer lfn = new LogFileNamer("authz"); - lfn.setAppender("service"); - lfn.setAppender("init"); - lfn.setAppender("audit"); - lfn.setAppender("test"); - lfn.configure("src/test/resources/log4j-test.properties"); - Logger log = Logger.getLogger( "init" ); - - - - log.info("Hello"); - } -} diff --git a/log4j/src/test/resources/log4j-test.properties b/log4j/src/test/resources/log4j-test.properties deleted file mode 100644 index ff29059..0000000 --- a/log4j/src/test/resources/log4j-test.properties +++ /dev/null @@ -1,61 +0,0 @@ -#------------------------------------------------------------------------------- -# ============LICENSE_START==================================================== -# * org.onap.aaf -# * =========================================================================== -# * Copyright © 2017 AT&T Intellectual Property. All rights reserved. -# * =========================================================================== -# * 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. -# * ============LICENSE_END==================================================== -# * -# * ECOMP is a trademark and service mark of AT&T Intellectual Property. -# * -#------------------------------------------------------------------------------- -############################################################################### -# Copyright (c) 2016 AT&T Intellectual Property. All rights reserved. -############################################################################### -# -# 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. -# -log4j.rootLogger=INFO,test - -log4j.appender.test=org.apache.log4j.RollingFileAppender -#log4j.appender.test.File=logs/cdv-${PID}.log -log4j.appender.test.File=logs/${LOG4J_FILENAME_test} -log4j.appender.test.MaxFileSize=10000KB -log4j.appender.test.MaxBackupIndex=7 -log4j.appender.test.layout=org.apache.log4j.PatternLayout -log4j.appender.test.layout.ConversionPattern=%d %p [%c] - %m %n - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m %n - -# General Apache libraries -log4j.logger.org.apache=WARN - -log4j.DEBUG=true -- cgit 1.2.3-korg