Juan Hernandez has uploaded a new change for review. Change subject: tools: Use unmodified version of log4j ......................................................................
tools: Use unmodified version of log4j JBoss AS 7.2 (which corresponds to JBoss EAP 6.1) includes a modified version of log4j that doesn't support the log4j.configuration system property and doesn't perform the usual configuration of log4j. This patch adds an unmodified version of log4j to the modules repository of the tools, so it will use it instead of the modified version provided by the application server. Change-Id: I968807ba96e6f5d63d2990b0be85f687601ff4c5 Bug-Url: https://bugzilla.redhat.com/996909 Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com> --- M backend/manager/dependencies/tools/pom.xml A backend/manager/dependencies/tools/src/main/modules/org/apache/log4j/main/module.xml 2 files changed, 31 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/24/18224/1 diff --git a/backend/manager/dependencies/tools/pom.xml b/backend/manager/dependencies/tools/pom.xml index bad3326..a71e2b6 100644 --- a/backend/manager/dependencies/tools/pom.xml +++ b/backend/manager/dependencies/tools/pom.xml @@ -21,8 +21,11 @@ <dependencies> - <!-- This is currently empty, everything is in the shared modules - repository. --> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j.version}</version> + </dependency> </dependencies> @@ -37,8 +40,11 @@ <moduleRepository>tools</moduleRepository> <modules> - <!-- No modules required here at the moment, everything - is in the shared modules repository. --> + <module> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <moduleName>org.apache.log4j</moduleName> + </module> </modules> </configuration> diff --git a/backend/manager/dependencies/tools/src/main/modules/org/apache/log4j/main/module.xml b/backend/manager/dependencies/tools/src/main/modules/org/apache/log4j/main/module.xml new file mode 100644 index 0000000..e310bc9 --- /dev/null +++ b/backend/manager/dependencies/tools/src/main/modules/org/apache/log4j/main/module.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- This module is needed by the tools because the same module provided by the + application server (starting with JBoss AS 7.2, which corresponds to JBoss + EAP 6.1) is just an alias for org.jboss.log4j.logmanager, and that + contains a modified version of log4j that doesn't include any + configuration mechanism, it doesn't respect the log4j.configuration system + property and it doesn't perform the usual lo4j configuration. --> + +<module xmlns="urn:jboss:module:1.1" name="org.apache.log4j"> + + <resources> + <resource-root path="log4j.jar"/> + </resources> + + <dependencies> + <module name="org.dom4j" optional="true"/> + <module name="javax.api"/> + </dependencies> + +</module> -- To view, visit http://gerrit.ovirt.org/18224 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I968807ba96e6f5d63d2990b0be85f687601ff4c5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
