Juan Hernandez has uploaded a new change for review.
Change subject: [WIP] Remove logging dependencies
......................................................................
[WIP] Remove logging dependencies
Setting up logging is the responsibility (and freedom) of the user of
the API, so this patch removes all that logic and the corresponding
dependencies.
Change-Id: Id81d1490f9f5594e8065b8a20c71d9595d35814b
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M
ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/ApiTemplate
M ovirt-engine-sdk-java/ovirt-engine-sdk-java.spec.in
M ovirt-engine-sdk-java/pom.xml
M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/Api.java
4 files changed, 0 insertions(+), 88 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk-java
refs/changes/00/34900/1
diff --git
a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/ApiTemplate
b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/ApiTemplate
index b453660..e922d7e 100644
---
a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/ApiTemplate
+++
b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/ApiTemplate
@@ -3,10 +3,6 @@
import java.io.IOException;
import org.apache.http.client.ClientProtocolException;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
import org.ovirt.engine.sdk.web.ConnectionsPool;
import org.ovirt.engine.sdk.web.ConnectionsPoolBuilder;
import org.ovirt.engine.sdk.web.HttpProxy;
@@ -538,7 +534,6 @@
)
throws ServerException, UnsecuredConnectionAttemptError, IOException {
- configureLog4J(debug);
ConnectionsPool pool = new ConnectionsPoolBuilder()
.url(url)
.username(username)
@@ -559,37 +554,6 @@
.build();
this.proxy = new HttpProxyBroker(httpProxy);
initResources();
- }
-
- /**
- * Configures log4j.
- */
- private void configureLog4J(Boolean debug) {
- String patternLayout = "%d %-5p [%c] %m%n";
- if (debug != null && Boolean.TRUE.equals(debug)) {
-
- Logger rootLogger = Logger.getRootLogger();
- if (!rootLogger.getAllAppenders().hasMoreElements()) {
- rootLogger.setLevel(Level.INFO);
- rootLogger.addAppender(new ConsoleAppender(
- new PatternLayout(patternLayout)));
-
- }
- Logger pkgLogger =
- rootLogger.getLoggerRepository()
- .getLogger("org.apache.http");
- pkgLogger.setLevel(Level.DEBUG);
- pkgLogger.addAppender(new ConsoleAppender(
- new PatternLayout(patternLayout)));
-
- } else {
- Logger rootLogger = Logger.getRootLogger();
- if (!rootLogger.getAllAppenders().hasMoreElements()) {
- rootLogger.setLevel(Level.OFF);
- rootLogger.addAppender(new ConsoleAppender(
- new PatternLayout(patternLayout)));
- }
- }
}
/**
diff --git a/ovirt-engine-sdk-java/ovirt-engine-sdk-java.spec.in
b/ovirt-engine-sdk-java/ovirt-engine-sdk-java.spec.in
index a8d9aef..1208e85 100644
--- a/ovirt-engine-sdk-java/ovirt-engine-sdk-java.spec.in
+++ b/ovirt-engine-sdk-java/ovirt-engine-sdk-java.spec.in
@@ -50,7 +50,6 @@
BuildRequires: jpackage-utils
%if %{require_java_dep}
-BuildRequires: apache-commons-logging
BuildRequires: apache-commons-compress
BuildRequires: httpcomponents-client >= 4.2
BuildRequires: junit
@@ -69,16 +68,13 @@
Requires: java
Requires: httpcomponents-client >= 4.2
-Requires: log4j
%if 0%{?rhel}
Requires: jakarta-commons-beanutils
Requires: jakarta-commons-codec
-Requires: jakarta-commons-logging
%endif
%if 0%{?fedora}
Requires: apache-commons-beanutils
Requires: apache-commons-codec
-Requires: apache-commons-logging
%endif
%description
diff --git a/ovirt-engine-sdk-java/pom.xml b/ovirt-engine-sdk-java/pom.xml
index 4f29983..b6a9d78 100644
--- a/ovirt-engine-sdk-java/pom.xml
+++ b/ovirt-engine-sdk-java/pom.xml
@@ -18,7 +18,6 @@
<findbugs.version>2.5.1</findbugs.version>
<test-jar.plugin.version>2.2</test-jar.plugin.version>
<javassist.version>3.12.0.GA</javassist.version>
- <log4j.version>1.2.16</log4j.version>
<maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version>
<resources.plugin.version>2.4.3</resources.plugin.version>
<release.plugin.version>2.0</release.plugin.version>
@@ -29,7 +28,6 @@
<scm.plugin.version>1.2</scm.plugin.version>
<gpg.passphrase></gpg.passphrase>
<forkTests>always</forkTests>
- <commons-logging.version>1.1.1</commons-logging.version>
<commons-codec.version>1.4</commons-codec.version>
<bundle.plugin.version>2.0.0</bundle.plugin.version>
</properties>
@@ -47,16 +45,6 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/Api.java
b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/Api.java
index 001e618..61c9b6b 100644
--- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/Api.java
+++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/Api.java
@@ -23,10 +23,6 @@
import java.io.IOException;
import org.apache.http.client.ClientProtocolException;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
import org.ovirt.engine.sdk.web.ConnectionsPool;
import org.ovirt.engine.sdk.web.ConnectionsPoolBuilder;
import org.ovirt.engine.sdk.web.HttpProxy;
@@ -586,7 +582,6 @@
)
throws ServerException, UnsecuredConnectionAttemptError, IOException {
- configureLog4J(debug);
ConnectionsPool pool = new ConnectionsPoolBuilder()
.url(url)
.username(username)
@@ -607,37 +602,6 @@
.build();
this.proxy = new HttpProxyBroker(httpProxy);
initResources();
- }
-
- /**
- * Configures log4j.
- */
- private void configureLog4J(Boolean debug) {
- String patternLayout = "%d %-5p [%c] %m%n";
- if (debug != null && Boolean.TRUE.equals(debug)) {
-
- Logger rootLogger = Logger.getRootLogger();
- if (!rootLogger.getAllAppenders().hasMoreElements()) {
- rootLogger.setLevel(Level.INFO);
- rootLogger.addAppender(new ConsoleAppender(
- new PatternLayout(patternLayout)));
-
- }
- Logger pkgLogger =
- rootLogger.getLoggerRepository()
- .getLogger("org.apache.http");
- pkgLogger.setLevel(Level.DEBUG);
- pkgLogger.addAppender(new ConsoleAppender(
- new PatternLayout(patternLayout)));
-
- } else {
- Logger rootLogger = Logger.getRootLogger();
- if (!rootLogger.getAllAppenders().hasMoreElements()) {
- rootLogger.setLevel(Level.OFF);
- rootLogger.addAppender(new ConsoleAppender(
- new PatternLayout(patternLayout)));
- }
- }
}
/**
--
To view, visit http://gerrit.ovirt.org/34900
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id81d1490f9f5594e8065b8a20c71d9595d35814b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine-sdk-java
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
