You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by no...@apache.org on 2013/02/28 20:40:40 UTC
git commit: refs/heads/4.1 - rpm packaging fix: Add symlink for
log4j-cloud.xml in client webapp
Updated Branches:
refs/heads/4.1 c40e97175 -> 0518e456c
rpm packaging fix: Add symlink for log4j-cloud.xml in client webapp
web.xml now references a log4j-cloud.xml relative to the webapp root
to capture early logging from spring. This change introduces a symlink
in the client webapp to the system wide log4j-cloud.xml which works around
a problem starting cloud-management described in CLOUDSTACK-1436
CLOUDSTACK-1436: 4.1 management server fails to start from RPM...
CLOUDSTACK-1423: Unable to launch UI [HTTP Status 404 - ]
Signed-off-by: David Nalley <da...@gnsa.us>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0518e456
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0518e456
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0518e456
Branch: refs/heads/4.1
Commit: 0518e456ce69002211648543da78c436bcb6ebb6
Parents: c40e971
Author: Noa Resare <no...@spotify.com>
Authored: Thu Feb 28 15:20:03 2013 +0100
Committer: Noa Resare <no...@spotify.com>
Committed: Thu Feb 28 19:36:33 2013 +0000
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0518e456/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index eb378ce..e7f1c31 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -228,6 +228,10 @@ for name in db.properties log4j-cloud.xml tomcat6-nonssl.conf tomcat6-ssl.conf s
mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name \
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
done
+
+ln -s %{_sysconfdir}/%{name}/management/log4j-cloud.xml \
+ ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/log4j-cloud.xml
+
mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/context.xml \
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina/localhost/client