cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [5/6] git commit: updated refs/heads/master to 45eb9fd
Date Sun, 31 Mar 2013 15:02:37 GMT
CLOUDSTACK-1490: deb packaging tomcat fixes

Signed-off-by: Wido den Hollander <wido@42on.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/80da4d5b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/80da4d5b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/80da4d5b

Branch: refs/heads/master
Commit: 80da4d5baf9381985f61faa257f6684cc80b8c9f
Parents: bc1ce57
Author: Wido den Hollander <wido@42on.com>
Authored: Sun Mar 31 12:46:23 2013 +0200
Committer: Wido den Hollander <wido@42on.com>
Committed: Sun Mar 31 14:16:31 2013 +0200

----------------------------------------------------------------------
 debian/cloudstack-management.install |    1 -
 debian/rules                         |    2 --
 packaging/debian/replace.properties  |    2 +-
 3 files changed, 1 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/80da4d5b/debian/cloudstack-management.install
----------------------------------------------------------------------
diff --git a/debian/cloudstack-management.install b/debian/cloudstack-management.install
index e80701d..b42343a 100644
--- a/debian/cloudstack-management.install
+++ b/debian/cloudstack-management.install
@@ -31,5 +31,4 @@
 /usr/bin/cloud-setup-databases
 /usr/bin/cloud-migrate-databases
 /usr/share/cloudstack-management/*
-/usr/share/java/*
 /usr/share/tomcat6/lib/*

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/80da4d5b/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 907cdcd..55496e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,10 +100,8 @@ install:
 	ln -s tomcat6-nonssl.conf $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/tomcat6.conf
 	mkdir -p $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/Catalina/localhost/client
 	mkdir -p ${DESTDIR}/usr/share/tomcat6/lib
-	mkdir -p ${DESTDIR}/usr/share/java
 	install -D packaging/debian/init/cloud-management $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-management
 	install -D client/bindir/cloud-update-xenserver-licenses.in $(DESTDIR)/usr/bin/cloud-update-xenserver-licenses
-	install -D server/target/cloud-server-$(VERSION)-SNAPSHOT.jar $(DESTDIR)/usr/share/java/$(PACKAGE)-server.jar
 	ln -s /usr/share/tomcat6/bin $(DESTDIR)/usr/share/$(PACKAGE)-management/bin
 	ln -s ../../..$(SYSCONFDIR)/$(PACKAGE)/management $(DESTDIR)/usr/share/$(PACKAGE)-management/conf
 	ln -s ../../../usr/share/tomcat6/lib $(DESTDIR)/usr/share/$(PACKAGE)-management/lib

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/80da4d5b/packaging/debian/replace.properties
----------------------------------------------------------------------
diff --git a/packaging/debian/replace.properties b/packaging/debian/replace.properties
index 8705c78..8c85206 100644
--- a/packaging/debian/replace.properties
+++ b/packaging/debian/replace.properties
@@ -34,7 +34,7 @@ AWSAPILOG=/var/log/cloudstack/awsapi/awsapi.log
 BINDIR=/usr/bin
 COMMONLIBDIR=/usr/share/cloudstack-common
 CONFIGUREVARS=
-DEPSCLASSPATH=
+DEPSCLASSPATH=/usr/share/tomcat6/bin/bootstrap.jar:/usr/share/tomcat6/bin/tomcat-juli.jar
 DOCDIR=
 IPALOCATORLOG=/var/log/cloudstack/management/ipallocator.log
 JAVADIR=/usr/share/cloudstack-management/webapps/client/WEB-INF/lib


Mime
View raw message