summaryrefslogtreecommitdiffstats
path: root/misc/log4j
diff options
context:
space:
mode:
authorInstrumental <jcgmisc@stl.gathman.org>2018-04-02 17:41:10 -0500
committerInstrumental <jcgmisc@stl.gathman.org>2018-04-02 17:42:06 -0500
commit67bac2c1c44beab7752b39584553449e1c8a4e94 (patch)
tree40f0023bc420e0cc947a1d81f235e04f8bf925f3 /misc/log4j
parent1eb6678db673759f0f95b1aedfcb4fe55c7152a2 (diff)
Keep only clean TestCases, remove 2 license issues
Issue-ID: AAF-111 Change-Id: I7f779f4beacc84427734ce2c5b0369d5727e136d Signed-off-by: Instrumental <jcgmisc@stl.gathman.org>
Diffstat (limited to 'misc/log4j')
-rw-r--r--misc/log4j/pom.xml103
-rw-r--r--misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/LogFileNamer.java8
-rw-r--r--misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/PIDAccess.java30
-rw-r--r--misc/log4j/src/test/java/org/onap/aaf/misc/env/log4j/LogTest.java45
-rw-r--r--misc/log4j/src/test/resources/.gitignore1
5 files changed, 65 insertions, 122 deletions
diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml
index f8e60bdd..d6c4a7e5 100644
--- a/misc/log4j/pom.xml
+++ b/misc/log4j/pom.xml
@@ -70,15 +70,13 @@
</developers>
<properties>
- <!-- SONAR -->
- <jacoco.version>0.7.7.201606060606</jacoco.version>
- <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
- <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
- <!-- Default Sonar configuration -->
- <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
- <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
- <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
- <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+ <jacocoVersion>0.7.6.201602180812</jacocoVersion>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <encoding>UTF-8</encoding>
+ <sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
+ <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
+ <enforcer.skip>true</enforcer.skip>
+
<nexusproxy>https://nexus.onap.org</nexusproxy>
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@ -123,57 +121,82 @@
<serverId>ecomp-staging</serverId>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.sonarsource.scanner.maven</groupId>
+ <artifactId>sonar-maven-plugin</artifactId>
+ <version>3.2</version>
+ </plugin>
+ <!-- Jacoco -->
<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>
+ <!-- Override OParent version -->
+ <version>${jacocoVersion}</version>
<executions>
+ <!-- disable jacoco executions from oparent -->
<execution>
<id>pre-unit-test</id>
+ <phase>none</phase>
+ </execution>
+ <execution>
+ <id>post-unit-test</id>
+ <phase>none</phase>
+ </execution>
+ <execution>
+ <id>pre-integration-test</id>
+ <phase>none</phase>
+ </execution>
+ <execution>
+ <id>post-integration-test</id>
+ <phase>none</phase>
+ </execution>
+ <!-- Order matters -->
+ <execution>
+ <id>portal-prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
<configuration>
- <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
- <!-- <append>true</append> -->
+ <destFile>${sonar.jacoco.reportPath}</destFile>
</configuration>
</execution>
+ <!-- offline instrumentation for PowerMock -->
<execution>
- <id>pre-integration-test</id>
- <phase>pre-integration-test</phase>
+ <id>portal-offline-instrument</id>
<goals>
- <goal>prepare-agent</goal>
+ <goal>instrument</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>portal-restore-instrumented-classes</id>
+ <phase>test</phase>
+ <goals>
+ <goal>restore-instrumented-classes</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>portal-post-unit-test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>report</goal>
</goals>
<configuration>
- <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
- <!-- <append>true</append> -->
+ <dataFile>${sonar.jacoco.reportPath}</dataFile>
+ <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
</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>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/LogFileNamer.java b/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/LogFileNamer.java
index f8c6611e..7174912f 100644
--- a/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/LogFileNamer.java
+++ b/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/LogFileNamer.java
@@ -25,9 +25,7 @@ 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("/")) {
@@ -35,11 +33,9 @@ public class LogFileNamer {
} else {
this.root = root + "-";
}
- printPID=true;
}
public LogFileNamer noPID() {
- printPID = false;
return this;
}
/**
@@ -57,12 +53,12 @@ public class LogFileNamer {
String rv;
System.setProperty(
"LOG4J_FILENAME_"+(rv=appender.substring(0,pipe)),
- root + appender.substring(pipe+1) + (printPID?('-' + pid):"") + ".log");
+ root + appender.substring(pipe+1) + ".log");
return rv;
} else {
System.setProperty(
"LOG4J_FILENAME_"+appender,
- root + appender + (printPID?('-' + pid):"") + ".log");
+ root + appender + ".log");
return appender;
}
diff --git a/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/PIDAccess.java b/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/PIDAccess.java
deleted file mode 100644
index 6e23ce63..00000000
--- a/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/PIDAccess.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * ============LICENSE_START====================================================
- * org.onap.aaf
- * ===========================================================================
- * Copyright (c) 2018 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====================================================
- *
- */
-
-package org.onap.aaf.misc.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/misc/log4j/src/test/java/org/onap/aaf/misc/env/log4j/LogTest.java b/misc/log4j/src/test/java/org/onap/aaf/misc/env/log4j/LogTest.java
deleted file mode 100644
index d5c9062f..00000000
--- a/misc/log4j/src/test/java/org/onap/aaf/misc/env/log4j/LogTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * ============LICENSE_START====================================================
- * org.onap.aaf
- * ===========================================================================
- * Copyright (c) 2018 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====================================================
- *
- */
-
-package org.onap.aaf.misc.env.log4j;
-
-import java.util.logging.Logger;
-
-import org.onap.aaf.misc.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/misc/log4j/src/test/resources/.gitignore b/misc/log4j/src/test/resources/.gitignore
deleted file mode 100644
index 2079777e..00000000
--- a/misc/log4j/src/test/resources/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/log4j-test.properties