Updated Branches: refs/heads/master 980166719 -> 5477d096d
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 <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5477d096 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5477d096 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5477d096 Branch: refs/heads/master Commit: 5477d096d5b0e1c318d4a5793f9153b912e146ac Parents: 9801667 Author: Noa Resare <[email protected]> Authored: Thu Feb 28 15:20:03 2013 +0100 Committer: Noa Resare <[email protected]> Committed: Thu Feb 28 19:51:05 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/5477d096/packaging/centos63/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index e345679..ab71d0f 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -227,6 +227,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
