You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ek...@apache.org on 2015/06/08 11:45:31 UTC
[10/50] [abbrv] git commit: updated refs/heads/feature/vpc-ipv6 to
6140db5
fix centos63 build in master. not working since removal of awsapi
Signed-off-by: pdion891 <pd...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/23c990f7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/23c990f7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/23c990f7
Branch: refs/heads/feature/vpc-ipv6
Commit: 23c990f7c9a2f071c5acca1a2beaaa4379beb0bf
Parents: 94f1ebb
Author: pdion891 <pd...@apache.org>
Authored: Sun May 31 21:21:27 2015 -0400
Committer: pdion891 <pd...@apache.org>
Committed: Sun May 31 21:50:32 2015 -0400
----------------------------------------------------------------------
client/tomcatconf/commons-logging.properties.in | 30 ++++++++++++++++++++
packaging/centos63/cloud.spec | 2 +-
2 files changed, 31 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23c990f7/client/tomcatconf/commons-logging.properties.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/commons-logging.properties.in b/client/tomcatconf/commons-logging.properties.in
new file mode 100644
index 0000000..1e570d6
--- /dev/null
+++ b/client/tomcatconf/commons-logging.properties.in
@@ -0,0 +1,30 @@
+#
+# 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/23c990f7/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 4154560..a194096 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -279,7 +279,7 @@ cp -r client/target/cloud-client-ui-%{_maventag}/* ${RPM_BUILD_ROOT}%{_datadir}/
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
-for name in db.properties log4j-cloud.xml tomcat6-nonssl.conf tomcat6-ssl.conf server-ssl.xml server-nonssl.xml \
+for name in db.properties log4j-cloud.xml tomcat6-nonssl.conf tomcat6-ssl.conf server-ssl.xml server-nonssl.xml commons-logging.properties \
catalina.policy catalina.properties classpath.conf tomcat-users.xml web.xml environment.properties java.security.ciphers; do
mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name \
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name