You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2018/09/23 17:33:56 UTC
[1/3] logging-log4j-audit git commit: [LOG4J2-2452]
Repository: logging-log4j-audit
Updated Branches:
refs/heads/master 8b56411df -> 9c8d514b6
[LOG4J2-2452]
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/commit/478dfb78
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/tree/478dfb78
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/diff/478dfb78
Branch: refs/heads/master
Commit: 478dfb784fb14b2ba6aa013d56c075fe053f6315
Parents: 07e5419
Author: Andrei Ivanov <an...@arnia.ro>
Authored: Sun Sep 23 14:25:41 2018 +0300
Committer: Andrei Ivanov <an...@arnia.ro>
Committed: Sun Sep 23 14:25:41 2018 +0300
----------------------------------------------------------------------
.../logging/log4j/audit/generator/ClassGenerator.java | 13 +++++++++++--
.../log4j/audit/generator/InterfacesGenerator.java | 8 ++++++++
.../apache/logging/log4j/audit/plugin/AuditMojo.java | 7 +++++++
.../src/site/markdown/index.md | 2 ++
4 files changed, 28 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/478dfb78/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java
----------------------------------------------------------------------
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java
index 31a3bf4..50aa034 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java
@@ -29,6 +29,8 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.audit.util.NamingUtils;
import static org.apache.logging.log4j.audit.generator.Constants.*;
@@ -37,6 +39,7 @@ import static org.apache.logging.log4j.audit.generator.Constants.*;
* Generates the Classes and Interfaces for Audit Logging based on data in the Catalog.
*/
public final class ClassGenerator {
+ private static final Logger LOGGER = LogManager.getLogger(ClassGenerator.class);
protected List<AccessorDefinition> beanMethods = new ArrayList<AccessorDefinition>();
private boolean isClass = true;
@@ -45,6 +48,7 @@ public final class ClassGenerator {
private String packageName;
private String baseFolder;
private String javadocComment;
+ private boolean verbose;
private List<String> implementsDeclarations = new ArrayList<>();
private Set<String> importsDeclarations = new HashSet<String>();
@@ -211,7 +215,9 @@ public final class ClassGenerator {
sb.append("/").append(NamingUtils.upperFirst(getClassName()))
.append(".java");
String fullPath = sb.toString();
- System.out.println(fullPath);
+ if (verbose) {
+ LOGGER.info(fullPath);
+ }
File file = new File(fullPath);
DataOutputStream out = new DataOutputStream(openOutputStream(file));
out.writeBytes(getClassContents());
@@ -352,4 +358,7 @@ public final class ClassGenerator {
return new FileOutputStream(file, false);
}
-}
+ public void setVerbose(boolean verbose) {
+ this.verbose = verbose;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/478dfb78/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/InterfacesGenerator.java
----------------------------------------------------------------------
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/InterfacesGenerator.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/InterfacesGenerator.java
index 1efd1e4..8a4ab09 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/InterfacesGenerator.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/InterfacesGenerator.java
@@ -81,6 +81,9 @@ public class InterfacesGenerator {
@Value("${enterpriseId:18060}")
private int enterpriseId;
+ @Value("${verbose:false}")
+ private boolean verbose;
+
public CatalogReader getCatalogReader() {
return catalogReader;
}
@@ -113,6 +116,10 @@ public class InterfacesGenerator {
this.enterpriseId = enterpriseId;
}
+ public void setVerbose(boolean verbose) {
+ this.verbose = verbose;
+ }
+
public void generateSource() throws Exception {
boolean errors = false;
CatalogData catalogData = catalogReader.read();
@@ -147,6 +154,7 @@ public class InterfacesGenerator {
classGenerator.setPackageName(packageName);
classGenerator.setParentClassName(PARENT_CLASS);
classGenerator.setJavadocComment(event.getDescription());
+ classGenerator.setVerbose(verbose);
Set<String> imports = classGenerator.getImports();
imports.add(PARENT_IMPORT);
StringBuilder annotations = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/478dfb78/log4j-audit/log4j-audit-maven-plugin/src/main/java/org/apache/logging/log4j/audit/plugin/AuditMojo.java
----------------------------------------------------------------------
diff --git a/log4j-audit/log4j-audit-maven-plugin/src/main/java/org/apache/logging/log4j/audit/plugin/AuditMojo.java b/log4j-audit/log4j-audit-maven-plugin/src/main/java/org/apache/logging/log4j/audit/plugin/AuditMojo.java
index 8879de5..9f3797a 100644
--- a/log4j-audit/log4j-audit-maven-plugin/src/main/java/org/apache/logging/log4j/audit/plugin/AuditMojo.java
+++ b/log4j-audit/log4j-audit-maven-plugin/src/main/java/org/apache/logging/log4j/audit/plugin/AuditMojo.java
@@ -65,6 +65,12 @@ public class AuditMojo extends AbstractMojo {
@Parameter(required = false)
private int enterpriseId;
+ /**
+ * Set to <code>true</code> to show messages about what the code generator is doing.
+ */
+ @Parameter(defaultValue = "false")
+ private boolean verbose;
+
@SuppressWarnings("unchecked")
public void execute() throws MojoExecutionException {
if (maxKeyLength <= 0) {
@@ -111,6 +117,7 @@ public class AuditMojo extends AbstractMojo {
generator.setPackageName(packageName);
generator.setMaxKeyLength(maxKeyLength);
generator.setEnterpriseId(enterpriseId);
+ generator.setVerbose(verbose);
try {
generator.generateSource();
project.addCompileSourceRoot(outputDirectory.getAbsolutePath());
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/478dfb78/log4j-audit/log4j-audit-maven-plugin/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/log4j-audit/log4j-audit-maven-plugin/src/site/markdown/index.md b/log4j-audit/log4j-audit-maven-plugin/src/site/markdown/index.md
index 841fc8b..a061829 100644
--- a/log4j-audit/log4j-audit-maven-plugin/src/site/markdown/index.md
+++ b/log4j-audit/log4j-audit-maven-plugin/src/site/markdown/index.md
@@ -35,6 +35,8 @@ be created</td><td>${project.build.directory}/generated-sources/log4j-audit</td>
<td>32 - the maximum allowed to be compliant with RFC 5424</td></tr>
<tr><td>enterpriseId</td><td>int</td><td>-</td><td>false</td><td>The IANA enterprise id for RFC 5424 events</td>
<td>18060</td></tr>
+<tr><td>verbose</td><td>boolean</td><td>1.1.0</td><td>false</td><td>Set to <code>true</code> to show messages about what the code generator is doing.</td>
+<td>false</td></tr>
</table>
Below is a sample configuration.
[2/3] logging-log4j-audit git commit: Closes #9
Posted by rg...@apache.org.
Closes #9
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/commit/937a035a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/tree/937a035a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/diff/937a035a
Branch: refs/heads/master
Commit: 937a035a00e308e149240d0bdb4356dca1346562
Parents: 8b56411 478dfb7
Author: Ralph Goers <rg...@apache.org>
Authored: Sun Sep 23 07:21:38 2018 -1000
Committer: Ralph Goers <rg...@apache.org>
Committed: Sun Sep 23 07:21:38 2018 -1000
----------------------------------------------------------------------
.../logging/log4j/audit/generator/ClassGenerator.java | 13 +++++++++++--
.../log4j/audit/generator/InterfacesGenerator.java | 8 ++++++++
.../apache/logging/log4j/audit/plugin/AuditMojo.java | 7 +++++++
.../src/site/markdown/index.md | 2 ++
4 files changed, 28 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/3] logging-log4j-audit git commit: LOG4J2-2452 - Add verbose
parameter to the Log4j audit Maven plugin
Posted by rg...@apache.org.
LOG4J2-2452 - Add verbose parameter to the Log4j audit Maven plugin
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/commit/9c8d514b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/tree/9c8d514b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/diff/9c8d514b
Branch: refs/heads/master
Commit: 9c8d514b663a840d2cfb52d9785c2b833e0582ec
Parents: 937a035
Author: Ralph Goers <rg...@apache.org>
Authored: Sun Sep 23 07:23:11 2018 -1000
Committer: Ralph Goers <rg...@apache.org>
Committed: Sun Sep 23 07:23:11 2018 -1000
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/9c8d514b/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 74fe82b..ede29af 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -32,6 +32,9 @@
-->
<release version="1.0.1" date="YYYY-MM-DD" description="Release 1.0.1">
<action issue="LOG4J2-2421" dev="rgoers" type="fix" due-to="Andrei Ivanov">
+ Add verbose parameter to the Log4j audit Maven plugin.
+ </action>
+ <action issue="LOG4J2-2421" dev="rgoers" type="fix" due-to="Andrei Ivanov">
AbstractEventLogger.logEvent doesn't check for missing required context attributes.
</action>
<action issue="LOG4J2-2417" dev="rgoers" type="fix" due-to="Andrei Ivanov">