Skip to content

Commit de33cee

Browse files
ppkarwaszppkarwasz
committed
Move o.a.l.l.core.parser to samples
1 parent 8481d38 commit de33cee

File tree

14 files changed

+66
-17
lines changed

14 files changed

+66
-17
lines changed

‎log4j-samples-parser/pom.xml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to you under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
<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">
19+
<modelVersion>4.0.0</modelVersion>
20+
<parent>
21+
<groupId>org.apache.logging.log4j.samples</groupId>
22+
<artifactId>log4j-samples</artifactId>
23+
<version>${revision}</version>
24+
</parent>
25+
26+
<artifactId>log4j-samples-parser</artifactId>
27+
<name>Apache Log4j Samples: Event parser</name>
28+
29+
<dependencies>
30+
<dependency>
31+
<groupId>org.apache.logging.log4j</groupId>
32+
<artifactId>log4j-core</artifactId>
33+
</dependency>
34+
<dependency>
35+
<groupId>com.fasterxml.jackson.dataformat</groupId>
36+
<artifactId>jackson-dataformat-xml</artifactId>
37+
</dependency>
38+
<dependency>
39+
<groupId>com.fasterxml.jackson.dataformat</groupId>
40+
<artifactId>jackson-dataformat-yaml</artifactId>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.hamcrest</groupId>
44+
<artifactId>hamcrest</artifactId>
45+
<scope>test</scope>
46+
</dependency>
47+
<dependency>
48+
<groupId>junit</groupId>
49+
<artifactId>junit</artifactId>
50+
<scope>test</scope>
51+
</dependency>
52+
</dependencies>
53+
</project>

‎log4j-core/src/main/java/org/apache/logging/log4j/core/parser/AbstractJacksonLogEventParser.java renamed to ‎log4j-samples-parser/src/main/java/org/apache/logging/log4j/samples/parser/AbstractJacksonLogEventParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.logging.log4j.core.parser;
17+
package org.apache.logging.log4j.samples.parser;
1818

1919
import com.fasterxml.jackson.databind.DeserializationFeature;
2020
import com.fasterxml.jackson.databind.ObjectMapper;

‎log4j-core/src/main/java/org/apache/logging/log4j/core/parser/JsonLogEventParser.java renamed to ‎log4j-samples-parser/src/main/java/org/apache/logging/log4j/samples/parser/JsonLogEventParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.logging.log4j.core.parser;
17+
package org.apache.logging.log4j.samples.parser;
1818

1919
import org.apache.logging.log4j.core.LogEvent;
2020
import org.apache.logging.log4j.core.jackson.Log4jJsonObjectMapper;

‎log4j-core/src/main/java/org/apache/logging/log4j/core/parser/LogEventParser.java renamed to ‎log4j-samples-parser/src/main/java/org/apache/logging/log4j/samples/parser/LogEventParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.logging.log4j.core.parser;
17+
package org.apache.logging.log4j.samples.parser;
1818

1919
import org.apache.logging.log4j.core.LogEvent;
2020

‎log4j-core/src/main/java/org/apache/logging/log4j/core/parser/ParseException.java renamed to ‎log4j-samples-parser/src/main/java/org/apache/logging/log4j/samples/parser/ParseException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.logging.log4j.core.parser;
17+
package org.apache.logging.log4j.samples.parser;
1818

1919
/**
2020
* Thrown when the input cannot be parsed.

‎log4j-core/src/main/java/org/apache/logging/log4j/core/parser/TextLogEventParser.java renamed to ‎log4j-samples-parser/src/main/java/org/apache/logging/log4j/samples/parser/TextLogEventParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.logging.log4j.core.parser;
17+
package org.apache.logging.log4j.samples.parser;
1818

1919
import org.apache.logging.log4j.core.LogEvent;
2020

‎log4j-core/src/main/java/org/apache/logging/log4j/core/parser/XmlLogEventParser.java renamed to ‎log4j-samples-parser/src/main/java/org/apache/logging/log4j/samples/parser/XmlLogEventParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.logging.log4j.core.parser;
17+
package org.apache.logging.log4j.samples.parser;
1818

1919
import org.apache.logging.log4j.core.LogEvent;
2020
import org.apache.logging.log4j.core.jackson.Log4jXmlObjectMapper;

‎log4j-core/src/main/java/org/apache/logging/log4j/core/parser/YamlLogEventParser.java renamed to ‎log4j-samples-parser/src/main/java/org/apache/logging/log4j/samples/parser/YamlLogEventParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.logging.log4j.core.parser;
17+
package org.apache.logging.log4j.samples.parser;
1818

1919
import org.apache.logging.log4j.core.LogEvent;
2020
import org.apache.logging.log4j.core.jackson.Log4jYamlObjectMapper;

‎log4j-core/src/main/java/org/apache/logging/log4j/core/parser/package-info.java renamed to ‎log4j-samples-parser/src/main/java/org/apache/logging/log4j/samples/parser/package-info.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,4 @@
1717
/**
1818
* Parsers for the output of various layouts.
1919
*/
20-
@Export
21-
@Version("2.20.1")
22-
package org.apache.logging.log4j.core.parser;
23-
24-
import org.osgi.annotation.bundle.Export;
25-
import org.osgi.annotation.versioning.Version;
20+
package org.apache.logging.log4j.samples.parser;

‎log4j-core-test/src/test/java/org/apache/logging/log4j/core/parser/JsonLogEventParserTest.java renamed to ‎log4j-samples-parser/src/test/java/org/apache/logging/log4j/samples/parser/JsonLogEventParserTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.logging.log4j.core.parser;
17+
package org.apache.logging.log4j.samples.parser;
1818

1919
import java.nio.charset.StandardCharsets;
2020
import org.apache.logging.log4j.core.LogEvent;

‎log4j-core-test/src/test/java/org/apache/logging/log4j/core/parser/LogEventParserTest.java renamed to ‎log4j-samples-parser/src/test/java/org/apache/logging/log4j/samples/parser/LogEventParserTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.logging.log4j.core.parser;
17+
package org.apache.logging.log4j.samples.parser;
1818

1919
import static org.hamcrest.CoreMatchers.equalTo;
2020
import static org.hamcrest.CoreMatchers.notNullValue;

‎log4j-core-test/src/test/java/org/apache/logging/log4j/core/parser/XmlLogEventParserTest.java renamed to ‎log4j-samples-parser/src/test/java/org/apache/logging/log4j/samples/parser/XmlLogEventParserTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.logging.log4j.core.parser;
17+
package org.apache.logging.log4j.samples.parser;
1818

1919
import java.nio.charset.StandardCharsets;
2020
import org.apache.logging.log4j.core.LogEvent;

‎log4j-core-test/src/test/java/org/apache/logging/log4j/core/parser/YamlLogEventParserTest.java renamed to ‎log4j-samples-parser/src/test/java/org/apache/logging/log4j/samples/parser/YamlLogEventParserTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.logging.log4j.core.parser;
17+
package org.apache.logging.log4j.samples.parser;
1818

1919
import java.nio.charset.StandardCharsets;
2020
import org.apache.logging.log4j.core.LogEvent;

‎pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<module>log4j-samples-flume-remote</module>
4242
<module>log4j-samples-jlink</module>
4343
<module>log4j-samples-loggerProperties</module>
44+
<module>log4j-samples-parser</module>
4445
<module>log4j-server</module>
4546
<module>log4j-spring-cloud-config-sample-application</module>
4647
<module>log4j-spring-cloud-config-sample-server</module>

0 commit comments

Comments
 (0)