You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/04/30 17:45:14 UTC
git commit: updated refs/heads/nuke-awsapi to 4435ede
Repository: cloudstack
Updated Branches:
refs/heads/nuke-awsapi 72831ecfe -> 4435ede72
CLOUDSTACK-8433: Fix rpm builds, avoid using commons-logging
- Removes commons-logging.properties file introduced with awsapi
- Fixed utils to use log4j instead of commons logging
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4435ede7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4435ede7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4435ede7
Branch: refs/heads/nuke-awsapi
Commit: 4435ede72a437ec3adfedf46d429193f3ef039f5
Parents: 72831ec
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Apr 30 17:43:51 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Apr 30 17:43:51 2015 +0200
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 1 -
packaging/centos7/cloud.spec | 3 +-
.../centos7/tomcat7/commons-logging.properties | 30 --------------------
packaging/fedora20/cloud.spec | 1 -
packaging/fedora21/cloud.spec | 1 -
.../utils/backoff/impl/ConstantTimeBackoff.java | 5 ++--
.../ssl/EasySSLProtocolSocketFactory.java | 6 ++--
.../contrib/ssl/EasyX509TrustManager.java | 5 ++--
.../backoff/impl/ConstantTimeBackoffTest.java | 5 ++--
9 files changed, 10 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4435ede7/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index b0ae1c7..fb953ce 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -547,7 +547,6 @@ fi
%config(noreplace) %{_sysconfdir}/%{name}/management/web.xml
%config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
%config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers
-%config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties
%attr(0755,root,root) %{_initrddir}/%{name}-management
%attr(0755,root,root) %{_initrddir}/tomcat.sh
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4435ede7/packaging/centos7/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index e2a6945..d46c4f6 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -254,7 +254,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/cl
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
for name in catalina.properties db.properties log4j-cloud.xml web.xml \
- server.xml commons-logging.properties environment.properties java.security.ciphers tomcat-users.xml
+ server.xml environment.properties java.security.ciphers tomcat-users.xml
do
cp packaging/centos7/tomcat7/$name \
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
@@ -456,7 +456,6 @@ fi
%config(noreplace) %{_sysconfdir}/%{name}/management/server.xml
%config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
%config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers
-%config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties
%attr(0755,root,root) %{_unitdir}/%{name}-management.service
%attr(0755,cloud,cloud) %{_localstatedir}/run/%{name}-management.pid
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4435ede7/packaging/centos7/tomcat7/commons-logging.properties
----------------------------------------------------------------------
diff --git a/packaging/centos7/tomcat7/commons-logging.properties b/packaging/centos7/tomcat7/commons-logging.properties
deleted file mode 100644
index 1e570d6..0000000
--- a/packaging/centos7/tomcat7/commons-logging.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# This is the logging properties that goes to the war, there are two logging conf kept at the
-# svn, one for developement (one at src/test-resources) and other for producation
-
-# Uncomment the next line to disable all logging.
-#org.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog
-
-# Uncomment the next line to enable the simple log based logging
-#org.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
-
-# Uncomment the next line to enable log4j based logging
-org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4435ede7/packaging/fedora20/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/fedora20/cloud.spec b/packaging/fedora20/cloud.spec
index db6a813..1f323f7 100644
--- a/packaging/fedora20/cloud.spec
+++ b/packaging/fedora20/cloud.spec
@@ -549,7 +549,6 @@ fi
%config(noreplace) %{_sysconfdir}/%{name}/management/web.xml
%config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
%config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers
-%config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties
%attr(0755,root,root) %{_initrddir}/%{name}-management
%attr(0755,root,root) %{_initrddir}/tomcat.sh
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4435ede7/packaging/fedora21/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/fedora21/cloud.spec b/packaging/fedora21/cloud.spec
index 0505664..00e27c4 100644
--- a/packaging/fedora21/cloud.spec
+++ b/packaging/fedora21/cloud.spec
@@ -549,7 +549,6 @@ fi
%config(noreplace) %{_sysconfdir}/%{name}/management/web.xml
%config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
%config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers
-%config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties
%attr(0755,root,root) %{_initrddir}/%{name}-management
%attr(0755,root,root) %{_initrddir}/tomcat.sh
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4435ede7/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java b/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java
index 14eae16..c8536d4 100644
--- a/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java
+++ b/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java
@@ -25,8 +25,7 @@ import java.util.concurrent.ConcurrentHashMap;
import javax.ejb.Local;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.backoff.BackoffAlgorithm;
@@ -46,7 +45,7 @@ import com.cloud.utils.component.AdapterBase;
public class ConstantTimeBackoff extends AdapterBase implements BackoffAlgorithm, ConstantTimeBackoffMBean {
long _time;
private final Map<String, Thread> _asleep = new ConcurrentHashMap<String, Thread>();
- private final static Log LOG = LogFactory.getLog(ConstantTimeBackoff.class);
+ private static final Logger LOG = Logger.getLogger(ConstantTimeBackoff.class);
@Override
public void waitBeforeRetry() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4435ede7/utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java
----------------------------------------------------------------------
diff --git a/utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java b/utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java
index 5ff5819..0d43d3d 100644
--- a/utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java
+++ b/utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java
@@ -24,8 +24,8 @@ import org.apache.commons.httpclient.ConnectTimeoutException;
import org.apache.commons.httpclient.HttpClientError;
import org.apache.commons.httpclient.params.HttpConnectionParams;
import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
+import org.apache.log4j.Logger;
import javax.net.SocketFactory;
import javax.net.ssl.SSLContext;
@@ -88,7 +88,7 @@ import java.net.UnknownHostException;
public class EasySSLProtocolSocketFactory implements ProtocolSocketFactory {
/** Log object for this class. */
- private static final Log LOG = LogFactory.getLog(EasySSLProtocolSocketFactory.class);
+ private static final Logger LOG = Logger.getLogger(EasySSLProtocolSocketFactory.class);
private SSLContext sslcontext = null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4435ede7/utils/src/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java
----------------------------------------------------------------------
diff --git a/utils/src/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java b/utils/src/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java
index eb23eb2..ee5673c 100644
--- a/utils/src/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java
+++ b/utils/src/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java
@@ -29,8 +29,7 @@ import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
/**
* <p>
@@ -58,7 +57,7 @@ public class EasyX509TrustManager implements X509TrustManager {
private X509TrustManager standardTrustManager = null;
/** Log object for this class. */
- private static final Log LOG = LogFactory.getLog(EasyX509TrustManager.class);
+ private static final Logger LOG = Logger.getLogger(EasyX509TrustManager.class);
/**
* Constructor for EasyX509TrustManager.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4435ede7/utils/test/com/cloud/utils/backoff/impl/ConstantTimeBackoffTest.java
----------------------------------------------------------------------
diff --git a/utils/test/com/cloud/utils/backoff/impl/ConstantTimeBackoffTest.java b/utils/test/com/cloud/utils/backoff/impl/ConstantTimeBackoffTest.java
index d397511..c34a1d0 100644
--- a/utils/test/com/cloud/utils/backoff/impl/ConstantTimeBackoffTest.java
+++ b/utils/test/com/cloud/utils/backoff/impl/ConstantTimeBackoffTest.java
@@ -21,13 +21,12 @@ package com.cloud.utils.backoff.impl;
import java.util.HashMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
import org.junit.Assert;
import org.junit.Test;
public class ConstantTimeBackoffTest {
- final static private Log LOG = LogFactory.getLog(ConstantTimeBackoffTest.class);
+ final static private Logger LOG = Logger.getLogger(ConstantTimeBackoffTest.class);
@Test
public void waitBeforeRetryWithInterrupt() throws InterruptedException {