Added log4j and jul to gradle.

huxi · Aug 2, 2010 · e280134 · e280134
1 parent 83c2fb0
commit e280134
Show file tree

Hide file tree

Showing 34 changed files with 58 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -86,7 +86,14 @@ artifactMapping = [
 'shutdown-context-listener':      'de.huxhorn.lilith.logback.servlet',
 'encoder-core':                   'de.huxhorn.lilith.logback.encoder.core',
 'encoder-classic':                'de.huxhorn.lilith.logback.encoder.classic',
-'encoder-access':                 'de.huxhorn.lilith.logback.encoder.access'
+'encoder-access':                 'de.huxhorn.lilith.logback.encoder.access',
+'log4j':                          'log4j', // ignore
+'log4j-throwable-parser':         'de.huxhorn.lilith.log4j.throwable',
+'log4j-xml':                      'de.huxhorn.lilith.log4j.xml',
+'log4j-producer':                 'de.huxhorn.lilith.log4j.producer',
+'jul':                            'jul', // ignore
+'jul-xml':                        'de.huxhorn.lilith.jul.xml',
+'jul-slf4j-handler':              'de.huxhorn.lilith.jul-slf4j-handler'
 ]
 
 dependsOnChildren()

diff --git a/jul/jul-slf4j-handler/build.gradle b/jul/jul-slf4j-handler/build.gradle
@@ -0,0 +1,4 @@
+dependencies {
+	compile libraries.'slf4j-api'
+}
+
diff --git a/jul/jul-xml/build.gradle b/jul/jul-xml/build.gradle
@@ -0,0 +1,13 @@
+dependencies {
+	compile project(':lilith-data:logging')
+	compile libraries.'sulky-stax'
+	compile libraries.'sulky-tasks'
+	compile libraries.'sulky-buffers'
+	compile libraries.'slf4j-api'
+	compile libraries.'commons-io'
+	compile libraries.'sulky-io'
+	compile libraries.'stax-api'
+	testRuntime libraries.'stax'
+	testCompile project(':lilith-data:eventsource')
+}
+
diff --git a/jul/xml/pom.xml → jul/jul-xml/pom.xml b/jul/xml/pom.xml → jul/jul-xml/pom.xml
diff --git a/...orn/lilith/jul/xml/JulImportCallable.java → ...orn/lilith/jul/xml/JulImportCallable.java b/...orn/lilith/jul/xml/JulImportCallable.java → ...orn/lilith/jul/xml/JulImportCallable.java
diff --git a/...rn/lilith/jul/xml/LoggingEventReader.java → ...rn/lilith/jul/xml/LoggingEventReader.java b/...rn/lilith/jul/xml/LoggingEventReader.java → ...rn/lilith/jul/xml/LoggingEventReader.java
diff --git a/.../jul/xml/LoggingEventSchemaConstants.java → .../jul/xml/LoggingEventSchemaConstants.java b/.../jul/xml/LoggingEventSchemaConstants.java → .../jul/xml/LoggingEventSchemaConstants.java
diff --git a/...lilith/jul/xml/JulImportCallableTest.java → ...lilith/jul/xml/JulImportCallableTest.java b/...lilith/jul/xml/JulImportCallableTest.java → ...lilith/jul/xml/JulImportCallableTest.java
diff --git a/...ilith/jul/xml/LoggingEventReaderTest.java → ...ilith/jul/xml/LoggingEventReaderTest.java b/...ilith/jul/xml/LoggingEventReaderTest.java → ...ilith/jul/xml/LoggingEventReaderTest.java
diff --git a/jul/xml/src/test/resources/logback-test.xml → ...l-xml/src/test/resources/logback-test.xml b/jul/xml/src/test/resources/logback-test.xml → ...l-xml/src/test/resources/logback-test.xml
diff --git a/jul/xml/src/test/resources/testcases/log.xml → ...-xml/src/test/resources/testcases/log.xml b/jul/xml/src/test/resources/testcases/log.xml → ...-xml/src/test/resources/testcases/log.xml
diff --git a/jul/pom.xml b/jul/pom.xml
@@ -18,7 +18,7 @@
 	</parent>
 
 	<modules>
-		<module>xml</module>
+		<module>jul-xml</module>
 		<module>jul-slf4j-handler</module>
 	</modules>
 

diff --git a/log4j/log4j-producer/build.gradle b/log4j/log4j-producer/build.gradle
@@ -0,0 +1,9 @@
+dependencies {
+	compile project(':lilith-data:logging')
+	compile project(':log4j:log4j-throwable-parser')
+	compile libraries.'sulky-buffers'
+	compile project(':lilith-engine')
+	compile libraries.'slf4j-api'
+	compile libraries.'log4j'
+}
+
diff --git a/log4j/producer/pom.xml → log4j/log4j-producer/pom.xml b/log4j/producer/pom.xml → log4j/log4j-producer/pom.xml
diff --git a/...h/log4j/producer/Log4jLoggingAdapter.java → ...h/log4j/producer/Log4jLoggingAdapter.java b/...h/log4j/producer/Log4jLoggingAdapter.java → ...h/log4j/producer/Log4jLoggingAdapter.java
diff --git a/...ggingServerSocketEventSourceProducer.java → ...ggingServerSocketEventSourceProducer.java b/...ggingServerSocketEventSourceProducer.java → ...ggingServerSocketEventSourceProducer.java
diff --git a/...ucer/Log4jLoggingStreamEventProducer.java → ...ucer/Log4jLoggingStreamEventProducer.java b/...ucer/Log4jLoggingStreamEventProducer.java → ...ucer/Log4jLoggingStreamEventProducer.java
diff --git a/log4j/log4j-throwable-parser/build.gradle b/log4j/log4j-throwable-parser/build.gradle
@@ -0,0 +1,5 @@
+dependencies {
+	compile project(':lilith-data:logging')
+	compile libraries.'slf4j-api'
+}
+
diff --git a/log4j/throwable-parser/pom.xml → log4j/log4j-throwable-parser/pom.xml b/log4j/throwable-parser/pom.xml → log4j/log4j-throwable-parser/pom.xml
diff --git a/...orn/lilith/log4j/ThrowableInfoParser.java → ...orn/lilith/log4j/ThrowableInfoParser.java b/...orn/lilith/log4j/ThrowableInfoParser.java → ...orn/lilith/log4j/ThrowableInfoParser.java
diff --git a/...lilith/log4j/ThrowableInfoParserTest.java → ...lilith/log4j/ThrowableInfoParserTest.java b/...lilith/log4j/ThrowableInfoParserTest.java → ...lilith/log4j/ThrowableInfoParserTest.java
diff --git a/...arser/src/test/resources/logback-test.xml → ...arser/src/test/resources/logback-test.xml b/...arser/src/test/resources/logback-test.xml → ...arser/src/test/resources/logback-test.xml
diff --git a/log4j/log4j-xml/build.gradle b/log4j/log4j-xml/build.gradle
@@ -0,0 +1,14 @@
+dependencies {
+	compile project(':lilith-data:logging')
+	compile project(':log4j:log4j-throwable-parser')
+	compile libraries.'sulky-stax'
+	compile libraries.'sulky-tasks'
+	compile libraries.'sulky-buffers'
+	compile libraries.'slf4j-api'
+	compile libraries.'commons-io'
+	compile libraries.'sulky-io'
+	compile libraries.'stax-api'
+	testRuntime libraries.'stax'
+	testCompile project(':lilith-data:eventsource')
+}
+
diff --git a/log4j/xml/pom.xml → log4j/log4j-xml/pom.xml b/log4j/xml/pom.xml → log4j/log4j-xml/pom.xml
diff --git a/...lilith/log4j/xml/Log4jImportCallable.java → ...lilith/log4j/xml/Log4jImportCallable.java b/...lilith/log4j/xml/Log4jImportCallable.java → ...lilith/log4j/xml/Log4jImportCallable.java
diff --git a/.../lilith/log4j/xml/LoggingEventReader.java → .../lilith/log4j/xml/LoggingEventReader.java b/.../lilith/log4j/xml/LoggingEventReader.java → .../lilith/log4j/xml/LoggingEventReader.java
diff --git a/...og4j/xml/LoggingEventSchemaConstants.java → ...og4j/xml/LoggingEventSchemaConstants.java b/...og4j/xml/LoggingEventSchemaConstants.java → ...og4j/xml/LoggingEventSchemaConstants.java
diff --git a/...th/log4j/xml/Log4jImportCallableTest.java → ...th/log4j/xml/Log4jImportCallableTest.java b/...th/log4j/xml/Log4jImportCallableTest.java → ...th/log4j/xml/Log4jImportCallableTest.java
diff --git a/...ith/log4j/xml/LoggingEventReaderTest.java → ...ith/log4j/xml/LoggingEventReaderTest.java b/...ith/log4j/xml/LoggingEventReaderTest.java → ...ith/log4j/xml/LoggingEventReaderTest.java
diff --git a/...j/xml/src/test/resources/logback-test.xml → ...j-xml/src/test/resources/logback-test.xml b/...j/xml/src/test/resources/logback-test.xml → ...j-xml/src/test/resources/logback-test.xml
diff --git a/.../src/test/resources/testcases/example.log → .../src/test/resources/testcases/example.log b/.../src/test/resources/testcases/example.log → .../src/test/resources/testcases/example.log
diff --git a/.../test/resources/testcases/exampleNoLF.log → .../test/resources/testcases/exampleNoLF.log b/.../test/resources/testcases/exampleNoLF.log → .../test/resources/testcases/exampleNoLF.log
diff --git a/log4j/pom.xml b/log4j/pom.xml
@@ -18,9 +18,9 @@
 	</parent>
 
 	<modules>
-		<module>throwable-parser</module>
-		<module>xml</module>
-		<module>producer</module>
+		<module>log4j-throwable-parser</module>
+		<module>log4j-xml</module>
+		<module>log4j-producer</module>
 	</modules>
 
 </project>

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include 'lilith-sender', 'lilith-data:eventsource', 'lilith-data:eventsource-xml', 'lilith-data:logging', 'lilith-data:logging-xml', 'lilith-data:logging-xml-serializer', 'lilith-data:logging-protobuf', 'lilith-data:access', 'lilith-data:access-protobuf', 'lilith-constants', 'lilith-engine', 'lilith-xml-logging', 'logback:classic', 'logback:logging-adapter', 'logback:access-adapter', 'logback:producer-classic', 'logback:producer-access', 'logback:multiplex-appender-core', 'logback:multiplex-appender-classic', 'logback:multiplex-appender-access', 'logback:multiplex-appender-classic-xml', 'logback:shutdown-context-listener', 'logback:encoder-core', 'logback:encoder-classic', 'logback:encoder-access'
+include 'lilith-sender', 'lilith-data:eventsource', 'lilith-data:eventsource-xml', 'lilith-data:logging', 'lilith-data:logging-xml', 'lilith-data:logging-xml-serializer', 'lilith-data:logging-protobuf', 'lilith-data:access', 'lilith-data:access-protobuf', 'lilith-constants', 'lilith-engine', 'lilith-xml-logging', 'logback:classic', 'logback:logging-adapter', 'logback:access-adapter', 'logback:producer-classic', 'logback:producer-access', 'logback:multiplex-appender-core', 'logback:multiplex-appender-classic', 'logback:multiplex-appender-access', 'logback:multiplex-appender-classic-xml', 'logback:shutdown-context-listener', 'logback:encoder-core', 'logback:encoder-classic', 'logback:encoder-access', 'log4j:log4j-throwable-parser', 'log4j:log4j-xml', 'log4j:log4j-producer', 'jul:jul-xml', 'jul:jul-slf4j-handler'