Updated Branches: refs/heads/master abb049bc0 -> 2224ecb0d
CLOUDSTACK-2218: Remove applicationContext.xml from the awsapi installation logic for DEB Signed-off-by: Chip Childers <[email protected]> Conflicts: debian/rules Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/207c2889 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/207c2889 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/207c2889 Branch: refs/heads/master Commit: 207c288958c26280b3156f23fdb5ae1e3b2068f6 Parents: abb049b Author: Chip Childers <[email protected]> Authored: Mon May 13 16:23:38 2013 +0100 Committer: Chip Childers <[email protected]> Committed: Mon May 13 16:29:50 2013 +0100 ---------------------------------------------------------------------- debian/rules | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/207c2889/debian/rules ---------------------------------------------------------------------- diff --git a/debian/rules b/debian/rules index c5875e7..ff12154 100755 --- a/debian/rules +++ b/debian/rules @@ -157,7 +157,7 @@ install: install -D awsapi-setup/setup/cloud-setup-bridge $(DESTDIR)/usr/bin/cloudstack-setup-bridge install -D awsapi-setup/setup/cloudstack-aws-api-register $(DESTDIR)/usr/bin/cloudstack-aws-api-register cp -r awsapi-setup/db/mysql/* $(DESTDIR)/usr/share/$(PACKAGE)-bridge/setup - for i in applicationContext.xml cloud-bridge.properties commons-logging.properties crypto.properties xes.keystore ec2-service.properties; do \ + for i in cloud-bridge.properties commons-logging.properties crypto.properties xes.keystore ec2-service.properties; do \ mv $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/$$i $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/; \ done rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/log4j-vmops.xml
