Remove Code from inno, it is now in authz

Issue-ID: AAF-193
Change-Id: I5b80daa8344559bc86c82cbaa85c29e0eea54ebb
Signed-off-by: Instrumental <jcgmisc@stl.gathman.org>

5 files changed, 0 insertions, 412 deletions

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 @@
-<!--

-  ============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.

-  *

--->

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-<parent>

-		<groupId>org.onap.aaf.inno</groupId>

-		<artifactId>parent</artifactId>

-		<version>1.0.0-SNAPSHOT</version>

-		<relativePath>..</relativePath>

-	</parent>

-	

-	<name>Log4J Elements</name>

-	<artifactId>log4j</artifactId>

-	<packaging>jar</packaging>

-	<modelVersion>4.0.0</modelVersion>

-	<url>https://github.com/att/AAF</url>

-	<description>INNO</description>

-	<licenses>

-		<license>

-		<name>BSD License</name>

-		<url> </url>

-		</license>

-	</licenses>

-

-	<developers>

-		<developer>

-		<name>Jonathan Gathman</name>

-		<email></email>

-	<organization>ATT</organization>

-	<organizationUrl></organizationUrl>

-		</developer>

-	</developers>

-<properties>

-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

-		<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>

-		<sonar.language>java</sonar.language>

-		<sonar.skip>true</sonar.skip>

-		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>

-		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>

-		<sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>

-		<sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>

-		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>

-		<sonar.projectVersion>${project.version}</sonar.projectVersion>

-        <nexusproxy>https://nexus.onap.org</nexusproxy>

-		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>

-		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>

-		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>

-		<sitePath>/content/sites/site/org/onap/aaf/inno/${project.artifactId}/${project.version}</sitePath>

-	</properties>

-	<dependencies>

-		<dependency>

-			<groupId>org.onap.aaf.inno</groupId>

-			<artifactId>env</artifactId>

-			<version>${project.version}</version>

-		</dependency>

-		

-		<dependency>

-			<groupId>net.java.dev.jna</groupId>

-			<artifactId>jna-platform</artifactId>

-			<version>4.0.0</version>

-		</dependency>

-	

-	</dependencies>

-	

-	

-

-	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-deploy-plugin</artifactId>

-				<version>2.6</version>

-				<configuration>

-					<skip>false</skip>

-				</configuration>

-			</plugin>

-	       <plugin>

-		      <groupId>org.apache.maven.plugins</groupId>

-		      <artifactId>maven-source-plugin</artifactId>

-		      <version>2.2.1</version>

-		      <executions>

-			<execution>

-			  <id>attach-sources</id>

-			  <goals>

-			    <goal>jar-no-fork</goal>

-			  </goals>

-			</execution>

-		      </executions>

-		    </plugin>

-        <plugin>

-				<groupId>org.sonatype.plugins</groupId>

-				<artifactId>nexus-staging-maven-plugin</artifactId>

-				<version>1.6.7</version>

-				<extensions>true</extensions>

-				<configuration>

-					<nexusUrl>${nexusproxy}</nexusUrl>

-					<stagingProfileId>176c31dfe190a</stagingProfileId>

-					<serverId>ecomp-staging</serverId>

-				</configuration>

-			</plugin>		

-			<plugin>

-				<groupId>org.jacoco</groupId>

-				<artifactId>jacoco-maven-plugin</artifactId>

-				<version>0.7.7.201606060606</version>

-				<configuration>

-					<dumpOnExit>true</dumpOnExit>

-					<includes>

-						<include>org.onap.aaf.*</include>

-					</includes>

-				</configuration>

-				<executions>

-					<execution>

-						<id>pre-unit-test</id>

-						<goals>

-							<goal>prepare-agent</goal>

-						</goals>

-						<configuration>

-							<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>

-							<!-- <append>true</append> -->

-						</configuration>

-					</execution>

-					<execution>

-						<id>pre-integration-test</id>

-						<phase>pre-integration-test</phase>

-						<goals>

-							<goal>prepare-agent</goal>

-						</goals>

-						<configuration>

-							<destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>

-							<!-- <append>true</append> -->

-						</configuration>

-					</execution>

-					<execution>

-                        <goals>

-                            <goal>merge</goal>

-                        </goals>

-                        <phase>post-integration-test</phase>

-                        <configuration>

-                            <fileSets>

-                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">

-                                    <directory>${project.build.directory}/coverage-reports</directory>

-                                    <includes>

-                                        <include>*.exec</include>

-                                    </includes>

-                                </fileSet>

-                            </fileSets>

-                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>

-                        </configuration>

-                    </execution>

-				</executions>

-			</plugin>

-			

-		</plugins>

-	</build>

-	<distributionManagement>

-		<repository>

-			<id>ecomp-releases</id>

-			<name>AAF Release Repository</name>

-			<url>${nexusproxy}${releaseNexusPath}</url>

-		</repository>

-		<snapshotRepository>

-			<id>ecomp-snapshots</id>

-			<name>AAF Snapshot Repository</name>

-			<url>${nexusproxy}${snapshotNexusPath}</url>

-		</snapshotRepository>

-		<site>

-			<id>ecomp-site</id>

-			<url>dav:${nexusproxy}${sitePath}</url>

-		</site>

-	</distributionManagement>

-	

-</project>

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