[pkg-eucalyptus-commits] r244 - in eucalyptus/trunk/debian: . patches source
Rudy Godoy
rudy at alioth.debian.org
Sat Jul 7 01:27:06 UTC 2012
Author: rudy
Date: 2012-07-07 01:27:05 +0000 (Sat, 07 Jul 2012)
New Revision: 244
Added:
eucalyptus/trunk/debian/eucalyptus-admin-tools.install
eucalyptus/trunk/debian/eucalyptus-admin-tools.postinst
eucalyptus/trunk/debian/eucalyptus-broker.dirs
eucalyptus/trunk/debian/eucalyptus-broker.install
eucalyptus/trunk/debian/eucalyptus-broker.postinst
eucalyptus/trunk/debian/eucalyptus-broker.prerm
eucalyptus/trunk/debian/eucalyptus-cc.lintian-overrides
eucalyptus/trunk/debian/eucalyptus-cc.preinst
eucalyptus/trunk/debian/eucalyptus-gl.lintian-overrides
eucalyptus/trunk/debian/eucalyptus-java-common.preinst
eucalyptus/trunk/debian/eucalyptus-nc.preinst
eucalyptus/trunk/debian/eucalyptus-sc.dirs
eucalyptus/trunk/debian/eucalyptus-sc.postrm
eucalyptus/trunk/debian/eucalyptus-walrus.dirs
eucalyptus/trunk/debian/eucalyptus-walrus.postrm
eucalyptus/trunk/debian/ivy.xml
eucalyptus/trunk/debian/ivysettings.xml
eucalyptus/trunk/debian/patches/build-against-new-guava.patch
eucalyptus/trunk/debian/patches/create-var-run-euca.patch
eucalyptus/trunk/debian/patches/disable-config-validation.patch
eucalyptus/trunk/debian/patches/disable-gwt.patch
eucalyptus/trunk/debian/patches/enable-ivy.patch
eucalyptus/trunk/debian/patches/enable-wsdl.patch
eucalyptus/trunk/debian/patches/fix-postgres-hibernate-issue.patch
eucalyptus/trunk/debian/patches/modify-clc-build-file.patch
eucalyptus/trunk/debian/patches/modify-clc-makefile.patch
eucalyptus/trunk/debian/patches/modify-init-files.patch
eucalyptus/trunk/debian/python-eucadmin.install
eucalyptus/trunk/debian/pyversions
eucalyptus/trunk/debian/source/include-binaries
eucalyptus/trunk/debian/source/local-options
Modified:
eucalyptus/trunk/debian/changelog
eucalyptus/trunk/debian/control
eucalyptus/trunk/debian/copyright
eucalyptus/trunk/debian/eucalyptus-cc.dirs
eucalyptus/trunk/debian/eucalyptus-cc.install
eucalyptus/trunk/debian/eucalyptus-cc.postinst
eucalyptus/trunk/debian/eucalyptus-cc.postrm
eucalyptus/trunk/debian/eucalyptus-cc.prerm
eucalyptus/trunk/debian/eucalyptus-cloud.dirs
eucalyptus/trunk/debian/eucalyptus-cloud.install
eucalyptus/trunk/debian/eucalyptus-cloud.postinst
eucalyptus/trunk/debian/eucalyptus-cloud.prerm
eucalyptus/trunk/debian/eucalyptus-common.dirs
eucalyptus/trunk/debian/eucalyptus-common.install
eucalyptus/trunk/debian/eucalyptus-common.lintian-overrides
eucalyptus/trunk/debian/eucalyptus-common.postinst
eucalyptus/trunk/debian/eucalyptus-common.postrm
eucalyptus/trunk/debian/eucalyptus-common.preinst
eucalyptus/trunk/debian/eucalyptus-common.prerm
eucalyptus/trunk/debian/eucalyptus-java-common.install
eucalyptus/trunk/debian/eucalyptus-java-common.links
eucalyptus/trunk/debian/eucalyptus-java-common.postinst
eucalyptus/trunk/debian/eucalyptus-nc.install
eucalyptus/trunk/debian/eucalyptus-nc.lintian-overrides
eucalyptus/trunk/debian/eucalyptus-nc.postinst
eucalyptus/trunk/debian/eucalyptus-nc.postrm
eucalyptus/trunk/debian/eucalyptus-sc.install
eucalyptus/trunk/debian/eucalyptus-sc.postinst
eucalyptus/trunk/debian/eucalyptus-sc.prerm
eucalyptus/trunk/debian/eucalyptus-walrus.install
eucalyptus/trunk/debian/eucalyptus-walrus.postinst
eucalyptus/trunk/debian/eucalyptus-walrus.prerm
eucalyptus/trunk/debian/patches/series
eucalyptus/trunk/debian/rules
Log:
Packaging for the 3.1 version
Modified: eucalyptus/trunk/debian/changelog
===================================================================
--- eucalyptus/trunk/debian/changelog 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/changelog 2012-07-07 01:27:05 UTC (rev 244)
@@ -1,389 +1,5 @@
-eucalyptus (2.0.3-1) unstable; urgency=low
+eucalyptus (3.1.0-1) unstable; urgency=low
- [ Steffen Moeller ]
- * Applying Dominique Belhachemi's fix of a non-working
- wildcard to the groovy-all.jar. (Closes: #589815)
+ * Initial release
- [ Miguel Landaeta ]
- * Build against Hibernate 3.5 (Closes: #589582).
- * Switch dependencies on libspring-2.5-java to libspring-java
- (Closes: #638399).
-
- [ Charles Plessy ]
- * Removed build-dependency on old Hibernate package
- libhibernate-entitymanager-java (Closes: #593050).
- * Use CDBS' simple-patchsys (debian/rules, debian/README.source).
-
- [ Chris Grzegorczyk ]
- * New 2.0 release.
- * Switch libgeronimo-jpa-3.0-spec-java with libgeronimo-jpa-2.0-spec-java
- (debian/control, debian/build-jars)
- * Use unversioned groovy-all (debian/build-jars)
-
- [ Vika Felmetsger ]
- * New 2.0.3 security release
- * Added defense against XML Signature Element Wrapping attacks
- * Fixed replay detection in CLC
-
- [ Rudy Godoy ]
- * Incorporate upstream changes to packaging.
- * Allow stubs generation on build-time to avoid add_marshaling.pl to fail
- on compilation (debian/rules)
- * Don't use debian/build-jars to symlink to system-wide Java libs, instead use
- upstream's tarball jar files on build-time. (debian/rules)
- * Switched packaging to DebSrc3.0 format using quilt to handle patches.
- * Uses /var/lib/jvm/default-jdk as JAVA_HOME instead of openjdk.
-
- -- Rudy Godoy <rudy at stone-head.org> Sat, 29 Oct 2011 23:10:35 -0500
-
-eucalyptus (1.6.2-2) unstable; urgency=low
-
- * Team upload.
-
- [ Chris Grzegorczyk ]
- * Tightened architecture distribution from ‘all’ to ‘amd64 i386’,
- and removed duplicate build-dep (debian/control).
-
- [ Charles Plessy ]
- * Team maintenance: use pkg-eucalyptus mailing list as Maintainer,
- and transfer Chris at the top of the Uploaders list.
- * Updated Standards-Version to reflect conformance with Policy 3.9.0
- (debian/control, no changes needed).
- * Stop services before package removal (debian/eucalyptus-sc.prerm,
- debian/eucalyptus-cloud.prerm, debian/eucalyptus-walrus.prerm,
- closes: #584120).
-
- -- Charles Plessy <plessy at debian.org> Mon, 12 Jul 2010 09:49:51 +0900
-
-eucalyptus (1.6.2-1) unstable; urgency=low
-
- * New upstream version.
- * First upload to Debian (Closes: #505444)
-
- -- Chris Grzegorczyk <grze at eucalyptus.com> Wed, 05 May 2010 20:49:35 +0200
-
-eucalyptus (1.6.1~bzr1045-0euca1) karmic; urgency=low
-
- * 1.6.1 release
-
- -- chris grzegorczyk <grze at eucalyptus.com> Thu, 5 Nov 2009 13:36:41 -0700
-
-eucalyptus (1.6.0-0euca1) karmic; urgency=low
-
- * Test build
-
- -- chris grzegorczyk <grze at eucalyptus.com> Thu, 27 Aug 2009 09:29:37 -0700
-
-eucalyptus (1.5.2-0euca424ga75) unstable; urgency=low
-
- * Prepare GA for release.
-
- -- chris grzegorczyk <grze at eucalyptus.com> Thu, 16 Jul 2009 20:08:40 -0700
-
-eucalyptus (1.5.2-0euca424ga74) unstable; urgency=low
-
- * Prepare GA for release.
-
- -- chris grzegorczyk <grze at eucalyptus.com> Thu, 16 Jul 2009 20:04:29 -0700
-
-eucalyptus (1.5.2-0euca424ga73) unstable; urgency=low
-
- * Prepare GA for release.
-
- -- chris grzegorczyk <grze at eucalyptus.com> Thu, 16 Jul 2009 19:59:02 -0700
-
-eucalyptus (1.5.2-0euca424ga72) unstable; urgency=low
-
- * Prepare GA for release.
-
- -- chris grzegorczyk <grze at eucalyptus.com> Thu, 16 Jul 2009 19:18:20 -0700
-
-eucalyptus (1.5.2-0euca424ga71) unstable; urgency=low
-
- * Prepare GA for release.
-
- -- chris grzegorczyk <grze at eucalyptus.com> Thu, 16 Jul 2009 19:15:06 -0700
-
-eucalyptus (1.5.2-0euca424ga68) unstable; urgency=low
-
- * Prepare GA for release.
-
- -- chris grzegorczyk <grze at eucalyptus.com> Thu, 16 Jul 2009 18:12:41 -0700
-
-eucalyptus (1.5.2-0euca424ga68) unstable; urgency=low
-
- * Prepare GA for release.
-
- -- chris grzegorczyk <grze at eucalyptus.com> Thu, 16 Jul 2009 18:12:12 -0700
-
-eucalyptus (1.5.2-0euca6) unstable jaunty; urgency=low
-
- * Update to r400
-
- -- chris grzegorczyk <chris.grze at gmail.com> Fri, 19 Jun 2009 16:42:32 -0700
-
-eucalyptus (1.5.2-0euca5) unstable jaunty; urgency=low
-
- * Add bridge-utils to the CC recommends
-
- -- chris grzegorczyk <chris.grze at gmail.com> Fri, 19 Jun 2009 11:31:08 -0700
-
-eucalyptus (1.5.2-0euca4) unstable jaunty; urgency=low
-
- * Fix configure for cloud
-
- -- chris grzegorczyk <chris.grze at gmail.com> Fri, 19 Jun 2009 11:11:22 -0700
-
-eucalyptus (1.5.2-0euca3) unstable jaunty; urgency=low
-
- * Change default VNET_BRIDGE to br0 for jaunty
-
- -- chris grzegorczyk <chris.grze at gmail.com> Fri, 19 Jun 2009 08:39:21 -0700
-
-eucalyptus (1.5.2-0euca2) unstable jaunty; urgency=low
-
- * Fix issue with euca_conf hardcoding @prefix@
- * Fix typo in -nc package calling -cc init file
-
- -- chris grzegorczyk <chris.grze at gmail.com> Thu, 18 Jun 2009 15:29:13 -0700
-
-eucalyptus (1.5.2-0euca1) jaunty experimental; urgency=low
-
- * Update to 1.5.2
-
- -- chris grzegorczyk <chris.grze at gmail.com> Mon, 15 Jun 2009 19:05:55 -0700
-
-eucalyptus (1.5.1-0euca2) experimental; urgency=low
-
- * Fix issue with nc and cc setup in postinst
-
- -- chris grzegorczyk <chris.grze at gmail.com> Mon, 11 May 2009 19:43:46 -0700
-
-eucalyptus (1.5.1-0euca1) jaunty experimental; urgency=low
-
- * Testing final release version.
-
- -- chris grzegorczyk <grze at eucalyptus.com> Fri, 24 Apr 2009 22:11:37 -0700
-
-eucalyptus (1.5.1~rc3-0euca2) experimental; urgency=low
-
- * Adjusted to depend on xen
-
- -- chris grzegorczyk <grze at eucalyptus.com> Wed, 22 Apr 2009 03:21:38 -0700
-
-eucalyptus (1.5.1~rc3-0euca1) experimental; urgency=low
-
- * Bump
-
- -- chris grzegorczyk <grze at eucalyptus.com> Thu, 16 Apr 2009 18:16:17 -0700
-
-eucalyptus (1.5.1~rc2-0euca1) experimental; urgency=low
-
- * Port of ubuntu package created by Soren Hansen
- * Move eucalyptus-javadeps to use lib/* and deploy/*
-
- -- chris grzegorczyk <grze at eucalyptus.com> Mon, 13 Apr 2009 22:41:14 -0700
-
-eucalyptus (1.5~bzr266-0ubuntu2) jaunty; urgency=low
-
- * Ship missing populate_arp.pl. (LP: #358541)
-
- -- Soren Hansen <soren at ubuntu.com> Thu, 09 Apr 2009 17:54:34 +0200
-
-eucalyptus (1.5~bzr266-0ubuntu1) jaunty; urgency=low
-
- * New upstream snapshot. (LP: #356519)
-
- -- Soren Hansen <soren at ubuntu.com> Tue, 07 Apr 2009 16:11:48 +0200
-
-eucalyptus (1.5~bzr265-0ubuntu1) jaunty; urgency=low
-
- * New upstream snapshot. (LP: #354795, #354846, #352896, #354895,
- #354852, #354098, #351650, #353301)
-
- -- Soren Hansen <soren at ubuntu.com> Mon, 06 Apr 2009 11:27:50 +0200
-
-eucalyptus (1.5~bzr250-0ubuntu1) UNRELEASED; urgency=low
-
- * New upstream snapshot. (LP: #347629, #345165)
-
- -- Soren Hansen <soren at ubuntu.com> Wed, 01 Apr 2009 17:36:23 -0400
-
-eucalyptus (1.5~bzr241-0ubuntu1) jaunty; urgency=low
-
- * New upstream snapshot.
- + Make sure that no addresses outside the specified range are used.
- (LP: #344330)
- + Fix EBS volume detachment. (LP: #344568)
- + Fix EBS volume attachment. (LP: #344613)
- + Fix deletiong volumes marked as deleted. (LP: #344620)
- + Add missing EBS flag in sample conffile. (LP: #345004)
- + Allow more concurrent downloads from Walrus. (LP: #345034)
- * Rely on libvirt's defaults for the emulator. (LP: #336852)
-
- -- Soren Hansen <soren at ubuntu.com> Thu, 19 Mar 2009 00:33:07 +0100
-
-eucalyptus (1.5~bzr232-0ubuntu1) jaunty; urgency=low
-
- * New upstream snapshot. (LP: #342024, #341965)
- + Correctly set up swap and ephemeral storage for KVM VM's. (LP:
- #332973)
- + Use correct names for devices. (LP: #334665)
- + Use compression for image transfers. (LP: #332971)
- + Don't fail if first attempt at image download fails. (LP: #337027)
- + Don't time out if image transfer takes more than one hour, but is
- still on-going. (LP: #337870)
- + Don't allow to delete in-use volumes. (LP: #342121)
- + Correctly handle failure to attach volumes (LP: #342077)
- + Handle unknown EBS block device names with KVM backend. (LP: #342076)
- + Make euca_conf -delnode remove the node properly. (LP: #342055)
- * Drop addnode-ssh-magic.patch. Adopted upstream.
-
- -- Soren Hansen <soren at ubuntu.com> Tue, 17 Mar 2009 23:14:50 +0100
-
-eucalyptus (1.5~bzr212-0ubuntu4) UNRELEASED; urgency=low
-
- * Also create /var/run/eucalyptus/net for the node controller.
- (LP: #338764)
- * Added bridge-utils and dhcp3-server as recommended packages for the
- node controller. (LP: #338846)
-
- -- Soren Hansen <soren at ubuntu.com> Mon, 16 Mar 2009 09:43:08 +0100
-
-eucalyptus (1.5~bzr212-0ubuntu3) jaunty; urgency=low
-
- * Create /var/run/eucalyptus in all the init scripts.
-
- -- Soren Hansen <soren at ubuntu.com> Tue, 10 Mar 2009 23:16:19 +0100
-
-eucalyptus (1.5~bzr212-0ubuntu2) jaunty; urgency=low
-
- * Fix version check in eucalyptus-cc's postinst. (LP: #337477 (again))
- * Patch euca_conf's addnode functionality to allow the use of sudo on
- the node controller, and also fix up the path to authorized_keys.
- * Have eucalyptus-nc's postinst script create the authorized_keys file
- to make sure it gets the right ownership and mode.
- * Give the eucalyptus user a shell, and remove the various hacks applied
- to work around the lack of it.
-
- -- Soren Hansen <soren at ubuntu.com> Tue, 10 Mar 2009 10:08:49 +0200
-
-eucalyptus (1.5~bzr212-0ubuntu1) jaunty; urgency=low
-
- * New upstream release (LP: #337042, #337514, #337539, #337541, #337884,
- #338486)
- * Weed out the unused/obsolete patches.
-
- -- Soren Hansen <soren at ubuntu.com> Mon, 09 Mar 2009 18:38:59 +0100
-
-eucalyptus (1.5~bzr203-0ubuntu3) UNRELEASED; urgency=low
-
- * Create SSH keypair for eucalyptus user on cluster controller. (LP: 337477)
-
- -- Soren Hansen <soren at ubuntu.com> Mon, 09 Mar 2009 16:58:40 +0100
-
-eucalyptus (1.5~bzr203-0ubuntu2) jaunty; urgency=low
-
- * Added missing dependencies:
- + eucalyptus-cloud: vblade, lvm2, dmsetup
- + eucalyptus-nc: adduser
- * Split out the init script so that each component has its own (LP: #334804)
- * Make eucalyptus user a member of libvirtd on the node controller. (LP: #337482)
-
- -- Soren Hansen <soren at ubuntu.com> Wed, 04 Mar 2009 12:07:53 -0800
-
-eucalyptus (1.5~bzr203-0ubuntu1) jaunty; urgency=low
-
- * New upstream release. (LP: #334732, #336841)
-
- -- Soren Hansen <soren at ubuntu.com> Tue, 03 Mar 2009 10:01:33 -0800
-
-eucalyptus (1.5~bzr198-0ubuntu5) UNRELEASED; urgency=low
-
- * Fixed missing dependency on eucalytus-gl for eucalyptus-{nc,cc}.
- * Disable JCE check. (LP: #334501)
-
- -- Soren Hansen <soren at ubuntu.com> Tue, 03 Mar 2009 09:18:03 -0800
-
-eucalyptus (1.5~bzr198-0ubuntu4) jaunty; urgency=low
-
- * Add libvirt-bin and kvm as Recommends for the node controller,
- and make kvm the default hypervisor.
-
- -- Soren Hansen <soren at ubuntu.com> Wed, 25 Feb 2009 14:07:45 +0100
-
-eucalyptus (1.5~bzr198-0ubuntu3) jaunty; urgency=low
-
- * Fix spelling mistake in eucalyptus-common.postinst.
- * Make sure we actually run the cloud controller by using a valid shell.
- * Start the cluster controller even if no NODES are defined.
-
- -- Soren Hansen <soren at ubuntu.com> Tue, 24 Feb 2009 16:49:06 +0100
-
-eucalyptus (1.5~bzr198-0ubuntu2) jaunty; urgency=low
-
- * Make sure rootwrap binary gets its ownership and mode applied
- immediately.
- * Correctly set EUCA_USER from -common's postinst. (LP: #333341)
- * Don't fail in the init script if NODES is empty. (LP: #333333)
-
- -- Soren Hansen <soren at ubuntu.com> Mon, 23 Feb 2009 20:42:24 +0100
-
-eucalyptus (1.5~bzr198-0ubuntu1) jaunty; urgency=low
-
- * New upstream release
-
- -- Soren Hansen <soren at ubuntu.com> Thu, 19 Feb 2009 01:00:04 +0200
-
-eucalyptus (1.5~bzr184-0ubuntu3) UNRELEASED; urgency=low
-
- * Create eucalyptus user in eucalyptus-common.postinst.
- * Fix ownership of /usr/share/eucalyptus/euca_rootwrap
- * init_lsb_headers.diff:
- - Add LSB headers to init script
- * axis2c_home_init.diff:
- - Set AXIS2_HOME in init script.
- - Point Eucalyptus apache instance at the axis2 module.
- * Add apache2-mpm and libapache2-mod-axis2c dependencies to node and
- cluster controller.
-
- -- Soren Hansen <soren at ubuntu.com> Thu, 19 Feb 2009 00:50:30 +0200
-
-eucalyptus (1.5~bzr184-0ubuntu2) jaunty; urgency=low
-
- * initscript-eucalyptus-path.diff:
- - Default to "/" for the EUCALYPTUS variable in init script.
- * init-reload.diff:
- - Add a "reload" option to the init script (does the same as restart).
- * var_lib_eucalyptus.diff:
- - Change all references to /var/eucalyptus to /var/lib/eucalyptus.
- * Make all components depend on eucalyptus-common.
- * Make eucalyptus-common postinst perform some initial configuration.
- * Have eucalyptus-cloud depend on eucalyptus-javadeps instead of
- shipping them itself.
- * Make eucalyptus-{cc,nc,cloud}.postinst set up the individual services
- automatically.
-
- -- Soren Hansen <soren at ubuntu.com> Wed, 18 Feb 2009 18:25:36 +0200
-
-eucalyptus (1.5~bzr184-0ubuntu1) jaunty; urgency=low
-
- * New upstream release
-
- -- Soren Hansen <soren at ubuntu.com> Wed, 18 Feb 2009 09:46:17 +0200
-
-eucalyptus (1.5~bzr139-0ubuntu1) jaunty; urgency=low
-
- * Initial release.
-
- -- Soren Hansen <soren at ubuntu.com> Wed, 11 Feb 2009 02:45:39 +0200
-
-
-
-
-
-
-
-
-
-
+ -- Brian Thomason <brian.thomason at eucalyptus.com> Tue, 29 Nov 2011 13:17:52 -0500
Modified: eucalyptus/trunk/debian/control
===================================================================
--- eucalyptus/trunk/debian/control 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/control 2012-07-07 01:27:05 UTC (rev 244)
@@ -3,56 +3,141 @@
Priority: extra
Maintainer: Debian Eucalyptus Maintainers <pkg-eucalyptus-maintainers at lists.alioth.debian.org>
DM-Upload-Allowed: yes
-Uploaders: Chris Grzegorczyk <grze at eucalyptus.com>, Graziano Obertelli <graziano at eucalyptus.com>, Kyo Lee <kyo.lee at eucalyptus.com>, Daniel Nurmi <nurmi at eucalyptus.com>
-Build-Depends: cdbs, debhelper (>= 7), libaxis2c-dev, librampart-dev, default-jdk, ant, libvirt-dev,
- libcurl4-gnutls-dev, libssl-dev, ant-optional, zlib1g-dev, pkg-config,
- libbackport-util-concurrent-java,
- libwsdl4j-java,
- libhsqldb-java,
- libaxiom-java,
- libbcprov-java,
- libcap-dev,
- libcommons-io-java,
- libcommons-fileupload-java,
- libcommons-httpclient-java,
- libcommons-lang-java,
- libcommons-pool-java (>= 1.4),
- libproxool-java,
- libdnsjava-java,
- libjibx1.1-java,
- libclean-crypto-java,
- libmule-java-2.0,
- libgnumail-java,
- libgeronimo-j2ee-connector-1.5-spec-java,
- libgeronimo-jpa-2.0-spec-java,
- libgoogle-collections-java,
- junit,
- groovy (>= 1.6.4),
- libgwt-user-java,
- libjaxp1.3-java,
- libjetty-java | libjetty6-java,
- libjetty-extra-java | libjetty6-java,
- libjson-java,
- liblog4j1.2-java,
- libnetty-java,
- libservlet2.5-java,
- libwss4j-java,
- libxalan2-java,
- libxerces2-java,
- libxml-security-java (>= 1.4.2-1ubuntu1),
- libgwt-dev-java,
- libecj-java,
- libantlr-java,
- libspring-context-support-java, libspring-web-java,
- libhibernate-annotations-java, libhibernate-commons-annotations-java, libhibernate3-java, libehcache-java,
- libxml2-dev, libxslt1-dev
-Standards-Version: 3.9.0
+Uploaders: Brian Thomason <brian.thomason at eucalyptus.com>, Rudy Godoy <rudy at stone-head.org>
+Build-Depends: cdbs,
+ debhelper (>= 7),
+ libaxis2c-dev,
+ librampart-dev,
+ default-jdk,
+ libvirt-dev,
+ libfuse-dev,
+ libfuse2,
+ libcurl4-openssl-dev,
+ libssl-dev,
+ ant-optional,
+ zlib1g-dev,
+ pkg-config,
+ swig,
+ python,
+ python-setuptools,
+ rsync,
+ wget,
+ open-iscsi,
+ libxslt1-dev,
+ gengetopt,
+ ant,
+ groovy,
+ janino,
+ junit4,
+ libactivemq-java,
+ antlr3,
+ libavalon-framework-java,
+ libaxiom-java,
+ libbackport-util-concurrent-java,
+ libbatik-java,
+ libbcel-java,
+ libbcprov-java (>= 1.46),
+ libbsf-java,
+ libcommons-beanutils-java,
+ libcommons-cli-java,
+ libcommons-codec-java,
+ libcommons-collections3-java,
+ libcommons-digester-java,
+ libcommons-discovery-java,
+ libcommons-fileupload-java,
+ libcommons-httpclient-java,
+ libcommons-io-java,
+ libcommons-jxpath-java,
+ libcommons-lang-java,
+ libcommons-logging-java,
+ libcommons-pool-java,
+ libdnsjava-java,
+ libdom4j-java,
+ libehcache-java,
+ libexcalibur-logkit-java,
+ libezmorph-java,
+ libgeronimo-activation-1.1-spec-java,
+ libgeronimo-ejb-3.0-spec-java,
+ libgeronimo-javamail-1.4-provider-java,
+ libgeronimo-javamail-1.4-spec-java,
+ libgeronimo-jms-1.1-spec-java,
+ libgeronimo-jpa-2.0-spec-java,
+ libgeronimo-jta-1.1-spec-java,
+ libgeronimo-stax-1.2-spec-java,
+ libguava-java,
+ libhamcrest1.2-java | libhamcrest-java (>= 1.2),
+ libhsqldb-java,
+ libitext-java,
+ libjavassist-java,
+ libjaxen-java,
+ libjaxp1.3-java,
+ libjboss-marshalling-java,
+ libjcip-annotations-java,
+ libjettison-java,
+ libjetty-extra-java,
+ libjetty-java,
+ libjgroups-java (>= 2.11.1),
+ libjibx1.2-java,
+ libjna-java,
+ libjsch-java,
+ libjson-java,
+ libjug-java,
+ liblog4j1.2-java,
+ libmule-java-2.0,
+ libnetty3.1-java | libnetty-java (<< 1:3.2),
+ libproxool-java,
+ libquartz-java,
+ libregexp-java,
+ libservlet2.5-java,
+ libslf4j-java,
+ libspring-beans-java,
+ libspring-context-java,
+ libspring-context-support-java,
+ libspring-core-java,
+ libspring-web-java,
+ libstax2-api-java,
+ libwsdl4j-java,
+ libwss4j-java,
+ libxalan2-java,
+ libxerces2-java,
+ libxml-security-java,
+ libxom-java,
+ libxpp3-java,
+ velocity (>= 1.7),
+ libaxis-java,
+ libhibernate3-java,
+ libcommons-compress-java,
+ libbtm-java (>= 2.1.2),
+ libjasperreports3.7-java,
+ libwoodstox-java,
+ libcglib-java,
+ libclean-crypto-java,
+ libgeronimo-j2ee-connector-1.5-spec-java,
+ libjboss-cache3-java,
+ libha-jdbc-java,
+ libgroovy1.7.2-java | libgroovy1.7-java,
+ libhibernate-jbosscache-java,
+ libwsdl2c-java,
+ libhibernate-validator-java,
+ libspring-expression-java,
+ libhibernate-commons-annotations-java,
+ libjboss-common-java,
+ libantlr-java,
+ libpostgresql-jdbc-java,
+ libasm3-java,
+ postgresql-server-dev-9.1
+Standards-Version: 3.9.3
+XS-Python-Version: >= 2.7
Homepage: http://open.eucalyptus.com/
Package: eucalyptus-common
-Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, openssh-server, openssh-client, sudo, rsync
-Recommends: avahi-utils, unzip, eucalyptus-cloud|eucalyptus-sc|eucalyptus-nc
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, openssh-server,
+ openssh-client, sudo, rsync, postgresql-client-9.1, python (>= 2.5),
+ eucalyptus-admin-tools (= ${source:Version}), python-pygresql
+Recommends: python-boto (>= 2.1), unzip
+Replaces: eucalyptus-sc (<< ${binary:Version})
+Breaks: eucalyptus-sc (<< ${binary:Version})
Description: Elastic Utility Computing Architecture - Common files
EUCALYPTUS is an open source service overlay that implements elastic
computing using existing resources. The goal of EUCALYPTUS is to allow
@@ -63,9 +148,12 @@
eucalyptus-cloud, eucalyptus-cc or eucalyptus-nc (or all of them).
Package: eucalyptus-sc
-Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, eucalyptus-common (>= ${binary:Version}), eucalyptus-java-common (>= ${binary:Version}), tgt
-Suggests: aoetools
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, eucalyptus-common (= ${binary:Version}),
+ eucalyptus-java-common (= ${binary:Version}), tgt, open-iscsi, libcrypt-openssl-random-perl,
+ libcrypt-openssl-rsa-perl, libcrypt-x509-perl, lvm2, vblade, eucalyptus-admin-tools (= ${source:Version})
+Replaces: eucalyptus-java-common (<< ${binary:Version})
+Breaks: eucalyptus-java-common (<< ${binary:Version})
Description: Elastic Utility Computing Architecture - Storage controller
EUCALYPTUS is an open source service overlay that implements elastic
computing using existing resources. The goal of EUCALYPTUS is to allow
@@ -77,26 +165,30 @@
at a particular resource of a compute cluster.
Package: eucalyptus-cloud
-Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, eucalyptus-common (>= ${binary:Version}), eucalyptus-java-common (>= ${binary:Version})
-Recommends: postfix | mail-transport-agent
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, eucalyptus-common (= ${binary:Version}),
+ eucalyptus-java-common (= ${binary:Version}), python-eucadmin (= ${source:Version}),
+ lvm2, euca2ools (>= 2.0), libgetargs-long-perl, eucalyptus-admin-tools (= ${source:Version}),
+ postgresql-9.1
Replaces: eucalyptus-cc (<< 1.6), eucalyptus-sc (<< 1.6), eucalyptus-walrus (<< 1.6)
-Suggests: euca2ools
+Recommends: python-boto (>= 2.1), postfix | mail-transport-agent
Description: Elastic Utility Computing Architecture - Cloud controller
EUCALYPTUS is an open source service overlay that implements elastic
computing using existing resources. The goal of EUCALYPTUS is to allow
sites with existing clusters and server infrastructure to co-host an
elastic computing service that is interface-compatible with Amazon's EC2.
.
- This package contains the cloud controller part of eucalyptus. It
+ This package contains the cloud controller part of eucalyptus. It
presents a web site, i.e. the face of the cloud at a particular
site. A cloud will not be functional without storage and node
controllers, but those do not need to be installed all on the same
machine, hence there is no dependency on the respective packages.
Package: eucalyptus-walrus
-Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, eucalyptus-common (>= ${binary:Version}), eucalyptus-java-common (>= ${binary:Version})
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, lvm2, eucalyptus-common (= ${binary:Version}),
+ eucalyptus-java-common (= ${binary:Version}), eucalyptus-admin-tools (= ${source:Version}),
+ drbd8-utils (>= 8.3)
Suggests: euca2ools
Description: Elastic Utility Computing Architecture - Walrus (S3)
EUCALYPTUS is an open source service overlay that implements elastic
@@ -110,76 +202,34 @@
cloud.
Package: eucalyptus-java-common
-Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, vblade, lvm2, dmsetup, openssh-server, eucalyptus-common (>= ${binary:Version}),
- default-jre-headless | java5-runtime-headless,
- libecj-java,
- libbackport-util-concurrent-java,
- libaxiom-java,
- libbcprov-java,
- libcommons-fileupload-java,
- libcommons-httpclient-java,
- libcommons-lang-java,
- libcommons-pool-java (>= 1.4),
- libdnsjava-java,
- libjibx1.1-java,
- libclean-crypto-java,
- libmule-java-2.0,
- libgnumail-java,
- libgeronimo-jpa-2.0-spec-java,
- libgoogle-collections-java,
- groovy (>= 1.6.4),
- libgwt-user-java,
- libjaxp1.3-java,
- libjetty-java | libjetty6-java,
- libjetty-extra-java | libjetty6-java,
- libjson-java,
- liblog4j1.2-java,
- libnetty-java,
- libservlet2.5-java,
- libwss4j-java,
- libxalan2-java,
- libxerces2-java,
- libxml-security-java (>= 1.4.2-1ubuntu1),
- antlr3,
- libantlr-java,
- libasm3-java,
- libbcel-java,
- libbsf-java,
- libproxool-java,
- libcglib-java | libcglib2.1-java,
- libcommons-beanutils-java,
- libcommons-cli-java,
- libcommons-codec-java,
- libcommons-collections3-java,
- libcommons-discovery-java,
- libcommons-io-java,
- libcommons-jxpath-java,
- libcommons-logging-java,
- libdom4j-java,
- libezmorph-java,
- libgnujaf-java,
- libgeronimo-ejb-3.0-spec-java,
- libgeronimo-j2ee-connector-1.5-spec-java,
- libgeronimo-jms-1.1-spec-java,
- libgeronimo-jta-1.0.1b-spec-java,
- libgeronimo-jacc-1.1-spec-java,
- libgeronimo-interceptor-3.0-spec-java,
- libhsqldb-java,
- janino,
- libjavassist-java,
- libjaxen-java,
- libjug-java,
- libexcalibur-logkit-java,
- libregexp-java,
- libslf4j-java,
- libwsdl4j-java,
- libxom-java,
- libwoodstox-java,
- libxpp3-java,
- libspring-beans-java, libspring-context-support-java, libspring-context-java, libspring-core-java, libspring-web-java,
- libhibernate-annotations-java, libhibernate-commons-annotations-java, libhibernate3-java, libehcache-java
-Replaces: eucalyptus-javadeps, eucalyptus-common, eucalyptus-cloud
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, vblade, lvm2, dmsetup, openssh-server,
+ eucalyptus-common (= ${binary:Version}), default-jre-headless | java6-runtime-headless,
+ velocity, eucalyptus-admin-tools (= ${source:Version}), libpostgresql-jdbc-java (>= 9.1),
+ libjboss-common-java, libhibernate-commons-annotations-java, bc, junit4, libactivemq-java,
+ antlr3, libasm3-java, libavalon-framework-java, libaxiom-java, libbackport-util-concurrent-java,
+ libbatik-java, libbcel-java, libbcprov-java (>= 1.46), libbsf-java, libcommons-beanutils-java,
+ libcommons-cli-java, libcommons-codec-java, libcommons-collections3-java, libcommons-digester-java,
+ libcommons-discovery-java, libcommons-fileupload-java, libcommons-httpclient-java, libcommons-io-java,
+ libcommons-jxpath-java, libcommons-lang-java, libcommons-logging-java, libcommons-pool-java,
+ libdnsjava-java, libdom4j-java, libehcache-java, libexcalibur-logkit-java, libezmorph-java,
+ libgeronimo-activation-1.1-spec-java, libgeronimo-ejb-3.0-spec-java, libantlr-java,
+ libgeronimo-javamail-1.4-provider-java, libgeronimo-javamail-1.4-spec-java, libgeronimo-jms-1.1-spec-java,
+ libgeronimo-jpa-2.0-spec-java, libgeronimo-jta-1.1-spec-java, libgeronimo-stax-1.2-spec-java,
+ libguava-java, libhamcrest1.2-java | libhamcrest-java (>= 1.2), libhsqldb-java, libitext-java,
+ libjavassist-java, libjaxen-java, libjaxp1.3-java, libjboss-marshalling-java, libjcip-annotations-java,
+ libjettison-java, libjetty-extra-java, libjetty-java, libjgroups-java (>= 2.11.1), libjibx1.2-java,
+ libjna-java, libjsch-java, libjson-java, libjug-java, liblog4j1.2-java, libmule-java-2.0,
+ libnetty3.1-java | libnetty-java (<< 1:3.2), libproxool-java, libquartz-java, libregexp-java, libservlet2.5-java,
+ libslf4j-java, libspring-beans-java, libspring-context-java, libspring-context-support-java,
+ libspring-core-java, libspring-web-java, libstax2-api-java, libwsdl4j-java, libwss4j-java, libxalan2-java,
+ libxerces2-java, libxml-security-java, libxom-java, libxpp3-java, velocity (>= 1.7), libaxis-java,
+ libhibernate3-java, libcommons-compress-java, libbtm-java (>= 2.1.2), libjasperreports3.7-java,
+ libwoodstox-java, libcglib-java, libclean-crypto-java, libgeronimo-j2ee-connector-1.5-spec-java,
+ libjboss-cache3-java, libha-jdbc-java, libgroovy1.7.2-java | libgroovy1.7-java, libhibernate-jbosscache-java,
+ libhibernate-validator-java, libspring-expression-java, janino
+Replaces: eucalyptus-javadeps, eucalyptus-common, eucalyptus-cloud
+Conflicts: libeucalyptus-commons-ext-java
Description: Elastic Utility Computing Architecture - Common Java package
EUCALYPTUS is an open source service overlay that implements elastic
computing using existing resources. The goal of EUCALYPTUS is to allow
@@ -189,9 +239,10 @@
This package contains everything the java based packages share.
Package: eucalyptus-cc
-Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, eucalyptus-common (>= ${binary:Version}), apache2, libapache2-mod-axis2c (>= 1.6.0-2),
- eucalyptus-gl (>= ${binary:Version}), avahi-utils, librampart0 (>= 1.3.0-2), bridge-utils, vlan, dhcp3-server
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, eucalyptus-common (= ${binary:Version}), apache2,
+ libapache2-mod-axis2c, eucalyptus-gl (= ${binary:Version}), librampart0 (>= 1.3.0-1euca2),
+ bridge-utils, vlan, dhcp3-server, iptables, eucalyptus-admin-tools (= ${source:Version})
Recommends: vtun, libpam-modules (>= 1.0.1-9ubuntu3)
Conflicts: apache2-mpm-itk
Description: Elastic Utility Computing Architecture - Cluster controller
@@ -206,12 +257,14 @@
into a single cloud.
Package: eucalyptus-nc
-Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, eucalyptus-common (>= ${binary:Version}),
- apache2-mpm-worker | apache2-mpm-prefork, libapache2-mod-axis2c (>= 1.6.0-2),
- eucalyptus-gl (>= ${binary:Version}), adduser, avahi-utils, librampart0 (>= 1.3.0-2), parted, libvirt-bin
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, eucalyptus-common (= ${binary:Version}),
+ apache2-mpm-worker | apache2-mpm-prefork, libapache2-mod-axis2c, eucalyptus-gl (= ${binary:Version}),
+ adduser, librampart0 (>= 1.3.0-1euca2), parted, libvirt-bin, open-iscsi, libcrypt-openssl-random-perl,
+ libcrypt-openssl-rsa-perl, libcrypt-x509-perl, euca2ools (>= 1.4~), libdevmapper,
+ eucalyptus-admin-tools (= ${source:Version}), file, parted, rsync
Replaces: eucalyptus-common
-Recommends: vlan, bridge-utils, qemu-kvm, aoetools
+Recommends: vlan, bridge-utils, qemu-kvm
Conflicts: apache2-mpm-itk, qemu (<< 0.11.0-0)
Description: Elastic Utility Computing Architecture - Node controller
EUCALYPTUS is an open source service overlay that implements elastic
@@ -224,8 +277,8 @@
status to the cluster controller.
Package: eucalyptus-gl
-Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, eucalyptus-common (>= ${binary:Version})
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, eucalyptus-common (= ${binary:Version}), apache2
Description: Elastic Utility Computing Architecture - Logging service
EUCALYPTUS is an open source service overlay that implements elastic
computing using existing resources. The goal of EUCALYPTUS is to allow
@@ -236,3 +289,34 @@
information one can then determine the user that was running an instance
with a particular IP number at a given time.
+
+Package: eucalyptus-admin-tools
+Architecture: all
+Depends: python (>= 2.5), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends},
+ python-eucadmin (= ${binary:Version}), rsync
+Replaces: eucalyptus-common (<< ${binary:Version})
+Breaks: eucalyptus-common (<< ${binary:Version})
+Description: Elastic Utility Computing Architecture - admin CLI tools
+ EUCALYPTUS is an open source service overlay that implements elastic
+ computing using existing resources. The goal of EUCALYPTUS is to allow
+ sites with existing clusters and server infrastructure to co-host an
+ elastic computing service that is interface-compatible with Amazon's EC2.
+ .
+ This package contains command line tools necessary for managing a Eucalyptus
+ cluster.
+
+Package: python-eucadmin
+Architecture: all
+Section: python
+Depends: python (>= 2.5), ${python:Depends}, ${misc:Depends}, python-boto (>= 2.1),
+ rsync, postgresql-client-9.1, python-psutil (>= 0.1.2)
+XB-Python-Version: ${python:Versions}
+Description: Elastic Utility Computing Architecture - python-eucadmin
+ EUCALYPTUS is an open source service overlay that implements elastic
+ computing using existing resources. The goal of EUCALYPTUS is to allow
+ sites with existing clusters and server infrastructure to co-host an
+ elastic computing service that is interface-compatible with Amazon's EC2.
+ .
+ This package contains the Python library used by Eucalyptus
+ administration tools. It is neither intended nor supported for use by
+ any other programs.
Modified: eucalyptus/trunk/debian/copyright
===================================================================
--- eucalyptus/trunk/debian/copyright 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/copyright 2012-07-07 01:27:05 UTC (rev 244)
@@ -1,80 +1,74 @@
-This package was originally debianized by Soren Hansen <soren at ubuntu.com> on
-Wed, 11 Feb 2009 02:11:00 +0200 and subsequently modififed by Chris
-Grzegorczyk <grze at eucalyptus.com>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Eucalyptus Systems, Inc
+Upstream-Contact: Brian Thomason <brian.thomason at eucalyptus.com>
+Source: http://open.eucalyptus.com
-It was downloaded from http://launchpad.net/eucalyptus
-
-Authors:
- * Dan Nurmi <nurmi at eucalyptus.com>
- * Chris Grzegorczyk <grze at eucalyptus.com>
- * Graziano Obertelli <graziano at eucalyptus.com>
- * Neil Soman <neil at eucalyptus.com>
- * Rich Wolski <rich at eucalyptus.com>
- * Dmitrii Zagorodnov <dmitrii at eucalyptus.com>
-
-Copyright:
- Copyright (c) 2009-2010 Eucalyptus Systems, Inc.
-
-The Eucalyptus source code is covered by the GPLv3:
-
+Files: *
+Copyright: Copyright (C) 2009-2012 Eucalyptus Systems, Inc
+License: GPL-3.0+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation version 3 of the License.
-
- This program is distributed in the hope that it will be useful,
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+ .
You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
- In addition, as a special exception, Eucalyptus Systems, Inc.
- gives permission to link the code of the Eucalyptus components:
- Eucalyptus Node Controller (eucalyptus-nc) with the OpenSSL project's
- "OpenSSL" library (or with modified versions of it that use the same
- license as the "OpenSSL" library), and distribute the linked
- executables. You must obey the GNU General Public License in all
- respects for all of the code used other than "OpenSSL". If you modify
- this file, you may extend this exception to your version of the file,
- but you are not obligated to do so. If you do not wish to do so,
- delete this exception statement from your version.
-
- On Debian systems, the complete text of the GNU General Public
- License, version 3, can be found in /usr/share/common-licenses/GPL-3.
-
-clc/modules/core/src/main/java/org/hsqldb/HsqlSocketFactorySecure.java is
-covered under the following copyright and license:
-
- Copyright (c) 2001-2008, The HSQL Development Group
+Files: clc/eucadmin/*
+Copyright: Copyright (C) 2009-2012 Eucalyptus Systems, Inc
+License: BSD-2-clause
+ Copyright (c) 2011, Eucalyptus Systems, Inc.
All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- Neither the name of the HSQL Development Group nor the names of its
- contributors may be used to endorse or promote products derived from this
- software without specific prior written permission.
-
+ .
+ Redistribution and use of this software in source and binary forms, with or
+ without modification, are permitted provided that the following conditions
+ are met:
+ .
+ Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the
+ following disclaimer.
+ .
+ Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+ .
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG,
- OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ .
+ On Debian systems, the complete text of the BSD License
+ can be found in "/usr/share/common-licenses/BSD".
-The original Debian packaging is copyright 2009, Soren Hansen <soren at ubuntu.com>,
-and copyright 2010 Eucalyptus Systems, Inc. and was originally released under the
-BSD license.
+Files: clc/modules/wsstack/src/main/java/org/*
+Copyright: Copyright (C) 2009 Red Hat, Inc.
+License: Apache
+ Copyright 2009 Red Hat, Inc.
+ Red Hat 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.
+ .
+ On Debian systems, the complete text of the Apache 2.0 License
+ can be found in "/usr/share/common-licenses/Apache-2.0".
Added: eucalyptus/trunk/debian/eucalyptus-admin-tools.install
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-admin-tools.install (rev 0)
+++ eucalyptus/trunk/debian/eucalyptus-admin-tools.install 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,34 @@
+/usr/sbin/euca_conf
+#/usr/sbin/euca-clone-volume
+/usr/sbin/euca-configure-vmware
+#/usr/sbin/euca-convert-volumes
+/usr/sbin/euca-deregister-arbitrator
+/usr/sbin/euca-deregister-cloud
+/usr/sbin/euca-deregister-cluster
+/usr/sbin/euca-deregister-storage-controller
+/usr/sbin/euca-deregister-vmware-broker
+/usr/sbin/euca-deregister-walrus
+/usr/sbin/euca-describe-arbitrators
+/usr/sbin/euca-describe-clusters
+/usr/sbin/euca-describe-components
+/usr/sbin/euca-describe-clouds
+/usr/sbin/euca-describe-nodes
+/usr/sbin/euca-describe-properties
+/usr/sbin/euca-describe-services
+/usr/sbin/euca-describe-storage-controllers
+/usr/sbin/euca-describe-walruses
+/usr/sbin/euca-describe-vmware-brokers
+/usr/sbin/euca-get-credentials
+/usr/sbin/euca-modify-cluster
+/usr/sbin/euca-modify-property
+/usr/sbin/euca-modify-storage-controller
+/usr/sbin/euca-modify-walrus
+/usr/sbin/euca-modify-service
+/usr/sbin/euca-register-arbitrator
+/usr/sbin/euca-register-cloud
+/usr/sbin/euca-register-cluster
+/usr/sbin/euca-register-storage-controller
+/usr/sbin/euca-register-vmware-broker
+/usr/sbin/euca-register-walrus
+
+
Added: eucalyptus/trunk/debian/eucalyptus-admin-tools.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-admin-tools.postinst (rev 0)
+++ eucalyptus/trunk/debian/eucalyptus-admin-tools.postinst 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+rm -rf /usr/sbin/euca_admin
+
+#DEBHELPER#
Added: eucalyptus/trunk/debian/eucalyptus-broker.dirs
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-broker.dirs (rev 0)
+++ eucalyptus/trunk/debian/eucalyptus-broker.dirs 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1 @@
+/var/lib/eucalyptus/vmware
\ No newline at end of file
Added: eucalyptus/trunk/debian/eucalyptus-broker.install
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-broker.install (rev 0)
+++ eucalyptus/trunk/debian/eucalyptus-broker.install 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,3 @@
+/usr/lib/eucalyptus/_euca_imager
+/usr/lib/eucalyptus/euca_imager
+/usr/share/eucalyptus/euca_vmware
\ No newline at end of file
Added: eucalyptus/trunk/debian/eucalyptus-broker.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-broker.postinst (rev 0)
+++ eucalyptus/trunk/debian/eucalyptus-broker.postinst 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+
+if [ "$1" = "configure" ]; then
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d eucalyptus-cloud stop > /dev/null 2>&1 ||true
+ else
+ /etc/init.d/eucalyptus-cloud stop > /dev/null 2>&1 ||true
+ fi
+
+fi
+
+#DEBHELPER#
Added: eucalyptus/trunk/debian/eucalyptus-broker.prerm
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-broker.prerm (rev 0)
+++ eucalyptus/trunk/debian/eucalyptus-broker.prerm 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+if [ "$1" = "remove" ]
+then
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d eucalyptus-cloud stop || true
+ else
+ /etc/init.d/eucalyptus-cloud stop || true
+ fi
+
+fi
+
+#DEBHELPER#
Modified: eucalyptus/trunk/debian/eucalyptus-cc.dirs
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-cc.dirs 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-cc.dirs 2012-07-07 01:27:05 UTC (rev 244)
@@ -1,3 +1,2 @@
/etc/update-motd.d
-/usr/lib/eucalyptus
/var/lib/eucalyptus/CC
Modified: eucalyptus/trunk/debian/eucalyptus-cc.install
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-cc.install 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-cc.install 2012-07-07 01:27:05 UTC (rev 244)
@@ -2,3 +2,5 @@
/etc/eucalyptus/vtunall.conf.template
/usr/lib/axis2/services/EucalyptusCC
/var/lib/eucalyptus/keys/nc-client-policy.xml
+/usr/share/eucalyptus/dynserv.pl
+/usr/lib/eucalyptus/shutdownCC
Added: eucalyptus/trunk/debian/eucalyptus-cc.lintian-overrides
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-cc.lintian-overrides (rev 0)
+++ eucalyptus/trunk/debian/eucalyptus-cc.lintian-overrides 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,2 @@
+#exception made in license
+eucalyptus-cc: possible-gpl-code-linked-with-openssl
Modified: eucalyptus/trunk/debian/eucalyptus-cc.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-cc.postinst 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-cc.postinst 2012-07-07 01:27:05 UTC (rev 244)
@@ -3,44 +3,17 @@
if [ "$1" = "configure" ]
then
- if ! dpkg-statoverride --list /var/lib/eucalyptus/CC >/dev/null 2>&1; then
- chown eucalyptus:eucalyptus /var/lib/eucalyptus/CC
- chmod 700 /var/lib/eucalyptus/CC
- fi
- if ! dpkg-statoverride --list /var/lib/eucalyptus/keys >/dev/null 2>&1; then
- chown eucalyptus:eucalyptus /var/lib/eucalyptus/keys
- chmod 700 /var/lib/eucalyptus/keys
- fi
-
- if dpkg --compare-versions "$2" lt 1.5~bzr212-0ubuntu2
- then
- EUCA_HOME=`getent passwd eucalyptus | cut -f6 -d:`
- if ! [ -d "$EUCA_HOME/.ssh" ]
- then
- mkdir -p "$EUCA_HOME/.ssh"
- chown eucalyptus "$EUCA_HOME/.ssh"
- chmod 755 "$EUCA_HOME/.ssh"
- fi
- if ! [ -f "$EUCA_HOME/.ssh/id_rsa" ]
- then
- su eucalyptus -c "ssh-keygen -N '' -t rsa -f $EUCA_HOME/.ssh/id_rsa"
- fi
- fi
-
update-rc.d eucalyptus-cc start 20 2 3 4 5 . stop 20 0 1 6 . >/dev/null
if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d eucalyptus-cc stop > /dev/null 2>&1 ||true
+ invoke-rc.d eucalyptus-cc cleanstop > /dev/null 2>&1 ||true
else
- /etc/init.d/eucalyptus-cc stop > /dev/null 2>&1 ||true
+ /etc/init.d/eucalyptus-cc cleanstop > /dev/null 2>&1 ||true
fi
- if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d eucalyptus-cc start ||true
- else
- /etc/init.d/eucalyptus-cc start ||true
- fi
fi
+dpkg-statoverride --force --update --add eucalyptus eucalyptus 755 /var/lib/eucalyptus/CC || true
+
#DEBHELPER#
Modified: eucalyptus/trunk/debian/eucalyptus-cc.postrm
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-cc.postrm 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-cc.postrm 2012-07-07 01:27:05 UTC (rev 244)
@@ -5,4 +5,6 @@
update-rc.d eucalyptus-cc remove
fi
+dpkg-statoverride --remove /var/lib/eucalyptus/CC || true
+
#DEBHELPER#
Added: eucalyptus/trunk/debian/eucalyptus-cc.preinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-cc.preinst (rev 0)
+++ eucalyptus/trunk/debian/eucalyptus-cc.preinst 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+if [ "$1" = "upgrade" ];
+then
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d eucalyptus-cc stop > /dev/null 2>&1 ||true
+ else
+ /etc/init.d/eucalyptus-cc stop > /dev/null 2>&1 ||true
+ fi
+fi
+
+if [ -L /etc/init.d/eucalyptus-cc ]; then
+ rm -f /etc/init.d/eucalyptus-cc
+fi
+
+#DEBHELPER#
Modified: eucalyptus/trunk/debian/eucalyptus-cc.prerm
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-cc.prerm 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-cc.prerm 2012-07-07 01:27:05 UTC (rev 244)
@@ -3,9 +3,9 @@
if [ "$1" = "remove" ]
then
if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d eucalyptus-cc stop || true
+ invoke-rc.d eucalyptus-cc cleanstop || true
else
- /etc/init.d/eucalyptus-cc stop || true
+ /etc/init.d/eucalyptus-cc cleanstop || true
fi
fi
Modified: eucalyptus/trunk/debian/eucalyptus-cloud.dirs
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-cloud.dirs 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-cloud.dirs 2012-07-07 01:27:05 UTC (rev 244)
@@ -1,3 +1 @@
-/var/lib/eucalyptus/db
-/var/lib/eucalyptus/modules
-/var/lib/eucalyptus/webapps
+
Modified: eucalyptus/trunk/debian/eucalyptus-cloud.install
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-cloud.install 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-cloud.install 2012-07-07 01:27:05 UTC (rev 244)
@@ -1,2 +1,3 @@
-/usr/share/eucalyptus/eucalyptus-cloud-*.jar
-/usr/share/eucalyptus/eucalyptus-www-*.jar
+/usr/sbin/euca-lictool
+/usr/share/eucalyptus/lic_default
+/usr/share/eucalyptus/lic_template
Modified: eucalyptus/trunk/debian/eucalyptus-cloud.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-cloud.postinst 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-cloud.postinst 2012-07-07 01:27:05 UTC (rev 244)
@@ -2,29 +2,13 @@
if [ "$1" = "configure" ]
then
- if ! dpkg-statoverride --list /var/lib/eucalyptus/db >/dev/null 2>&1; then
- chown eucalyptus:eucalyptus /var/lib/eucalyptus/db || true
- chmod 700 /var/lib/eucalyptus/db || true
- fi
- euca_conf --enable cloud
-
if which invoke-rc.d >/dev/null 2>&1; then
invoke-rc.d eucalyptus-cloud stop > /dev/null 2>&1 ||true
else
/etc/init.d/eucalyptus-cloud stop > /dev/null 2>&1 ||true
fi
- if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d eucalyptus-cloud start > /dev/null 2>&1 ||true
- else
- /etc/init.d/eucalyptus-cloud start > /dev/null 2>&1 ||true
- fi
-# if which invoke-rc.d >/dev/null 2>&1; then
-# invoke-rc.d eucalyptus-cloud restart > /dev/null 2>&1 ||true
-# else
-# /etc/init.d/eucalyptus-cloud restart > /dev/null 2>&1 ||true
-# fi
fi
#DEBHELPER#
Modified: eucalyptus/trunk/debian/eucalyptus-cloud.prerm
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-cloud.prerm 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-cloud.prerm 2012-07-07 01:27:05 UTC (rev 244)
@@ -2,7 +2,6 @@
if [ "$1" = "remove" ]
then
- euca_conf --disable cloud || true
if which invoke-rc.d >/dev/null 2>&1; then
invoke-rc.d eucalyptus-cloud stop || true
else
Modified: eucalyptus/trunk/debian/eucalyptus-common.dirs
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-common.dirs 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-common.dirs 2012-07-07 01:27:05 UTC (rev 244)
@@ -1 +1,5 @@
/var/lib/eucalyptus/keys
+/var/lib/eucalyptus/upgrade
+/var/lib/eucalyptus/db
+/var/lib/eucalyptus/webapps
+/var/log/eucalyptus
Modified: eucalyptus/trunk/debian/eucalyptus-common.install
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-common.install 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-common.install 2012-07-07 01:27:05 UTC (rev 244)
@@ -1,44 +1,19 @@
/etc/eucalyptus/eucalyptus.conf
-/var/log/eucalyptus
-/var/run/eucalyptus
-/usr/share/eucalyptus/add_key.pl
-/usr/share/eucalyptus/euca_ipt
-/usr/share/eucalyptus/populate_arp.pl
-/usr/share/eucalyptus/euca_upgrade
+/etc/eucalyptus/eucalyptus-version
+/etc/eucalyptus/httpd.conf
/usr/lib/eucalyptus/euca_rootwrap
/usr/lib/eucalyptus/euca_mountwrap
-/etc/bash_completion.d/euca_conf
-/usr/sbin/euca_conf
/usr/sbin/euca_sync_key
-/usr/sbin/euca_killall
-/etc/eucalyptus/httpd.conf
-/etc/eucalyptus/eucalyptus-version
+/usr/share/eucalyptus/add_key.pl
/usr/share/eucalyptus/connect_iscsitarget.pl
/usr/share/eucalyptus/disconnect_iscsitarget.pl
+/usr/share/eucalyptus/euca_ipt
+/usr/share/eucalyptus/euca_upgrade
/usr/share/eucalyptus/get_iscsitarget.pl
-/usr/sbin/euca-add-user
-/usr/sbin/euca-add-user-group
-/usr/sbin/euca-delete-user
-/usr/sbin/euca-delete-user-group
-/usr/sbin/euca-deregister-cluster
-/usr/sbin/euca-deregister-storage-controller
-/usr/sbin/euca-deregister-walrus
-/usr/sbin/euca-describe-clusters
-/usr/sbin/euca-describe-properties
-/usr/sbin/euca-describe-storage-controllers
-/usr/sbin/euca-describe-user-groups
-/usr/sbin/euca-describe-users
-/usr/sbin/euca-describe-walruses
-/usr/sbin/euca-get-credentials
-/usr/sbin/euca-modify-property
-/usr/sbin/euca-register-cluster
-/usr/sbin/euca-register-storage-controller
-/usr/sbin/euca-register-walrus
-/usr/sbin/euca_admin/__init__.py
-/usr/sbin/euca_admin/clusters.py
-/usr/sbin/euca_admin/generic.py
-/usr/sbin/euca_admin/groups.py
-/usr/sbin/euca_admin/properties.py
-/usr/sbin/euca_admin/storagecontrollers.py
-/usr/sbin/euca_admin/users.py
-/usr/sbin/euca_admin/walruses.py
+/usr/share/eucalyptus/populate_arp.pl
+/usr/share/eucalyptus/floppy
+/var/lib/eucalyptus/keys/cc-client-policy.xml
+/usr/share/eucalyptus/create-loop-devices
+/usr/share/eucalyptus/doc/libvirt-kvm-windows-example.xml
+/usr/share/eucalyptus/doc/libvirt-xen-windows-example.xml
+/var/log/eucalyptus
Modified: eucalyptus/trunk/debian/eucalyptus-common.lintian-overrides
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-common.lintian-overrides 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-common.lintian-overrides 2012-07-07 01:27:05 UTC (rev 244)
@@ -1,5 +1,2 @@
-# exception granted in license
-eucalyptus-common: possible-gpl-code-linked-with-openssl
# helpers, will never have manpages
-eucalyptus-common: binary-without-manpage usr/sbin/euca_killall
eucalyptus-common: binary-without-manpage usr/sbin/euca_sync_key
Modified: eucalyptus/trunk/debian/eucalyptus-common.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-common.postinst 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-common.postinst 2012-07-07 01:27:05 UTC (rev 244)
@@ -4,39 +4,51 @@
then
adduser --system --shell /bin/bash --home /var/lib/eucalyptus --group eucalyptus || true
fi
+
if [ "$1" = "configure" ]
then
- # let's see if it's an upgrade
- if [ -e /etc/eucalyptus/eucalyptus.conf.old ];
- then
- # let's check if we have a dist file
- if [ -e /etc/eucalyptus/eucalyptus.conf.dpkg-dist ];
+ if [ -z "$2" ]; then
+ # first install
+ euca_conf -d / --user eucalyptus --bridge br0 --hypervisor kvm --instances /var/lib/eucalyptus/instances --dhcpd /usr/sbin/dhcpd3 --dhcp_user dhcpd || true
+
+ elif dpkg --compare-versions "$2" lt "3.1~"; then
+ # an upgrade
+
+ # let's check if we have a dist file
+ if [ -e /etc/eucalyptus/eucalyptus.conf.dpkg-dist ];
+ then
+ if grep VNET_PUBINTERFACE /etc/eucalyptus/eucalyptus.conf.dpkg-dist > /dev/null ;
then
- if grep VNET_PUBINTERFACE /etc/eucalyptus/eucalyptus.conf.dpkg-dist > /dev/null ;
- then
- # we prefer the new conf file and we saved
- # a copy of the original one
- cp -f /etc/eucalyptus/eucalyptus.conf.dpkg-dist /etc/eucalyptus/eucalyptus.conf
- fi
+ # we prefer the new conf file and we saved
+ # a copy of the original one
+ cp -f /etc/eucalyptus/eucalyptus.conf.dpkg-dist /etc/eucalyptus/eucalyptus.conf
fi
- if [ -f /tmp/eucaback.dir ]; then
- BACKDIR=`cat /tmp/eucaback.dir`
- if [ -d "$BACKDIR" ]; then
- /usr/share/eucalyptus/euca_upgrade --old $BACKDIR --new / --conf --keys --sameversion >/dev/null 2>&1 || true
- fi
+ fi
+ if [ -f /tmp/eucaback.dir ]; then
+ BACKDIR=`cat /tmp/eucaback.dir`
+ if [ -d "$BACKDIR" ]; then
+ /usr/share/eucalyptus/euca_upgrade --old $BACKDIR --new / --conf >>/var/log/eucalyptus/upgrade.log 2>&1 || true
fi
- if [ -d /var/run/eucalyptus/webapp ]; then
- rm -rf /var/run/eucalyptus/webapp
- fi
- else
- euca_conf -d / -user eucalyptus -bridge br0 --hypervisor kvm --instances /var/lib/eucalyptus/instances --dhcpd /usr/sbin/dhcpd --dhcp_user dhcpd || true
+ fi
+ OLD_EUCA_VERSION="$2"
+ echo "# This file was automatically generated by Eucalyptus packaging." > /etc/eucalyptus/.upgrade
+ echo "$OLD_EUCA_VERSION:$BACKDIR" >> /etc/eucalyptus/.upgrade
fi
- # debian KVM has disabled SCSI device-attach, make default virtio
- sed -i "s/USE_VIRTIO_DISK=\"0\"/USE_VIRTIO_DISK=\"1\"/" /etc/eucalyptus/eucalyptus.conf
fi
chsh -s /bin/bash eucalyptus || true
-euca_conf --setup || true
-dpkg-statoverride --force --update --add root eucalyptus 04754 /usr/lib/eucalyptus/euca_rootwrap || true
+dpkg-statoverride --force --update --add eucalyptus eucalyptus 755 /etc/eucalyptus || true
+dpkg-statoverride --force --update --add eucalyptus eucalyptus 644 /etc/eucalyptus/eucalyptus.conf || true
+dpkg-statoverride --force --update --add root eucalyptus 04750 /usr/lib/eucalyptus/euca_rootwrap || true
+dpkg-statoverride --force --update --add root eucalyptus 04750 /usr/lib/eucalyptus/euca_mountwrap || true
+
+dpkg-statoverride --force --update --add eucalyptus eucalyptus 755 /var/lib/eucalyptus || true
+dpkg-statoverride --force --update --add eucalyptus eucalyptus 755 /var/lib/eucalyptus/db || true
+dpkg-statoverride --force --update --add eucalyptus eucalyptus 755 /var/lib/eucalyptus/keys || true
+dpkg-statoverride --force --update --add eucalyptus eucalyptus 755 /var/lib/eucalyptus/upgrade || true
+dpkg-statoverride --force --update --add eucalyptus eucalyptus 755 /var/lib/eucalyptus/webapps || true
+
+dpkg-statoverride --force --update --add eucalyptus eucalyptus 755 /var/log/eucalyptus || true
+
#DEBHELPER#
Modified: eucalyptus/trunk/debian/eucalyptus-common.postrm
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-common.postrm 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-common.postrm 2012-07-07 01:27:05 UTC (rev 244)
@@ -1,10 +1,27 @@
#!/bin/sh -e
+# old packages depend on this file existance to determine upgrade
+rm -f /tmp/eucaback.dir
+
+# in case it's not removed by init scripts
+rm -f /etc/eucalyptus/.upgrade
+
case "$1" in
purge)
- dpkg-statoverride --remove /usr/lib/eucalyptus/euca_rootwrap || true
rm -rf /etc/eucalyptus /var/lib/eucalyptus /var/log/eucalyptus /var/run/eucalyptus
;;
esac
+dpkg-statoverride --remove /etc/eucalyptus || true
+dpkg-statoverride --remove /etc/eucalyptus/eucalyptus.conf || true
+dpkg-statoverride --remove /usr/lib/eucalyptus/euca_rootwrap || true
+dpkg-statoverride --remove /usr/lib/eucalyptus/euca_mountwrap || true
+
+dpkg-statoverride --remove /var/lib/eucalyptus || true
+dpkg-statoverride --remove /var/lib/eucalyptus/db || true
+dpkg-statoverride --remove /var/lib/eucalyptus/keys || true
+dpkg-statoverride --remove /var/lib/eucalyptus/upgrade || true
+dpkg-statoverride --remove /var/lib/eucalyptus/webapps || true
+
+dpkg-statoverride --remove /var/log/eucalyptus || true
#DEBHELPER#
Modified: eucalyptus/trunk/debian/eucalyptus-common.preinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-common.preinst 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-common.preinst 2012-07-07 01:27:05 UTC (rev 244)
@@ -2,16 +2,21 @@
if [ "$1" = "upgrade" ];
then
- if dpkg --compare-versions "$2" lt "2.0"
+ if dpkg --compare-versions "$2" lt "3.1~"
then
cp -a /etc/eucalyptus/eucalyptus.conf /etc/eucalyptus/eucalyptus.conf.old
CWD=`pwd`
DATESTR=`date +%s`
- echo /root/eucalyptus.backup.$DATESTR > /tmp/eucaback.dir
- mkdir -p /root/eucalyptus.backup.$DATESTR
- cd /root/eucalyptus.backup.$DATESTR
+ UPGRDIR=/var/lib/eucalyptus/upgrade
+ echo ${UPGRDIR}/eucalyptus.backup.$DATESTR > /tmp/eucaback.dir
+
+ rm -rf ${UPGRDIR}/eucalyptus.backup.$DATESTR
+ mkdir -p -m 700 ${UPGRDIR}/eucalyptus.backup.$DATESTR
+ chown eucalyptus:eucalyptus ${UPGRDIR}/eucalyptus.backup.$DATESTR
+
+ cd ${UPGRDIR}/eucalyptus.backup.$DATESTR
EUCABACKUPS=""
- for i in $EUCADIR/var/lib/eucalyptus/keys/ $EUCADIR/var/lib/eucalyptus/db/ $EUCADIR/etc/eucalyptus/eucalyptus.conf $EUCADIR/etc/eucalyptus/eucalyptus-version $EUCADIR/usr/share/eucalyptus/
+ for i in $EUCADIR/var/lib/eucalyptus/keys/ $EUCADIR/var/lib/eucalyptus/db/ $EUCADIR/var/lib/eucalyptus/services $EUCADIR/etc/eucalyptus/eucalyptus.conf $EUCADIR/etc/eucalyptus/eucalyptus-version $EUCADIR/usr/share/eucalyptus/
do
if [ -e $i ]; then
EUCABACKUPS="$EUCABACKUPS $i"
Modified: eucalyptus/trunk/debian/eucalyptus-common.prerm
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-common.prerm 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-common.prerm 2012-07-07 01:27:05 UTC (rev 244)
@@ -1,8 +1,8 @@
#!/bin/sh -e
-
-if [ "$1" = "remove" ]
+
+if [ "$1" = "remove" ]
then
rm -f /usr/sbin/euca_admin/*.pyc
fi
-
+
#DEBHELPER#
Added: eucalyptus/trunk/debian/eucalyptus-gl.lintian-overrides
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-gl.lintian-overrides (rev 0)
+++ eucalyptus/trunk/debian/eucalyptus-gl.lintian-overrides 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,2 @@
+#exception made in license
+eucalyptus-gl: possible-gpl-code-linked-with-openssl
Modified: eucalyptus/trunk/debian/eucalyptus-java-common.install
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-java-common.install 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-java-common.install 2012-07-07 01:27:05 UTC (rev 244)
@@ -1,21 +1,6 @@
-/usr/share/eucalyptus/antlr.jar
-/usr/share/eucalyptus/eucalyptus-interface-*.jar
-/usr/share/eucalyptus/eucalyptus-auth-*.jar
-/usr/share/eucalyptus/eucalyptus-core-*.jar
-/usr/share/eucalyptus/eucalyptus-component-*.jar
-/usr/share/eucalyptus/eucalyptus-groupmgr-*.jar
-/usr/share/eucalyptus/eucalyptus-dns-*.jar
-/usr/share/eucalyptus/eucalyptus-db-*.jar
-/usr/share/eucalyptus/eucalyptus-msgs-*.jar
-/usr/share/eucalyptus/eucalyptus-ws-*.jar
-/usr/share/eucalyptus/eucalyptus-imagemgr-*.jar
-/usr/share/eucalyptus/eucalyptus-storage-common-*.jar
-/usr/share/eucalyptus/eucalyptus-clustermgr-*.jar
-/usr/share/eucalyptus/eucalyptus-keymgr-*.jar
-/usr/share/eucalyptus/eucalyptus-config-*.jar
+/usr/share/eucalyptus/*.jar
/etc/eucalyptus/cloud.d
-/usr/lib/eucalyptus/liblvm2control.so
/var/lib/eucalyptus/webapps
+/var/lib/eucalyptus/db
/usr/sbin/eucalyptus-cloud
/etc/init.d/eucalyptus-cloud
-
Modified: eucalyptus/trunk/debian/eucalyptus-java-common.links
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-java-common.links 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-java-common.links 2012-07-07 01:27:05 UTC (rev 244)
@@ -1,101 +1,151 @@
-/usr/share/java/clean-crypto.jar /usr/share/eucalyptus/openjdk-crypto.jar
-/usr/share/java/mule-core-2.0.jar /usr/share/eucalyptus/mule-core-2.0.jar
-/usr/share/java/mule-module-client-2.0.jar /usr/share/eucalyptus/mule-module-client-2.0.jar
-/usr/share/java/mule-module-spring-extras-2.0.jar /usr/share/eucalyptus/mule-module-spring-extras-2.0.jar
-/usr/share/java/mule-transport-vm-2.0.jar /usr/share/eucalyptus/mule-transport-vm-2.0.jar
-/usr/share/java/mule-module-spring-config-2.0.jar /usr/share/eucalyptus/mule-module-spring-config-2.0.jar
-/usr/share/java/mule-module-xml-2.0.jar /usr/share/eucalyptus/mule-module-xml-2.0.jar
-/usr/share/java/axiom-api.jar /usr/share/eucalyptus/axiom-api.jar
-/usr/share/java/axiom-dom.jar /usr/share/eucalyptus/axiom-dom.jar
-/usr/share/java/axiom-impl.jar /usr/share/eucalyptus/axiom-impl.jar
-/usr/share/java/backport-util-concurrent.jar /usr/share/eucalyptus/backport-util-concurrent.jar
-/usr/share/java/bcprov.jar /usr/share/eucalyptus/bcprov.jar
-/usr/share/java/commons-fileupload.jar /usr/share/eucalyptus/commons-fileupload.jar
-/usr/share/java/commons-httpclient.jar /usr/share/eucalyptus/commons-httpclient.jar
-/usr/share/java/commons-lang.jar /usr/share/eucalyptus/commons-lang.jar
-/usr/share/java/commons-pool.jar /usr/share/eucalyptus/commons-pool.jar
-/usr/share/java/dnsjava.jar /usr/share/eucalyptus/dnsjava.jar
-/usr/share/java/ecj.jar /usr/share/eucalyptus/ecj.jar
-/usr/share/java/gnumail.jar /usr/share/eucalyptus/gnumail.jar
-/usr/share/java/gnumail-providers.jar /usr/share/eucalyptus/gnumail-providers.jar
-/usr/share/java/inetlib.jar /usr/share/eucalyptus/inetlib.jar
-/usr/share/java/geronimo-jpa-2.0-spec.jar /usr/share/eucalyptus/geronimo-jpa-2.0-spec.jar
-/usr/share/java/google-collections.jar /usr/share/eucalyptus/google-collections.jar
-/usr/share/java/groovy-all.jar /usr/share/eucalyptus/groovy.jar
-/usr/share/java/gwt-servlet.jar /usr/share/eucalyptus/gwt-servlet.jar
-/usr/share/java/gwt-user.jar /usr/share/eucalyptus/gwt-user.jar
+/usr/share/maven-repo/org/apache/activemq/activemq-core/5.6.0/activemq-core-5.6.0.jar /usr/share/eucalyptus/activemq-core-5.6.0.jar
+/usr/share/maven-repo/org/apache/ant/ant/1.8.2/ant-1.8.2.jar /usr/share/eucalyptus/ant-1.8.2.jar
+/usr/share/java/antlr3.jar /usr/share/eucalyptus/antlr3.jar
+/usr/share/maven-repo/org/apache/avalon/avalon-framework/4.2.0/avalon-framework-4.2.0.jar /usr/share/eucalyptus/avalon-framework-4.2.0.jar
+/usr/share/java/axiom-api-1.2.8.jar /usr/share/eucalyptus/axiom-api-1.2.8.jar
+/usr/share/java/axiom-dom-1.2.8.jar /usr/share/eucalyptus/axiom-dom-1.2.8.jar
+/usr/share/java/axiom-impl-1.2.8.jar /usr/share/eucalyptus/axiom-impl-1.2.8.jar
+/usr/share/maven-repo/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar /usr/share/eucalyptus/backport-util-concurrent-3.1.jar
+/usr/share/maven-repo/org/apache/xmlgraphics/batik-anim/1.7/batik-anim-1.7.jar /usr/share/eucalyptus/batik-anim-1.7.jar
+/usr/share/maven-repo/org/apache/xmlgraphics/batik-awt-util/1.7/batik-awt-util-1.7.jar /usr/share/eucalyptus/batik-awt-util-1.7.jar
+/usr/share/maven-repo/org/apache/xmlgraphics/batik-bridge/1.7/batik-bridge-1.7.jar /usr/share/eucalyptus/batik-bridge-1.7.jar
+/usr/share/maven-repo/org/apache/xmlgraphics/batik-css/1.7/batik-css-1.7.jar /usr/share/eucalyptus/batik-css-1.7.jar
+/usr/share/maven-repo/org/apache/xmlgraphics/batik-dom/1.7/batik-dom-1.7.jar /usr/share/eucalyptus/batik-dom-1.7.jar
+/usr/share/maven-repo/org/apache/xmlgraphics/batik-ext/1.7/batik-ext-1.7.jar /usr/share/eucalyptus/batik-ext-1.7.jar
+/usr/share/maven-repo/org/apache/xmlgraphics/batik-gvt/1.7/batik-gvt-1.7.jar /usr/share/eucalyptus/batik-gvt-1.7.jar
+/usr/share/maven-repo/org/apache/xmlgraphics/batik-parser/1.7/batik-parser-1.7.jar /usr/share/eucalyptus/batik-parser-1.7.jar
+/usr/share/maven-repo/org/apache/xmlgraphics/batik-script/1.7/batik-script-1.7.jar /usr/share/eucalyptus/batik-script-1.7.jar
+/usr/share/maven-repo/org/apache/xmlgraphics/batik-svg-dom/1.7/batik-svg-dom-1.7.jar /usr/share/eucalyptus/batik-svg-dom-1.7.jar
+/usr/share/maven-repo/org/apache/xmlgraphics/batik-svggen/1.7/batik-svggen-1.7.jar /usr/share/eucalyptus/batik-svggen-1.7.jar
+/usr/share/maven-repo/org/apache/xmlgraphics/batik-util/1.7/batik-util-1.7.jar /usr/share/eucalyptus/batik-util-1.7.jar
+/usr/share/maven-repo/org/apache/xmlgraphics/batik-xml/1.7/batik-xml-1.7.jar /usr/share/eucalyptus/batik-xml-1.7.jar
+/usr/share/java/bcel-5.2.jar /usr/share/eucalyptus/bcel-5.2.jar
+/usr/share/maven-repo/org/bouncycastle/bcprov/1.46/bcprov-1.46.jar /usr/share/eucalyptus/bcprov-1.46.jar
+/usr/share/maven-repo/bsf/bsf/2.4.0/bsf-2.4.0.jar /usr/share/eucalyptus/bsf-2.4.0.jar
+/usr/share/maven-repo/org/codehaus/btm/btm/2.1.2/btm-2.1.2.jar /usr/share/eucalyptus/btm-2.1.2.jar
+/usr/share/maven-repo/cglib/cglib/2.2.2/cglib-2.2.2.jar /usr/share/eucalyptus/cglib-2.2.2.jar
+/usr/share/maven-repo/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar /usr/share/eucalyptus/commons-beanutils-1.8.3.jar
+/usr/share/maven-repo/commons-cli/commons-cli/1.2/commons-cli-1.2.jar /usr/share/eucalyptus/commons-cli-1.2.jar
+/usr/share/maven-repo/commons-codec/commons-codec/1.6/commons-codec-1.6.jar /usr/share/eucalyptus/commons-codec-1.6.jar
+/usr/share/java/commons-collections3-3.2.1.jar /usr/share/eucalyptus/commons-collections3-3.2.1.jar
+/usr/share/maven-repo/org/apache/commons/commons-compress/1.2/commons-compress-1.2.jar /usr/share/eucalyptus/commons-compress-1.2.jar
+/usr/share/maven-repo/commons-digester/commons-digester/1.8.1/commons-digester-1.8.1.jar /usr/share/eucalyptus/commons-digester-1.8.1.jar
+/usr/share/maven-repo/commons-discovery/commons-discovery/0.5/commons-discovery-0.5.jar /usr/share/eucalyptus/commons-discovery-0.5.jar
+/usr/share/maven-repo/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar /usr/share/eucalyptus/commons-fileupload-1.2.2.jar
+/usr/share/maven-repo/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar /usr/share/eucalyptus/commons-httpclient-3.1.jar
+/usr/share/maven-repo/commons-io/commons-io/1.4/commons-io-1.4.jar /usr/share/eucalyptus/commons-io-1.4.jar
+/usr/share/maven-repo/commons-jxpath/commons-jxpath/1.3/commons-jxpath-1.3.jar /usr/share/eucalyptus/commons-jxpath-1.3.jar
+/usr/share/maven-repo/commons-lang/commons-lang/2.6/commons-lang-2.6.jar /usr/share/eucalyptus/commons-lang-2.6.jar
+/usr/share/maven-repo/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar /usr/share/eucalyptus/commons-logging-1.1.1.jar
+/usr/share/maven-repo/commons-logging/commons-logging-api/1.1.1/commons-logging-api-1.1.1.jar /usr/share/eucalyptus/commons-logging-api-1.1.1.jar
+/usr/share/maven-repo/commons-pool/commons-pool/1.5.6/commons-pool-1.5.6.jar /usr/share/eucalyptus/commons-pool-1.5.6.jar
+/usr/share/java/dnsjava-2.0.8.jar /usr/share/eucalyptus/dnsjava-2.0.8.jar
+/usr/share/maven-repo/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar /usr/share/eucalyptus/dom4j-1.6.1.jar
+/usr/share/maven-repo/net/sf/ehcache/ehcache-core/2.5.0/ehcache-core-2.5.0.jar /usr/share/eucalyptus/ehcache-core-2.5.0.jar
+/usr/share/maven-repo/javax/el/el-api/2.1/el-api-2.1.jar /usr/share/eucalyptus/el-api-2.1.jar
+/usr/share/java/excalibur-logkit.jar /usr/share/eucalyptus/excalibur-logkit.jar
+/usr/share/maven-repo/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar /usr/share/eucalyptus/ezmorph-1.0.6.jar
+/usr/share/maven-repo/org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.0.2/geronimo-activation_1.1_spec-1.0.2.jar /usr/share/eucalyptus/geronimo-activation_1.1_spec-1.0.2.jar
+/usr/share/java/geronimo-ejb-3.0-spec-1.0.1.jar /usr/share/eucalyptus/geronimo-ejb-3.0-spec-1.0.1.jar
+/usr/share/java/geronimo-j2ee-connector-1.5-spec-2.0.0.jar /usr/share/eucalyptus/geronimo-j2ee-connector-1.5-spec-2.0.0.jar
+/usr/share/java/geronimo-javamail-1.4-provider.jar /usr/share/eucalyptus/geronimo-javamail-1.4-provider.jar
+/usr/share/java/geronimo-javamail-1.4-spec.jar /usr/share/eucalyptus/geronimo-javamail-1.4-spec.jar
+/usr/share/java/geronimo-jms_1.1_spec-1.1.jar /usr/share/eucalyptus/geronimo-jms_1.1_spec-1.1.jar
+/usr/share/maven-repo/org/apache/geronimo/specs/geronimo-jpa_2.0_spec/1.1/geronimo-jpa_2.0_spec-1.1.jar /usr/share/eucalyptus/geronimo-jpa_2.0_spec-1.1.jar
+/usr/share/maven-repo/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar /usr/share/eucalyptus/geronimo-jta_1.1_spec-1.1.1.jar
+/usr/share/java/geronimo-stax-1.2-spec-1.1.jar /usr/share/eucalyptus/geronimo-stax-1.2-spec-1.1.jar
+/usr/share/java/groovy-all-1.7.2.jar /usr/share/eucalyptus/groovy-all-1.7.2.jar
+/usr/share/maven-repo/com/google/guava/guava/11.0.2/guava-11.0.2.jar /usr/share/eucalyptus/guava-11.0.2.jar
+/usr/share/java/ha-jdbc-2.0.16-rc-1-jdk1.6.jar /usr/share/eucalyptus/ha-jdbc-2.0.16-rc-1-jdk1.6.jar
+/usr/share/maven-repo/org/hamcrest/hamcrest-core/1.2/hamcrest-core-1.2.jar /usr/share/eucalyptus/hamcrest-core-1.2.jar
+/usr/share/maven-repo/org/hamcrest/hamcrest-generator/1.2/hamcrest-generator-1.2.jar /usr/share/eucalyptus/hamcrest-generator-1.2.jar
+/usr/share/maven-repo/org/hamcrest/hamcrest-library/1.2/hamcrest-library-1.2.jar /usr/share/eucalyptus/hamcrest-library-1.2.jar
+/usr/share/maven-repo/org/hamcrest/hamcrest-integration/1.2/hamcrest-integration-1.2.jar /usr/share/eucalyptus/hamcrest-integration-1.2.jar
+/usr/share/maven-repo/org/hibernate/hibernate-core/3.6.9.Final/hibernate-core-3.6.9.Final.jar /usr/share/eucalyptus/hibernate-core-3.6.9.Final.jar
+/usr/share/maven-repo/org/hibernate/hibernate-entitymanager/3.6.9.Final/hibernate-entitymanager-3.6.9.Final.jar /usr/share/eucalyptus/hibernate-entitymanager-3.6.9.Final.jar
+/usr/share/java/hibernate-jbosscache-3.6.8.jar /usr/share/eucalyptus/hibernate-jbosscache-3.6.8.jar
+/usr/share/maven-repo/org/hsqldb/hsqldb/1.8.0.10/hsqldb-1.8.0.10.jar /usr/share/eucalyptus/hsqldb-1.8.0.10.jar
+/usr/share/java/hsqldbutil-1.8.0.10.jar /usr/share/eucalyptus/hsqldbutil-1.8.0.10.jar
+/usr/share/java/itext-2.1.7.jar /usr/share/eucalyptus/itext-2.1.7.jar
+/usr/share/java/janino-2.5.15-1.jar /usr/share/eucalyptus/janino-2.5.15-1.jar
+/usr/share/java/jasperreports-3.7.4.jar /usr/share/eucalyptus/jasperreports-3.7.4.jar
+/usr/share/maven-repo/javassist/javassist/3.12.1.GA/javassist-3.12.1.GA.jar /usr/share/eucalyptus/javassist-3.12.1.GA.jar
+/usr/share/maven-repo/jaxen/jaxen/1.1.3/jaxen-1.1.3.jar /usr/share/eucalyptus/jaxen-1.1.3.jar
/usr/share/java/jaxp-1.3.jar /usr/share/eucalyptus/jaxp-1.3.jar
-/usr/share/java/jetty.jar /usr/share/eucalyptus/jetty.jar
-/usr/share/java/jetty-rewrite-handler.jar /usr/share/eucalyptus/jetty-rewrite-handler.jar
-/usr/share/java/jibx-run-1.1.jar /usr/share/eucalyptus/jibx-run-1.1.jar
-/usr/share/java/json-lib.jar /usr/share/eucalyptus/json-lib.jar
-/usr/share/java/junit.jar /usr/share/eucalyptus/junit.jar
-/usr/share/java/log4j-1.2.jar /usr/share/eucalyptus/log4j-1.2.jar
-/usr/share/java/netty.jar /usr/share/eucalyptus/netty.jar
+/usr/share/maven-repo/org/jboss/marshalling/marshalling-api/1.1.3.GA/marshalling-api-1.1.3.GA.jar /usr/share/eucalyptus/marshalling-api-1.1.3.GA.jar
+/usr/share/maven-repo/org/jboss/marshalling/river/1.1.3.GA/river-1.1.3.GA.jar /usr/share/eucalyptus/river-1.1.3.GA.jar
+/usr/share/maven-repo/org/jboss/cache/jbosscache-core/3.2.8.GA/jbosscache-core-3.2.8.GA.jar /usr/share/eucalyptus/jbosscache-core-3.2.8.GA.jar
+/usr/share/java/jcip-20060626.jar /usr/share/eucalyptus/jcip-20060626.jar
+/usr/share/java/jsr305-0.1~+svn49.jar /usr/share/eucalyptus/jsr305-0.1~+svn49.jar
+/usr/share/java/jcl-over-slf4j.jar /usr/share/eucalyptus/jcl-over-slf4j.jar
+/usr/share/java/jettison-1.2.jar /usr/share/eucalyptus/jettison-1.2.jar
+/usr/share/maven-repo/org/mortbay/jetty/jetty/6.x/jetty-6.x.jar /usr/share/eucalyptus/jetty-6.x.jar
+/usr/share/maven-repo/org/mortbay/jetty/jetty-ajp/6.x/jetty-ajp-6.x.jar /usr/share/eucalyptus/jetty-ajp-6.x.jar
+/usr/share/maven-repo/org/mortbay/jetty/jetty-client/6.x/jetty-client-6.x.jar /usr/share/eucalyptus/jetty-client-6.x.jar
+/usr/share/maven-repo/org/mortbay/jetty/jetty-html/6.x/jetty-html-6.x.jar /usr/share/eucalyptus/jetty-html-6.x.jar
+/usr/share/maven-repo/org/mortbay/jetty/jetty-management/6.x/jetty-management-6.x.jar /usr/share/eucalyptus/jetty-management-6.x.jar
+/usr/share/maven-repo/org/mortbay/jetty/jetty-naming/6.x/jetty-naming-6.x.jar /usr/share/eucalyptus/jetty-naming-6.x.jar
+/usr/share/maven-repo/org/mortbay/jetty/jetty-rewrite-handler/6.x/jetty-rewrite-handler-6.x.jar /usr/share/eucalyptus/jetty-rewrite-handler-6.x.jar
+/usr/share/maven-repo/org/mortbay/jetty/jetty-servlet-tester/6.x/jetty-servlet-tester-6.x.jar /usr/share/eucalyptus/jetty-servlet-tester-6.x.jar
+/usr/share/maven-repo/org/mortbay/jetty/jetty-sslengine/6.x/jetty-sslengine-6.x.jar /usr/share/eucalyptus/jetty-sslengine-6.x.jar
+/usr/share/maven-repo/org/mortbay/jetty/jetty-util/6.x/jetty-util-6.x.jar /usr/share/eucalyptus/jetty-util-6.x.jar
+/usr/share/maven-repo/org/jgroups/jgroups/2.12.2.Final/jgroups-2.12.2.Final.jar /usr/share/eucalyptus/jgroups-2.12.2.Final.jar
+/usr/share/java/jibx-bind-1.2.3.jar /usr/share/eucalyptus/jibx-bind-1.2.3.jar
+/usr/share/java/jibx-extras-1.2.3.jar /usr/share/eucalyptus/jibx-extras-1.2.3.jar
+/usr/share/java/jibx-run-1.2.3.jar /usr/share/eucalyptus/jibx-run-1.2.3.jar
+/usr/share/java/jibx-schema-1.2.3.jar /usr/share/eucalyptus/jibx-schema-1.2.3.jar
+/usr/share/maven-repo/net/java/dev/jna/jna/3.2.7/jna-3.2.7.jar /usr/share/eucalyptus/jna-3.2.7.jar
+/usr/share/maven-repo/com/jcraft/jsch/0.1.42/jsch-0.1.42.jar /usr/share/eucalyptus/jsch-0.1.42.jar
+/usr/share/java/json-lib-2.3.jar /usr/share/eucalyptus/json-lib-2.3.jar
+/usr/share/java/jug-asl-2.0.0.jar /usr/share/eucalyptus/jug-asl-2.0.0.jar
+/usr/share/java/jul-to-slf4j.jar /usr/share/eucalyptus/jul-to-slf4j.jar
+/usr/share/maven-repo/junit/junit/4.x/junit-4.x.jar /usr/share/eucalyptus/junit-4.x.jar
+/usr/share/maven-repo/org/apache/activemq/kahadb/5.6.0/kahadb-5.6.0.jar /usr/share/eucalyptus/kahadb-5.6.0.jar
+/usr/share/maven-repo/log4j/log4j/1.2.x/log4j-1.2.x.jar /usr/share/eucalyptus/log4j-1.2.x.jar
+/usr/share/java/mule-core-2.0.1.jar /usr/share/eucalyptus/mule-core-2.0.1.jar
+/usr/share/java/mule-module-builders-2.0.1.jar /usr/share/eucalyptus/mule-module-builders-2.0.1.jar
+/usr/share/java/mule-module-client-2.0.1.jar /usr/share/eucalyptus/mule-module-client-2.0.1.jar
+/usr/share/java/mule-management-2.0.1.jar /usr/share/eucalyptus/mule-management-2.0.1.jar
+/usr/share/java/mule-module-spring-config-2.0.1.jar /usr/share/eucalyptus/mule-module-spring-config-2.0.1.jar
+/usr/share/java/mule-module-xml-2.0.1.jar /usr/share/eucalyptus/mule-module-xml-2.0.1.jar
+/usr/share/java/mule-transport-vm-2.0.1.jar /usr/share/eucalyptus/mule-transport-vm-2.0.1.jar
+/usr/share/java/netty3.1-3.1.0.CR1.jar /usr/share/eucalyptus/netty3.1-3.1.0.CR1.jar
+/usr/share/java/clean-crypto-1.jar /usr/share/eucalyptus/clean-crypto-1.jar
+/usr/share/maven-repo/proxool/proxool/0.9.1/proxool-0.9.1.jar /usr/share/eucalyptus/proxool-0.9.1.jar
+/usr/share/maven-repo/org/quartz-scheduler/quartz/1.7.3/quartz-1.7.3.jar /usr/share/eucalyptus/quartz-1.7.3.jar
+/usr/share/maven-repo/jakarta-regexp/jakarta-regexp/1.5/jakarta-regexp-1.5.jar /usr/share/eucalyptus/jakarta-regexp-1.5.jar
+/usr/share/maven-repo/xalan/serializer/2.7.1/serializer-2.7.1.jar /usr/share/eucalyptus/serializer-2.7.1.jar
/usr/share/java/servlet-api-2.5.jar /usr/share/eucalyptus/servlet-api-2.5.jar
-/usr/share/java/wss4j.jar /usr/share/eucalyptus/wss4j.jar
-/usr/share/java/xalan2.jar /usr/share/eucalyptus/xalan2.jar
-/usr/share/java/xercesImpl.jar /usr/share/eucalyptus/xercesImpl.jar
-/usr/share/java/xml-security.jar /usr/share/eucalyptus/xml-security.jar
-/usr/share/java/antlr3.jar /usr/share/eucalyptus/antlr3.jar
-/usr/share/java/ant.jar /usr/share/eucalyptus/ant.jar
-/usr/share/java/asm3-3.2.jar /usr/share/eucalyptus/asm3-3.2.jar
-/usr/share/java/bcel.jar /usr/share/eucalyptus/bcel.jar
-/usr/share/java/bsf.jar /usr/share/eucalyptus/bsf.jar
-/usr/share/java/proxool.jar /usr/share/eucalyptus/proxool.jar
-/usr/share/java/cglib.jar /usr/share/eucalyptus/cglib.jar
-/usr/share/java/commons-beanutils.jar /usr/share/eucalyptus/commons-beanutils.jar
-/usr/share/java/commons-cli.jar /usr/share/eucalyptus/commons-cli.jar
-/usr/share/java/commons-codec.jar /usr/share/eucalyptus/commons-codec.jar
-/usr/share/java/commons-collections3.jar /usr/share/eucalyptus/commons-collections3.jar
-/usr/share/java/commons-discovery.jar /usr/share/eucalyptus/commons-discovery.jar
-/usr/share/java/commons-io.jar /usr/share/eucalyptus/commons-io.jar
-/usr/share/java/commons-jxpath.jar /usr/share/eucalyptus/commons-jxpath.jar
-/usr/share/java/commons-logging.jar /usr/share/eucalyptus/commons-logging.jar
-/usr/share/java/commons-logging-adapters.jar /usr/share/eucalyptus/commons-logging-adapters.jar
-/usr/share/java/commons-logging-api.jar /usr/share/eucalyptus/commons-logging-api.jar
-/usr/share/java/dom4j.jar /usr/share/eucalyptus/dom4j.jar
-/usr/share/java/el-api-2.1.jar /usr/share/eucalyptus/el-api-2.1.jar
-/usr/share/java/ezmorph.jar /usr/share/eucalyptus/ezmorph.jar
-/usr/share/java/activation.jar /usr/share/eucalyptus/activation.jar
-/usr/share/java/geronimo-ejb-3.0-spec.jar /usr/share/eucalyptus/geronimo-ejb-3.0-spec.jar
-/usr/share/java/geronimo-j2ee-connector-1.5-spec.jar /usr/share/eucalyptus/geronimo-j2ee-connector-1.5-spec.jar
-/usr/share/java/geronimo-jms-1.1-spec.jar /usr/share/eucalyptus/geronimo-jms-1.1-spec.jar
-/usr/share/java/geronimo-jta-1.0.1b-spec.jar /usr/share/eucalyptus/geronimo-jta-1.0.1b-spec.jar
-/usr/share/java/geronimo-jacc_1.1_spec.jar /usr/share/eucalyptus/geronimo-jacc_1.1_spec.jar
-/usr/share/java/geronimo-interceptor-3.0-spec.jar /usr/share/eucalyptus/geronimo-interceptor-3.0-spec.jar
-/usr/share/java/hsqldb.jar /usr/share/eucalyptus/hsqldb.jar
-/usr/share/java/hsqldbutil.jar /usr/share/eucalyptus/hsqldbutil.jar
-/usr/share/java/janino.jar /usr/share/eucalyptus/janino.jar
-/usr/share/java/javassist.jar /usr/share/eucalyptus/javassist.jar
-/usr/share/java/jaxen.jar /usr/share/eucalyptus/jaxen.jar
-/usr/share/java/jetty-sslengine.jar /usr/share/eucalyptus/jetty-sslengine.jar
-/usr/share/java/jetty-util.jar /usr/share/eucalyptus/jetty-util.jar
-/usr/share/java/jibx-bind-1.1.jar /usr/share/eucalyptus/jibx-bind-1.1.jar
-/usr/share/java/jibx-extras-1.1.jar /usr/share/eucalyptus/jibx-extras-1.1.jar
-/usr/share/java/jug-asl.jar /usr/share/eucalyptus/jug-asl.jar
-/usr/share/java/excalibur-logkit.jar /usr/share/eucalyptus/excalibur-logkit.jar
-/usr/share/java/regexp.jar /usr/share/eucalyptus/regexp.jar
-/usr/share/java/serializer.jar /usr/share/eucalyptus/serializer.jar
/usr/share/java/slf4j-api.jar /usr/share/eucalyptus/slf4j-api.jar
/usr/share/java/slf4j-log4j12.jar /usr/share/eucalyptus/slf4j-log4j12.jar
-/usr/share/java/jcl-over-slf4j.jar /usr/share/eucalyptus/jcl-over-slf4j.jar
-/usr/share/java/jul-to-slf4j.jar /usr/share/eucalyptus/jul-to-slf4j.jar
-/usr/share/java/wsdl4j.jar /usr/share/eucalyptus/wsdl4j.jar
-/usr/share/java/xom.jar /usr/share/eucalyptus/xom.jar
-/usr/share/java/xpp3.jar /usr/share/eucalyptus/xpp3.jar
-/usr/share/java/spring-aop.jar /usr/share/eucalyptus/spring-aop.jar
-/usr/share/java/spring-beans.jar /usr/share/eucalyptus/spring-beans.jar
-/usr/share/java/spring-context.jar /usr/share/eucalyptus/spring-context.jar
-/usr/share/java/spring-context-support.jar /usr/share/eucalyptus/spring-context-support.jar
-/usr/share/java/spring-core.jar /usr/share/eucalyptus/spring-core.jar
-/usr/share/java/spring-jdbc.jar /usr/share/eucalyptus/spring-jdbc.jar
-/usr/share/java/spring-tx.jar /usr/share/eucalyptus/spring-tx.jar
-/usr/share/java/spring-web.jar /usr/share/eucalyptus/spring-web.jar
-/usr/share/java/hibernate3.jar /usr/share/eucalyptus/hibernate3.jar
-/usr/share/java/hibernate-annotations.jar /usr/share/eucalyptus/hibernate-annotations.jar
-/usr/share/java/hibernate-commons-annotations.jar /usr/share/eucalyptus/hibernate-commons-annotations.jar
-/usr/share/java/hibernate-entitymanager.jar /usr/share/eucalyptus/hibernate-entitymanager.jar
-/usr/share/java/hibernate-proxool.jar /usr/share/eucalyptus/hibernate-proxool.jar
-/usr/share/java/ehcache.jar /usr/share/eucalyptus/ehcache.jar
+/usr/share/maven-repo/org/springframework/spring-beans/3.x/spring-beans-3.x.jar /usr/share/eucalyptus/spring-beans-3.x.jar
+/usr/share/maven-repo/org/springframework/spring-context/3.x/spring-context-3.x.jar /usr/share/eucalyptus/spring-context-3.x.jar
+/usr/share/maven-repo/org/springframework/spring-context-support/3.x/spring-context-support-3.x.jar /usr/share/eucalyptus/spring-context-support-3.x.jar
+/usr/share/maven-repo/org/springframework/spring-core/3.x/spring-core-3.x.jar /usr/share/eucalyptus/spring-core-3.x.jar
+/usr/share/maven-repo/org/springframework/spring-web/3.x/spring-web-3.x.jar /usr/share/eucalyptus/spring-web-3.x.jar
+/usr/share/maven-repo/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1.jar /usr/share/eucalyptus/stax2-api-3.1.1.jar
+/usr/share/maven-repo/org/apache/velocity/velocity/1.7/velocity-1.7.jar /usr/share/eucalyptus/velocity-1.7.jar
/usr/share/java/wstx-lgpl.jar /usr/share/eucalyptus/wstx-lgpl.jar
+/usr/share/java/wsdl4j-1.6.2.jar /usr/share/eucalyptus/wsdl4j-1.6.2.jar
+/usr/share/java/wss4j-1.5.8.jar /usr/share/eucalyptus/wss4j-1.5.8.jar
+/usr/share/maven-repo/xalan/xalan/2.7.1/xalan-2.7.1.jar /usr/share/eucalyptus/xalan-2.7.1.jar
+/usr/share/maven-repo/xerces/xercesImpl/2.11.0/xercesImpl-2.11.0.jar /usr/share/eucalyptus/xercesImpl-2.11.0.jar
+/usr/share/maven-repo/org/apache/santuario/xmlsec/1.4.5/xmlsec-1.4.5.jar /usr/share/eucalyptus/xmlsec-1.4.5.jar
+/usr/share/maven-repo/xom/xom/1.2.1/xom-1.2.1.jar /usr/share/eucalyptus/xom-1.2.1.jar
+/usr/share/maven-repo/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar /usr/share/eucalyptus/xpp3-1.1.4c.jar
+/usr/share/maven-repo/org/hibernate/hibernate-validator/4.0.2.GA/hibernate-validator-4.0.2.GA.jar /usr/share/eucalyptus/hibernate-validator-4.0.2.GA.jar
+/usr/share/maven-repo/org/hibernate/hibernate-proxool/3.6.9.Final/hibernate-proxool-3.6.9.Final.jar /usr/share/eucalyptus/hibernate-proxool-3.6.9.Final.jar
+/usr/share/maven-repo/org/springframework/spring-expression/3.x/spring-expression-3.x.jar /usr/share/eucalyptus/spring-expression-3.x.jar
+#/usr/share/maven-repo/asm/asm-commons/2.x/asm-commons-2.x.jar /usr/share/eucalyptus/asm-commons-2.x.jar
+/usr/share/java/jboss-common-0.0+svn2938.jar /usr/share/eucalyptus/jboss-common-0.0+svn2938.jar
+/usr/share/maven-repo/org/hibernate/hibernate-commons-annotations/3.2.0.Final/hibernate-commons-annotations-3.2.0.Final.jar /usr/share/eucalyptus/hibernate-commons-annotations-3.2.0.Final.jar
+/usr/share/java/postgresql.jar /usr/share/eucalyptus/postgresql.jar
+/usr/share/java/antlr-2.7.7.jar /usr/share/eucalyptus/antlr-2.7.7.jar
+/usr/share/java/asm3-3.3.2.jar /usr/share/eucalyptus/asm3-3.3.2.jar
+/usr/share/java/asm3-all-3.3.2.jar /usr/share/eucalyptus/asm3-all-3.3.2.jar
+/usr/share/java/asm3-analysis-3.3.2.jar /usr/share/eucalyptus/asm3-analysis-3.3.2.jar
+/usr/share/java/asm3-commons-3.3.2.jar /usr/share/eucalyptus/asm3-commons-3.3.2.jar
+/usr/share/java/asm3-debug-all-3.3.2.jar /usr/share/eucalyptus/asm3-debug-all-3.3.2.jar
+/usr/share/java/asm3-tree-3.3.2.jar /usr/share/eucalyptus/asm3-tree-3.3.2.jar
+/usr/share/java/asm3-util-3.3.2.jar /usr/share/eucalyptus/asm3-util-3.3.2.jar
+/usr/share/java/asm3-xml-3.3.2.jar /usr/share/eucalyptus/asm3-xml-3.3.2.jar
Modified: eucalyptus/trunk/debian/eucalyptus-java-common.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-java-common.postinst 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-java-common.postinst 2012-07-07 01:27:05 UTC (rev 244)
@@ -1,10 +1,8 @@
#!/bin/sh -e
-#DEBHELPER#
-
if [ "$1" = "configure" ]; then
update-rc.d eucalyptus-cloud start 20 2 3 4 5 . stop 20 0 1 6 . >/dev/null || true
-# sed -i 's/VNET_INTERFACE="peth0"/VNET_INTERFACE="eth0"/g' /etc/eucalyptus/eucalyptus.conf
+ sed -i 's/CLOUD_OPTS=""/CLOUD_OPTS="--java-home=\/usr\/lib\/jvm\/default-java"/g' /etc/eucalyptus/eucalyptus.conf
if which invoke-rc.d >/dev/null 2>&1; then
invoke-rc.d eucalyptus-cloud stop > /dev/null 2>&1 ||true
@@ -12,29 +10,20 @@
/etc/init.d/eucalyptus-cloud stop > /dev/null 2>&1 ||true
fi
- if [ -f /tmp/eucaback.dir ]; then
- BACKDIR=`cat /tmp/eucaback.dir`
- if [ -d "$BACKDIR" ]; then
- /usr/sbin/euca_conf -setup
- if [ -f "$BACKDIR/etc/eucalyptus/eucalyptus-version" -a -f "/etc/eucalyptus/eucalyptus-version" ]; then
- export OLDVERSION=`cat $BACKDIR/etc/eucalyptus/eucalyptus-version`
- export NEWVERSION=`cat /etc/eucalyptus/eucalyptus-version`
- if [ "$OLDVERSION" != "$NEWVERSION" ]; then
- rm -f /usr/share/eucalyptus/eucalyptus-*$OLDVERSION*.jar
-# rm -f /usr/share/eucalyptus/asm2-2.2.3.jar
+ if dpkg --compare-versions "$2" lt "3.0~"; then
+ if [ -f /tmp/eucaback.dir ]; then
+ BACKDIR=`cat /tmp/eucaback.dir`
+ if [ -d "$BACKDIR" ]; then
+ if [ -f "$BACKDIR/etc/eucalyptus/eucalyptus-version" -a -f "/etc/eucalyptus/eucalyptus-version" ]; then
+ export OLDVERSION=`cat $BACKDIR/etc/eucalyptus/eucalyptus-version`
+ export NEWVERSION=`cat /etc/eucalyptus/eucalyptus-version`
+ if [ "$OLDVERSION" != "$NEWVERSION" ]; then
+ rm -f /usr/share/eucalyptus/eucalyptus-*$OLDVERSION*.jar
+ fi
fi
- fi
- /usr/share/eucalyptus/euca_upgrade --old $BACKDIR --new / --db --sameversion >/dev/null 2>&1
- /usr/sbin/euca_conf -setup
+ fi
fi
fi
-
- if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d eucalyptus-cloud start || true
- else
- /etc/init.d/eucalyptus-cloud start || true
- fi
-
fi
-exit 0
+#DEBHELPER#
Added: eucalyptus/trunk/debian/eucalyptus-java-common.preinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-java-common.preinst (rev 0)
+++ eucalyptus/trunk/debian/eucalyptus-java-common.preinst 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+if [ "$1" = "upgrade" ];
+then
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d eucalyptus-cloud stop > /dev/null 2>&1 ||true
+ else
+ /etc/init.d/eucalyptus-cloud stop > /dev/null 2>&1 ||true
+ fi
+fi
+
+# for upgrade in special configurations
+if [ -L /etc/init.d/eucalyptus-cloud ]; then
+ rm -f /etc/init.d/eucalyptus-cloud
+fi
+
+#DEBHELPER#
Modified: eucalyptus/trunk/debian/eucalyptus-nc.install
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-nc.install 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-nc.install 2012-07-07 01:27:05 UTC (rev 244)
@@ -4,7 +4,9 @@
/usr/share/eucalyptus/get_xen_info
/usr/share/eucalyptus/get_sys_info
/usr/share/eucalyptus/detach.pl
+/usr/share/eucalyptus/getstats.pl
/usr/sbin/euca_test_nc
/usr/lib/axis2/services/EucalyptusNC
/etc/init.d/eucalyptus-nc
-
+/etc/eucalyptus/libvirt.xsl
+#/tools/nc-hooks/example.sh
Modified: eucalyptus/trunk/debian/eucalyptus-nc.lintian-overrides
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-nc.lintian-overrides 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-nc.lintian-overrides 2012-07-07 01:27:05 UTC (rev 244)
@@ -1,4 +1,4 @@
# helper, will never have manpage
eucalyptus-nc: binary-without-manpage usr/sbin/euca_test_nc
-#
+# exception in license
eucalyptus-nc: possible-gpl-code-linked-with-openssl
Modified: eucalyptus/trunk/debian/eucalyptus-nc.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-nc.postinst 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-nc.postinst 2012-07-07 01:27:05 UTC (rev 244)
@@ -14,7 +14,7 @@
then
touch "$EUCA_HOME/.ssh/authorized_keys" || true
fi
- chown -R eucalyptus:eucalyptus /var/lib/eucalyptus/.ssh || true
+ chown -R eucalyptus:eucalyptus /var/lib/eucalyptus/.ssh || true
update-rc.d eucalyptus-nc start 99 2 3 4 5 . stop 20 0 1 6 . >/dev/null
@@ -25,10 +25,13 @@
fi
if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d eucalyptus-nc start ||true
+ invoke-rc.d libvirt-bin restart > /dev/null 2>&1 ||true
else
- /etc/init.d/eucalyptus-nc start ||true
+ /etc/init.d/libvirt-bin restart > /dev/null 2>&1 ||true
fi
+
fi
+dpkg-statoverride --force --update --add eucalyptus eucalyptus 755 /var/lib/eucalyptus/instances || true
+
#DEBHELPER#
Modified: eucalyptus/trunk/debian/eucalyptus-nc.postrm
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-nc.postrm 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-nc.postrm 2012-07-07 01:27:05 UTC (rev 244)
@@ -2,7 +2,9 @@
if [ "$1" = "purge" ]
then
- update-rc.d eucalyptus-nc remove
+ update-rc.d eucalyptus-nc remove > /dev/null 2>&1
fi
+dpkg-statoverride --remove /var/lib/eucalyptus/instances || true
+
#DEBHELPER#
Added: eucalyptus/trunk/debian/eucalyptus-nc.preinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-nc.preinst (rev 0)
+++ eucalyptus/trunk/debian/eucalyptus-nc.preinst 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+if [ "$1" = "upgrade" ];
+then
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d eucalyptus-nc stop > /dev/null 2>&1 ||true
+ else
+ /etc/init.d/eucalyptus-nc stop > /dev/null 2>&1 ||true
+ fi
+fi
+
+if [ -L /etc/init.d/eucalyptus-nc ]; then
+ rm -f /etc/init.d/eucalyptus-nc
+fi
+
+#DEBHELPER#
Added: eucalyptus/trunk/debian/eucalyptus-sc.dirs
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-sc.dirs (rev 0)
+++ eucalyptus/trunk/debian/eucalyptus-sc.dirs 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1 @@
+/var/lib/eucalyptus/volumes
\ No newline at end of file
Modified: eucalyptus/trunk/debian/eucalyptus-sc.install
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-sc.install 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-sc.install 2012-07-07 01:27:05 UTC (rev 244)
@@ -1 +1,3 @@
-/usr/share/eucalyptus/eucalyptus-storagecontroller-*.jar
+/usr/share/eucalyptus/connect_iscsitarget_sc.pl
+/usr/share/eucalyptus/disconnect_iscsitarget_sc.pl
+/usr/lib/eucalyptus/liblvm2control.so
Modified: eucalyptus/trunk/debian/eucalyptus-sc.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-sc.postinst 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-sc.postinst 2012-07-07 01:27:05 UTC (rev 244)
@@ -1,26 +1,14 @@
#!/bin/sh -e
-#DEBHELPER#
-
if [ "$1" = "configure" ]; then
- euca_conf --enable sc || true
if which invoke-rc.d >/dev/null 2>&1; then
invoke-rc.d eucalyptus-cloud stop > /dev/null 2>&1 ||true
else
/etc/init.d/eucalyptus-cloud stop > /dev/null 2>&1 ||true
fi
- if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d eucalyptus-cloud start > /dev/null 2>&1 ||true
- else
- /etc/init.d/eucalyptus-cloud start > /dev/null 2>&1 ||true
- fi
-
-# if which invoke-rc.d >/dev/null 2>&1; then
-# invoke-rc.d eucalyptus-cloud restart > /dev/null 2>&1 ||true
-# else
-# /etc/init.d/eucalyptus-cloud restart > /dev/null 2>&1 ||true
-# fi
fi
-exit 0
+dpkg-statoverride --force --update --add eucalyptus eucalyptus 755 /var/lib/eucalyptus/volumes || true
+
+#DEBHELPER#
Added: eucalyptus/trunk/debian/eucalyptus-sc.postrm
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-sc.postrm (rev 0)
+++ eucalyptus/trunk/debian/eucalyptus-sc.postrm 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+dpkg-statoverride --remove /var/lib/eucalyptus/volumes || true
+
+#DEBHELPER#
Modified: eucalyptus/trunk/debian/eucalyptus-sc.prerm
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-sc.prerm 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-sc.prerm 2012-07-07 01:27:05 UTC (rev 244)
@@ -2,7 +2,6 @@
if [ "$1" = "remove" ]
then
- euca_conf --disable sc || true
if which invoke-rc.d >/dev/null 2>&1; then
invoke-rc.d eucalyptus-cloud stop || true
else
Added: eucalyptus/trunk/debian/eucalyptus-walrus.dirs
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-walrus.dirs (rev 0)
+++ eucalyptus/trunk/debian/eucalyptus-walrus.dirs 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1 @@
+/var/lib/eucalyptus/bukkits
Modified: eucalyptus/trunk/debian/eucalyptus-walrus.install
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-walrus.install 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-walrus.install 2012-07-07 01:27:05 UTC (rev 244)
@@ -1 +1 @@
-/usr/share/eucalyptus/eucalyptus-walrus-*.jar
+/etc/eucalyptus/drbd.conf.example
Modified: eucalyptus/trunk/debian/eucalyptus-walrus.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-walrus.postinst 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-walrus.postinst 2012-07-07 01:27:05 UTC (rev 244)
@@ -1,28 +1,15 @@
#!/bin/sh -e
-
if [ "$1" = "configure" ]; then
- euca_conf --enable walrus || true
-
if which invoke-rc.d >/dev/null 2>&1; then
invoke-rc.d eucalyptus-cloud stop > /dev/null 2>&1 ||true
else
/etc/init.d/eucalyptus-cloud stop > /dev/null 2>&1 ||true
fi
- if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d eucalyptus-cloud start > /dev/null 2>&1 ||true
- else
- /etc/init.d/eucalyptus-cloud start > /dev/null 2>&1 ||true
- fi
-
-# if which invoke-rc.d >/dev/null 2>&1; then
-# invoke-rc.d eucalyptus-cloud restart > /dev/null 2>&1 ||true
-# else
-# /etc/init.d/eucalyptus-cloud restart > /dev/null 2>&1 ||true
-# fi
fi
-exit 0
+dpkg-statoverride --force --update --add eucalyptus eucalyptus 755 /var/lib/eucalyptus/bukkits || true
+
#DEBHELPER#
Added: eucalyptus/trunk/debian/eucalyptus-walrus.postrm
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-walrus.postrm (rev 0)
+++ eucalyptus/trunk/debian/eucalyptus-walrus.postrm 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+dpkg-statoverride --remove /var/lib/eucalyptus/bukkits || true
+
+#DEBHELPER#
Modified: eucalyptus/trunk/debian/eucalyptus-walrus.prerm
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-walrus.prerm 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/eucalyptus-walrus.prerm 2012-07-07 01:27:05 UTC (rev 244)
@@ -2,7 +2,6 @@
if [ "$1" = "remove" ]
then
- euca_conf --disable walrus || true
if which invoke-rc.d >/dev/null 2>&1; then
invoke-rc.d eucalyptus-cloud stop || true
else
Added: eucalyptus/trunk/debian/ivy.xml
===================================================================
--- eucalyptus/trunk/debian/ivy.xml (rev 0)
+++ eucalyptus/trunk/debian/ivy.xml 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,209 @@
+<ivy-module version="2.0">
+ <info organisation="org.eucalyptus" module="clc"/>
+ <dependencies>
+ <dependency org="org.apache.activemq" name="activemq-core" rev="5.5.0"/>
+ <dependency org="org.apache.ant" name="ant" rev="1.8.2"/>
+ <dependency org="antlr3" name="antlr3" rev="3.2"/>
+ <dependency org="antlr" name="antlr" rev="2.x"/>
+ <dependency org="asm" name="asm" rev="3.x"/>
+ <dependency org="asm" name="asm-all" rev="3.x"/>
+ <dependency org="asm" name="asm-commons" rev="3.x"/>
+ <dependency org="asm" name="asm-xml" rev="3.x"/>
+ <dependency org="asm" name="asm-util" rev="3.x"/>
+ <dependency org="asm" name="asm-analysis" rev="3.x"/>
+ <dependency org="asm" name="asm-tree" rev="3.x"/>
+ <dependency org="asm" name="asm-debug-all" rev="3.x"/>
+ <dependency org="org.apache.avalon" name="avalon-framework" rev="4.2.0"/>
+ <dependency org="axiom-api" name="axiom-api" rev="1.2.8"/>
+ <dependency org="axiom-dom" name="axiom-dom" rev="1.2.8"/>
+ <dependency org="axiom-impl" name="axiom-impl" rev="1.2.8"/>
+ <dependency org="backport-util-concurrent" name="backport-util-concurrent" rev="3.1"/>
+ <dependency org="org.apache.xmlgraphics" name="batik-anim" rev="1.7"/>
+ <dependency org="org.apache.xmlgraphics" name="batik-awt-util" rev="1.7"/>
+ <dependency org="org.apache.xmlgraphics" name="batik-bridge" rev="1.7"/>
+ <dependency org="org.apache.xmlgraphics" name="batik-css" rev="1.7"/>
+ <dependency org="org.apache.xmlgraphics" name="batik-dom" rev="1.7"/>
+ <dependency org="org.apache.xmlgraphics" name="batik-ext" rev="1.7"/>
+ <dependency org="org.apache.xmlgraphics" name="batik-gvt" rev="1.7"/>
+ <dependency org="org.apache.xmlgraphics" name="batik-parser" rev="1.7"/>
+ <dependency org="org.apache.xmlgraphics" name="batik-script" rev="1.7"/>
+ <dependency org="org.apache.xmlgraphics" name="batik-svg-dom" rev="1.7"/>
+ <dependency org="org.apache.xmlgraphics" name="batik-svggen" rev="1.7"/>
+ <dependency org="org.apache.xmlgraphics" name="batik-util" rev="1.7"/>
+ <dependency org="org.apache.xmlgraphics" name="batik-xml" rev="1.7"/>
+ <dependency org="org.apache" name="bcel" rev="5.2"/>
+ <dependency org="org.bouncycastle" name="bcprov" rev="1.46"/>
+ <dependency org="bsf" name="bsf" rev="2.4.0"/>
+ <dependency org="org.codehaus.btm" name="btm" rev="2.1.2"/>
+ <dependency org="cglib" name="cglib" rev="2.2.2"/>
+ <!--
+ <dependency org="com.noelios.restlet" name="com.noelios.restlet" rev="1.1.5"/>
+ <dependency org="com.noelios.restlet.ext.servlet" name="com.noelios.restlet.ext.servlet" rev="1.1.5"/>
+ <dependency org="com.noelios.restlet.ext.simple" name="com.noelios.restlet.ext.simple" rev="1.1.5"/>
+ -->
+ <dependency org="commons-beanutils" name="commons-beanutils" rev="1.8.3"/>
+ <dependency org="commons-cli" name="commons-cli" rev="1.2"/>
+ <dependency org="commons-codec" name="commons-codec" rev="1.5"/>
+ <dependency org="commons-collections3" name="commons-collections3" rev="3.2.1"/>
+ <dependency org="org.apache.commons" name="commons-compress" rev="1.2"/>
+ <dependency org="commons-digester" name="commons-digester" rev="1.8.1"/>
+ <dependency org="commons-discovery" name="commons-discovery" rev="0.5"/>
+ <dependency org="commons-fileupload" name="commons-fileupload" rev="1.2.2"/>
+ <dependency org="commons-httpclient" name="commons-httpclient" rev="3.1"/>
+ <dependency org="commons-io" name="commons-io" rev="1.4"/>
+ <dependency org="commons-jxpath" name="commons-jxpath" rev="1.3"/>
+ <dependency org="commons-lang" name="commons-lang" rev="2.6"/>
+ <dependency org="commons-logging" name="commons-logging" rev="1.1.1"/>
+ <dependency org="commons-logging" name="commons-logging-api" rev="1.1.1"/>
+ <dependency org="commons-pool" name="commons-pool" rev="1.5.6"/>
+ <dependency org="dnsjava" name="dnsjava" rev="2.0.8"/>
+ <dependency org="dom4j" name="dom4j" rev="1.6.1"/>
+ <dependency org="net.sf.ehcache" name="ehcache-core" rev="2.1.0"/>
+ <dependency org="javax.el" name="el-api" rev="2.1"/>
+ <dependency org="excalibur" name="excalibur" rev="logkit"/>
+ <dependency org="net.sf.ezmorph" name="ezmorph" rev="1.0.6"/>
+ <dependency org="org.apache.geronimo.specs" name="geronimo-activation_1.1_spec" rev="1.0.2"/>
+ <dependency org="geronimo-ejb-3.0-spec" name="geronimo-ejb-3.0-spec" rev="1.0.1"/>
+ <dependency org="geronimo-j2ee-connector-1.5-spec" name="geronimo-j2ee-connector-1.5-spec" rev="2.0.0"/>
+<!--
+ <dependency org="geronimo-j2ee-management_1.1_spec" name="geronimo-j2ee-management_1.1_spec" rev="1.0.1"/>
+-->
+ <dependency org="geronimo-javamail" name="geronimo-javamail" rev="1.4-provider"/>
+ <dependency org="geronimo-javamail-1.4-spec" name="geronimo-javamail-1.4-spec" rev="1.2"/>
+ <dependency org="org.apache.geronimo.specs" name="geronimo-jms_1.1_spec" rev="1.1"/>
+ <dependency org="org.apache.geronimo.specs" name="geronimo-jpa_2.0_spec" rev="1.1"/>
+ <dependency org="org.apache.geronimo.specs" name="geronimo-jta_1.1_spec" rev="1.1.1"/>
+ <dependency org="geronimo-stax-1.2-spec" name="geronimo-stax-1.2-spec" rev="1.1"/>
+ <dependency org="groovy-all" name="groovy-all" rev="1.7.2"/>
+ <dependency org="com.google.guava" name="guava" rev="11.0.2"/>
+<!--GWT-->
+<!--
+ <dependency org="guava-r09" name="guava-r09" rev="gwt"/>
+ <dependency org="guava-gwt" name="guava-gwt-super" rev="r09"/>
+ <dependency org="gwt-api-checker" name="gwt-api-checker" rev="2.2"/>
+ <dependency org="gwt-dev" name="gwt-dev" rev="2.2"/>
+ <dependency org="gwt-servlet" name="gwt-servlet" rev="2.2"/>
+ <dependency org="gwt-servlet-deps" name="gwt-servlet-deps" rev="2.2"/>
+ <dependency org="gwt-soyc-vis" name="gwt-soyc-vis" rev="2.2"/>
+ <dependency org="gwt-user" name="gwt-user" rev="2.2"/>
+-->
+<!--END GWT-->
+ <dependency org="ha-jdbc" name="ha-jdbc" rev="2.0.16-rc-1-jdk1.6"/>
+ <dependency org="org.hamcrest" name="hamcrest-core" rev="1.2"/>
+ <dependency org="org.hamcrest" name="hamcrest-generator" rev="1.2"/>
+ <dependency org="org.hamcrest" name="hamcrest-library" rev="1.2"/>
+ <dependency org="org.hamcrest" name="hamcrest-integration" rev="1.2"/>
+ <dependency org="org.hibernate" name="hibernate-core" rev="3.6.9.Final"/>
+ <dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.6.9.Final"/>
+ <dependency org="org.hibernate" name="hibernate-validator" rev="4.0.2.GA"/>
+ <dependency org="org.hibernate" name="hibernate-proxool" rev="3.6.9.Final"/>
+ <dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.2.0.Final"/>
+ <dependency org="hibernate-jbosscache" name="hibernate-jbosscache" rev="3.6.8"/>
+ <dependency org="org.hsqldb" name="hsqldb" rev="1.8.0.10"/>
+ <dependency org="org.hsqldb" name="hsqldbutil" rev="1.8.0.10"/>
+ <dependency org="itext" name="itext" rev="2.1.7"/>
+ <!--
+ <dependency org="infinispan-core" name="infinispan-core" rev="4.2.1.CR4"/>
+ -->
+ <dependency org="janino" name="janino" rev="2.5.15-1ubuntu2"/>
+ <dependency org="net.sf.jasperreports" name="jasperreports" rev="3.7.4"/>
+ <dependency org="javassist" name="javassist" rev="3.12.1.GA"/>
+ <dependency org="jaxen" name="jaxen" rev="1.1.3"/>
+ <dependency org="jaxp" name="jaxp" rev="1.3"/>
+ <dependency org="jboss-common" name="jboss-common" rev="0.0+svn2938"/>
+ <!--
+ <dependency org="jboss-logging" name="jboss-logging" rev="spi"/>
+ -->
+ <dependency org="org.jboss.marshalling" name="marshalling-api" rev="1.1.3.GA"/>
+ <dependency org="org.jboss.marshalling" name="river" rev="1.1.3.GA"/>
+ <dependency org="org.jboss.cache" name="jbosscache-core" rev="3.2.8.GA"/>
+ <dependency org="jcip" name="jcip" rev="20060626"/>
+ <dependency org="jsr305" name="jsr305" rev="0.1~+svn49"/>
+ <dependency org="org.slf4j" name="jcl-over-slf4j" rev="1.6.2"/>
+ <dependency org="org.codehaus" name="jettison" rev="1.2"/>
+ <dependency org="org.mortbay.jetty" name="jetty" rev="6.x"/>
+ <dependency org="org.mortbay.jetty" name="jetty-ajp" rev="6.x"/>
+ <dependency org="org.mortbay.jetty" name="jetty-client" rev="6.x"/>
+ <dependency org="org.mortbay.jetty" name="jetty-html" rev="6.x"/>
+ <dependency org="org.mortbay.jetty" name="jetty-management" rev="6.x"/>
+ <dependency org="org.mortbay.jetty" name="jetty-naming" rev="6.x"/>
+ <dependency org="org.mortbay.jetty" name="jetty-rewrite-handler" rev="6.x"/>
+ <dependency org="org.mortbay.jetty" name="jetty-servlet-tester" rev="6.x"/>
+ <dependency org="org.mortbay.jetty" name="jetty-sslengine" rev="6.x"/>
+ <dependency org="org.mortbay.jetty" name="jetty-util" rev="6.x"/>
+ <dependency org="org.jgroups" name="jgroups" rev="2.12.2.Final"/>
+ <dependency org="jibx-bind" name="jibx-bind" rev="1.2.3"/>
+ <dependency org="jibx-extras" name="jibx-extras" rev="1.2.3"/>
+ <dependency org="jibx-run" name="jibx-run" rev="1.2.3"/>
+ <dependency org="jibx-schema" name="jibx-schema" rev="1.2.3"/>
+ <!--
+ <dependency org="jibx-tools" name="jibx-tools" rev="1.2.3"/>
+ -->
+ <!--
+ <dependency org="jminix" name="jminix" rev="0.9"/>
+ -->
+ <dependency org="net.java.dev.jna" name="jna" rev="3.2.7"/>
+ <dependency org="com.jcraft" name="jsch" rev="0.1.42"/>
+ <dependency org="json-lib" name="json-lib" rev="2.3"/>
+ <dependency org="jug-asl" name="jug-asl" rev="2.0.0"/>
+ <dependency org="org.slf4j" name="jul-to-slf4j" rev="1.6.2"/>
+ <dependency org="junit" name="junit" rev="4.x"/>
+ <dependency org="org.apache.activemq" name="kahadb" rev="5.5.0"/>
+ <dependency org="log4j" name="log4j" rev="1.2.x"/>
+ <dependency org="mule-core" name="mule-core" rev="2.0.1"/>
+ <dependency org="mule-module-builders" name="mule-module-builders" rev="2.0.1"/>
+ <dependency org="mule-module-client" name="mule-module-client" rev="2.0.1"/>
+ <dependency org="mule-management" name="mule-management" rev="2.0.1"/>
+ <dependency org="mule-module-spring-config" name="mule-module-spring-config" rev="2.0.1"/>
+ <dependency org="mule-module-xml" name="mule-module-xml" rev="2.0.1"/>
+ <dependency org="mule-transport-vm" name="mule-transport-vm" rev="2.0.1"/>
+<!--
+ <dependency org="mysql-connector-java-commercial" name="mysql-connector-java-commercial" rev="5.1.11-bin"/>
+-->
+ <dependency org="netty3.1" name="netty3.1" rev="3.1.0.CR1"/>
+ <dependency org="clean-crypto" name="clean-crypto" rev="1"/>
+ <!--
+ <dependency org="org.restlet" name="org.restlet" rev="1.1.5"/>
+ <dependency org="org.restlet.ext.velocity" name="org.restlet.ext.velocity" rev="1.1.5"/>
+ -->
+ <!--
+ <dependency org="org.simpleframework" name="org.simpleframework" rev="3.1.3"/>
+ -->
+ <dependency org="proxool" name="proxool" rev="0.9.1"/>
+ <dependency org="postgresql" name="postgresql" rev="jdbc3"/>
+ <!--
+ <dependency org="proxool" name="proxool" rev="cgilib"/>
+ -->
+ <dependency org="org.quartz-scheduler" name="quartz" rev="1.7.3"/>
+ <dependency org="jakarta-regexp" name="jakarta-regexp" rev="1.5"/>
+ <!--
+ <dependency org="rhq-pluginAnnotations" name="rhq-pluginAnnotations" rev="3.0.1"/>
+ -->
+ <dependency org="xalan" name="serializer" rev="2.7.1"/>
+ <dependency org="servlet-api" name="servlet-api" rev="2.5"/>
+ <dependency org="org.slf4j" name="slf4j-api" rev="1.6.2"/>
+ <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.2"/>
+<!--
+ <dependency org="manageontap" name="manageontap" rev="1.0"/>
+-->
+ <dependency org="org.springframework" name="spring-beans" rev="3.x"/>
+ <dependency org="org.springframework" name="spring-context" rev="3.x"/>
+ <dependency org="org.springframework" name="spring-context-support" rev="3.x"/>
+ <dependency org="org.springframework" name="spring-core" rev="3.x"/>
+ <dependency org="org.springframework" name="spring-web" rev="3.x"/>
+ <dependency org="org.springframework" name="spring-expression" rev="3.x"/>
+ <dependency org="org.codehaus.woodstox" name="stax2-api" rev="3.1.1"/>
+ <dependency org="org.apache.velocity" name="velocity" rev="1.7"/>
+<!--
+ <dependency org="vijava-2.1-euca" name="vijava-2.1-euca" rev="1316109169"/>
+-->
+ <dependency org="org.codehaus.woodstox" name="wstx-lgpl" rev="3.9.2"/>
+ <dependency org="wsdl4j" name="wsdl4j" rev="1.6.2"/>
+ <dependency org="wss4j" name="wss4j" rev="1.5.8"/>
+ <dependency org="xalan" name="xalan" rev="2.7.1"/>
+ <dependency org="xerces" name="xercesImpl" rev="2.11.0"/>
+ <dependency org="org.apache.santuario" name="xmlsec" rev="1.4.5"/>
+ <dependency org="xom" name="xom" rev="1.2.1"/>
+ <dependency org="xpp3" name="xpp3" rev="1.1.4c"/>
+ </dependencies>
+</ivy-module>
Added: eucalyptus/trunk/debian/ivysettings.xml
===================================================================
--- eucalyptus/trunk/debian/ivysettings.xml (rev 0)
+++ eucalyptus/trunk/debian/ivysettings.xml 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,25 @@
+<ivysettings>
+ <settings defaultResolver="default">
+
+ <property name="local-maven2-pattern"
+ value="/usr/share/maven-repo/[organisation]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]"
+ override="false" />
+
+ <resolvers>
+ <chain name="default" returnFirst="true">
+ <filesystem
+ name="local-maven2"
+ m2compatible="true" >
+ <ivy pattern="${local-maven2-pattern}"/>
+ <artifact pattern="${local-maven2-pattern}"/>
+ </filesystem>
+ <filesystem name="1">
+ <artifact pattern="/usr/share/java/[artifact]-[revision].[ext]"/>
+ </filesystem>
+ <filesystem name="2">
+ <artifact pattern="/usr/share/java/[artifact].[ext]"/>
+ </filesystem>
+ </chain>
+ </resolvers>
+ </settings>
+</ivysettings>
Added: eucalyptus/trunk/debian/patches/build-against-new-guava.patch
===================================================================
--- eucalyptus/trunk/debian/patches/build-against-new-guava.patch (rev 0)
+++ eucalyptus/trunk/debian/patches/build-against-new-guava.patch 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,233 @@
+diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentRegistrationHandler.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentRegistrationHandler.java
+index ed8413f..9a81d56 100644
+--- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentRegistrationHandler.java
++++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentRegistrationHandler.java
+@@ -75,6 +75,7 @@ import com.eucalyptus.util.EucalyptusCloudException;
+ import com.eucalyptus.util.Exceptions;
+ import com.google.common.util.concurrent.Futures;
+ import com.google.common.util.concurrent.MoreExecutors;
++import com.google.common.util.concurrent.JdkFutureAdapters;
+
+ public class ComponentRegistrationHandler {
+ private static Logger LOG = Logger.getLogger( ComponentRegistrationHandler.class );
+@@ -141,8 +142,8 @@ public class ComponentRegistrationHandler {
+ try {
+ Components.lookup( newComponent ).setup( newComponent );
+ Future<ServiceConfiguration> res = Topology.start( newComponent );
+- Futures.makeListenable( res ).addListener( new Runnable( ) {
+-
++ JdkFutureAdapters.listenInPoolThread( res ).addListener( new Runnable( ) {
++
+ @Override
+ public void run( ) {
+ try {
+diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SslSetup.java b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SslSetup.java
+index 643ec80..f19ee1d 100644
+--- a/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SslSetup.java
++++ b/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/util/SslSetup.java
+@@ -58,6 +58,9 @@ import com.google.common.base.Predicate;
+ import com.google.common.base.Splitter;
+ import com.google.common.base.Supplier;
+ import com.google.common.base.Suppliers;
++import com.google.common.cache.CacheBuilder;
++import com.google.common.cache.CacheLoader;
++import com.google.common.cache.LoadingCache;
+ import com.google.common.collect.ImmutableList;
+ import com.google.common.collect.MapMaker;
+ import com.google.common.collect.ObjectArrays;
+@@ -71,8 +74,8 @@ public class SslSetup {
+ private static final String PROTOCOL = "TLS";
+ private static SSLContext SERVER_CONTEXT = null;
+ private static SSLContext CLIENT_CONTEXT = null;
+- private static final Map<SslCipherSuiteBuilderParams,String[]> SSL_CIPHER_LOOKUP =
+- new MapMaker().maximumSize(32).makeComputingMap( SslCipherSuiteBuilder.INSTANCE );
++ private static final LoadingCache<SslCipherSuiteBuilderParams,String[]> SSL_CIPHER_LOOKUP =
++ CacheBuilder.newBuilder().maximumSize(32).build(CacheLoader.from(SslCipherSuiteBuilder.INSTANCE) );
+ @ConfigurableField( description = "Alias of the certificate entry in euca.p12 to use for SSL for webservices.",
+ changeListener = SslCertChangeListener.class )
+ public static String SERVER_ALIAS = ComponentIds.lookup( Eucalyptus.class ).name( );
+@@ -172,7 +175,7 @@ public class SslSetup {
+ }
+
+ public static String[] getEnabledCipherSuites( final String cipherStrings, final String[] supportedCipherSuites ) {
+- return SSL_CIPHER_LOOKUP.get( params(cipherStrings, supportedCipherSuites) );
++ return SSL_CIPHER_LOOKUP.getUnchecked( params(cipherStrings, supportedCipherSuites) );
+ }
+
+ static class ClientKeyManager extends KeyManagerFactorySpi {
+diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Exceptions.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Exceptions.java
+index b937f2b..073118f 100644
+--- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/Exceptions.java
++++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/Exceptions.java
+@@ -27,6 +27,10 @@ import com.google.common.base.Function;
+ import com.google.common.base.Joiner;
+ import com.google.common.base.Predicate;
+ import com.google.common.base.Predicates;
++import com.google.common.cache.Cache;
++import com.google.common.cache.CacheBuilder;
++import com.google.common.cache.CacheLoader;
++import com.google.common.cache.LoadingCache;
+ import com.google.common.collect.Collections2;
+ import com.google.common.collect.Iterables;
+ import com.google.common.collect.Lists;
+@@ -285,23 +289,23 @@ public class Exceptions {
+
+ public static class ErrorMessageBuilder {
+ private Class type;
+- private Map<Class, String> map;
++ private LoadingCache<Class, String> map;
+
+ public ErrorMessageBuilder( Class input ) {
+ this.type = input;
+ this.map = classErrorMessages.get( this.type );
+ }
+
+- private boolean hasMessage( Class<? extends Throwable> ex ) {
++ private boolean hasMessage( Class<? extends Throwable> ex ) {
+ if ( this.map != null ) {
+- return this.map.containsKey( ex );
++ return this.map.getUnchecked( ex ) != null;
+ } else {
+ return false;
+ }
+ }
+
+ private String getMessage( Class<? extends Throwable> ex ) {
+- return classErrorMessages.get( this.type ).get( ex );
++ return classErrorMessages.get( this.type ).getUnchecked( ex );
+ }
+
+ public ExceptionBuilder exception( Throwable ex ) {
+@@ -370,7 +374,7 @@ public class Exceptions {
+ Class<?> value( );
+ }
+
+- private static final Map<Class, Map<Class, String>> classErrorMessages = Maps.newConcurrentMap( );
++ private static final Map<Class, LoadingCache<Class, String>> classErrorMessages = Maps.newConcurrentMap( );
+
+ @Discovery( value = { Function.class },
+ annotations = { ErrorMessages.class },
+@@ -386,7 +390,7 @@ public class Exceptions {
+ try {
+ ErrorMessages annote = Ats.from( input ).get( ErrorMessages.class );
+ Function<Class, String> errorFunction = ( Function<Class, String> ) Classes.builder( input ).newInstance( );
+- ConcurrentMap<Class, String> errorMap = new MapMaker( ).expireAfterAccess( 60, TimeUnit.SECONDS ).makeComputingMap( errorFunction );
++ LoadingCache<Class, String> errorMap = CacheBuilder.newBuilder().expireAfterAccess( 60, TimeUnit.SECONDS ).build(CacheLoader.from(errorFunction));
+ classErrorMessages.put( annote.value( ), errorMap );
+ return true;
+ } catch ( UndeclaredThrowableException ex ) {
+diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/AtomicMarkedState.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/AtomicMarkedState.java
+index f4bb232..397ed7e 100644
+--- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/AtomicMarkedState.java
++++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/AtomicMarkedState.java
+@@ -62,7 +62,7 @@ public class AtomicMarkedState<P extends HasName<P>, S extends Automata.State, T
+ }
+ }
+ };
+- this.immutableStates = ImmutableList.of( states );
++ this.immutableStates = ImmutableList.copyOf( states );
+ this.state = new AtomicMarkableReference<S>( this.startState, false );
+ this.immutableTransitions = ImmutableList.copyOf( transitions );
+ for ( TransitionHandler<P, S, T> t : transitions ) {
+diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/StateMachineBuilder.java b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/StateMachineBuilder.java
+index 161a8ad..669e430 100644
+--- a/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/StateMachineBuilder.java
++++ b/clc/modules/msgs/src/main/java/com/eucalyptus/util/fsm/StateMachineBuilder.java
+@@ -210,7 +210,7 @@ public class StateMachineBuilder<P extends HasName<P>, S extends Automata.State,
+ }
+
+ private void doChecks( ) {
+- this.immutableStates = ImmutableList.of( this.startState.asEnum.getEnumConstants( this.startState ) );
++ this.immutableStates = ImmutableList.copyOf( this.startState.asEnum.getEnumConstants( this.startState ) );
+ if ( this.transitions.isEmpty( ) ) {
+ throw new IllegalStateException( "Started state machine with no registered transitions." );
+ }
+diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingCache.java b/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingCache.java
+index 1950e65..2204062 100644
+--- a/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingCache.java
++++ b/clc/modules/msgs/src/main/java/com/eucalyptus/binding/BindingCache.java
+@@ -187,7 +187,8 @@ public class BindingCache {
+ MapDifference<String, String> diffBindings = Maps.difference( oldBindings, newBindings );
+ LOG.info( "Binding class cache expired (old,new): \n" + diffBindings.entriesDiffering( ) );
+ try {
+- Files.deleteRecursively( SubDirectory.CLASSCACHE.getFile( ) );
++ //Files.deleteRecursively( SubDirectory.CLASSCACHE.getFile( ) );
++ delete( SubDirectory.CLASSCACHE.getFile( ) );
+ } catch ( IOException ex ) {
+ LOG.error( ex, ex );
+ }
+@@ -195,7 +196,14 @@ public class BindingCache {
+ return false;
+ }
+ }
+-
++ private void delete(File f) throws IOException {
++ if (f.isDirectory( ) ) {
++ for (File file : f.listFiles( ) )
++ delete( file );
++ }
++ if (!f.delete( ) )
++ throw new FileNotFoundException("Failed to delete file: " + f);
++ }
+ public void store( ) throws IOException {
+ Writer propOut = new FileWriter( CACHE_LIST );
+ try {
+@@ -210,7 +218,8 @@ public class BindingCache {
+ for ( File f : SubDirectory.CLASSCACHE.getFile( ).listFiles( ) ) {
+ try {
+ LOG.info( "Cleaning up class cache: " + f.getCanonicalPath( ) );
+- Files.deleteRecursively( f );
++ //Files.deleteRecursively( f );
++ delete(f);
+ } catch ( IOException ex1 ) {
+ LOG.error( ex1, ex1 );
+ }
+diff --git a/clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java b/clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java
+index 2b9994e..505d7c2 100644
+--- a/clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java
++++ b/clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java
+@@ -62,6 +62,7 @@ package com.eucalyptus.bootstrap;
+
+ import static com.eucalyptus.crypto.util.SslSetup.getEnabledCipherSuites;
+ import java.io.File;
++import java.io.FileNotFoundException;
+ import java.io.IOException;
+ import java.net.URL;
+ import org.apache.log4j.Logger;
+@@ -126,6 +127,14 @@ public class HttpServerBootstrapper extends Bootstrapper {
+ jettyConfig.configure( jettyServer );
+ }
+
++ private static void delete(File f) throws IOException {
++ if (f.isDirectory( ) ) {
++ for (File file : f.listFiles( ) )
++ delete( file );
++ }
++ if (!f.delete( ) )
++ throw new FileNotFoundException("Failed to delete file: " + f);
++ }
+ private static void startJettyServer( ) {
+ Threads.lookup( HttpService.class, HttpServerBootstrapper.class ).submit( new Runnable( ) {
+ @Override
+@@ -135,7 +144,7 @@ public class HttpServerBootstrapper extends Bootstrapper {
+ String path = "/var/run/eucalyptus/webapp";
+ File dir = new File( BaseDirectory.HOME + path );
+ if ( dir.exists( ) ) {
+- Files.deleteDirectoryContents( dir );
++ delete(dir);
+ dir.delete( );
+ }
+
+diff --git a/clc/modules/postgresql/conf/scripts/setup_db.groovy b/clc/modules/postgresql/conf/scripts/setup_db.groovy
+index 07c2f37..2192f82 100644
+--- a/clc/modules/postgresql/conf/scripts/setup_db.groovy
++++ b/clc/modules/postgresql/conf/scripts/setup_db.groovy
+@@ -621,7 +621,7 @@ ${hostOrHostSSL}\tall\tall\t::/0\tpassword
+
+ @Override
+ public String getServicePath( String... pathParts ) {
+- return pathParts != null && pathParts.length > 0 ? Joiner.on("/").join(pathParts) : "eucalyptus"
++ return pathParts != null && pathParts.length > 0 ? Joiner.on("/"). join(pathParts.iterator()) : "eucalyptus"
+ }
+
+ @Override
Added: eucalyptus/trunk/debian/patches/create-var-run-euca.patch
===================================================================
--- eucalyptus/trunk/debian/patches/create-var-run-euca.patch (rev 0)
+++ eucalyptus/trunk/debian/patches/create-var-run-euca.patch 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,42 @@
+--- a/tools/eucalyptus-cloud.in.orig 2012-05-17 11:26:37.024384764 -0700
++++ b/tools/eucalyptus-cloud.in 2012-05-17 11:31:40.291785074 -0700
+@@ -319,6 +319,11 @@
+
+ case "$1" in
+ start)
++ if [ ! -e /var/run/eucalyptus ]; then
++ mkdir -p /var/run/eucalyptus
++ chown eucalyptus:eucalyptus /var/run/eucalyptus
++ fi
++
+ if [ "$VERBOSE" != no ]; then
+ if [ "$WE_HAVE_LSB" = "Y" ]; then
+ log_daemon_msg "Starting $DESC" "$NAME"
+--- a/tools/eucalyptus-cc.in.orig 2012-05-17 11:28:40.395685023 -0700
++++ b/tools/eucalyptus-cc.in 2012-05-17 11:32:01.103865866 -0700
+@@ -382,6 +382,11 @@
+
+ case "$1" in
+ start)
++ if [ ! -e /var/run/eucalyptus ]; then
++ mkdir -p /var/run/eucalyptus
++ chown eucalyptus:eucalyptus /var/run/eucalyptus
++ fi
++
+ if [ "$VERBOSE" != no ]; then
+ if [ "$WE_HAVE_LSB" = "Y" ]; then
+ log_daemon_msg "Starting $DESC" "$NAME"
+--- a/tools/eucalyptus-nc.in.orig 2012-05-17 11:28:47.751665273 -0700
++++ b/tools/eucalyptus-nc.in 2012-05-17 11:31:41.471789319 -0700
+@@ -379,6 +379,11 @@
+
+ case "$1" in
+ start)
++ if [ ! -e /var/run/eucalyptus ]; then
++ mkdir -p /var/run/eucalyptus
++ chown eucalyptus:eucalyptus /var/run/eucalyptus
++ fi
++
+ if [ "$VERBOSE" != no ]; then
+ if [ "$WE_HAVE_LSB" = "Y" ]; then
+ log_daemon_msg "Starting $DESC" "$NAME"
Added: eucalyptus/trunk/debian/patches/disable-config-validation.patch
===================================================================
--- eucalyptus/trunk/debian/patches/disable-config-validation.patch (rev 0)
+++ eucalyptus/trunk/debian/patches/disable-config-validation.patch 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,14 @@
+Description: Disable config validation as it bombs with the Preice version of hibernate validator
+Author: Brian Thomason <brian.thomason at canonical.com>
+
+--- a/tools/eucalyptus.conf.bak 2012-05-01 12:14:43.407761934 -0400
++++ b/tools/eucalyptus.conf 2012-05-01 12:19:01.739766783 -0400
+@@ -10,7 +10,7 @@
+
+ # Extra options to pass to the eucalyptus-cloud process, such as log
+ # levels, heap size, or other JVM flags.
+-CLOUD_OPTS=""
++CLOUD_OPTS=" -Djbosscache.config.validate=false"
+
+ ###########################################################################
+ # STORAGE CONTROLLER (SC) CONFIGURATION
Added: eucalyptus/trunk/debian/patches/disable-gwt.patch
===================================================================
--- eucalyptus/trunk/debian/patches/disable-gwt.patch (rev 0)
+++ eucalyptus/trunk/debian/patches/disable-gwt.patch 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,118 @@
+diff --git a/clc/modules/www/src/main/java/com/eucalyptus/www/X509Download.java b/clc/modules/www/src/main/java/com/eucalyptus/www/X509Download.java
+index c499c6d..d1ead20 100644
+--- a/clc/modules/www/src/main/java/com/eucalyptus/www/X509Download.java
++++ b/clc/modules/www/src/main/java/com/eucalyptus/www/X509Download.java
+@@ -95,8 +95,8 @@ import com.eucalyptus.crypto.Certs;
+ import com.eucalyptus.crypto.util.PEMFiles;
+ import com.eucalyptus.util.Internets;
+ import com.eucalyptus.ws.StackConfiguration;
+-import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
+-import com.google.gwt.safehtml.shared.SafeHtmlUtils;
++//import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
++//import com.google.gwt.safehtml.shared.SafeHtmlUtils;
+
+ public class X509Download extends HttpServlet {
+
+@@ -313,11 +313,13 @@ public class X509Download extends HttpServlet {
+ }
+
+ public static String getError( String message ) {
+- SafeHtmlBuilder builder = new SafeHtmlBuilder( );
+- builder.append( SafeHtmlUtils.fromTrustedString( "<html><title>Getting credentials failed</title><body><div align=\"center\"><p><h1>Getting credentails failed</h1></p><p><img src=\"themes/active/logo.png\" /></p><p><h3 style=\"font-color: red;\">" ) );
+- builder.appendEscaped( message );
+- builder.append( SafeHtmlUtils.fromTrustedString( "</h3></p></div></body></html>" ) );
+- return builder.toSafeHtml( ).asString( );
++ return "<html><title>Getting credentials failed</title><body><div align=\"center\"><p><h1>Getting credentails failed</h1></p><p><img src=\"themes/active/logo.png\" /></p><p><h3 style=\"font-color: red;\">"
++ + message + "</h3></p></div></body></html>" ;
++// SafeHtmlBuilder builder = new SafeHtmlBuilder( );
++// builder.append( SafeHtmlUtils.fromTrustedString( "<html><title>Getting credentials failed</title><body><div align=\"center\"><p><h1>Getting credentails failed</h1></p><p><img src=\"themes/active/logo.png\" /></p><p><h3 style=\"font-color: red;\">" ) );
++// builder.appendEscaped( message );
++// builder.append( SafeHtmlUtils.fromTrustedString( "</h3></p></div></body></html>" ) );
++// return builder.toSafeHtml( ).asString( );
+ }
+
+ }
+--- a/clc/modules/www/conf/gwt-web.xml 2012-06-28 19:36:09.000000000 -0700
++++ b/clc/modules/www/conf/gwt-web.xml 2012-06-28 19:37:37.000000000 -0700
+@@ -81,81 +81,15 @@
+
+ <servlet>
+ <description></description>
+- <display-name>EucalyptusService</display-name>
+- <servlet-name>EucalyptusServiceImpl</servlet-name>
+- <servlet-class>com.eucalyptus.webui.server.EucalyptusServiceImpl</servlet-class>
+- <load-on-startup>1</load-on-startup>
+- </servlet>
+-
+- <servlet>
+- <description>Executes a command within Eucalyptus</description>
+- <display-name>Command Servlet</display-name>
+- <servlet-name>CommandServlet</servlet-name>
+- <servlet-class>com.eucalyptus.www.CommandServlet</servlet-class>
+- <load-on-startup>1</load-on-startup>
+- </servlet>
+-
+- <servlet>
+- <description>New Report Generation Servlet</description>
+- <display-name>Report Servlet</display-name>
+- <servlet-name>ReportServlet</servlet-name>
+- <servlet-class>com.eucalyptus.www.ReportServlet</servlet-class>
+- <load-on-startup>1</load-on-startup>
+- </servlet>
+-
+- <servlet>
+- <description>Logs into eucalyptus and returns a session id</description>
+- <display-name>Login Servlet</display-name>
+- <servlet-name>LoginServlet</servlet-name>
+- <servlet-class>com.eucalyptus.www.LoginServlet</servlet-class>
+- <load-on-startup>1</load-on-startup>
+- </servlet>
+-
+- <servlet>
+- <description></description>
+ <display-name>X509Downloader</display-name>
+ <servlet-name>X509Download</servlet-name>
+ <servlet-class>com.eucalyptus.www.X509Download</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+- <servlet>
+- <description></description>
+- <display-name>CloudRegistration</display-name>
+- <servlet-name>CloudRegistration</servlet-name>
+- <servlet-class>com.eucalyptus.www.Registration</servlet-class>
+- <load-on-startup>1</load-on-startup>
+- </servlet>
+-
+-
+- <servlet-mapping>
+- <servlet-name>EucalyptusServiceImpl</servlet-name>
+- <url-pattern>/backend</url-pattern>
+- </servlet-mapping>
+-
+ <servlet-mapping>
+ <servlet-name>X509Download</servlet-name>
+ <url-pattern>/getX509</url-pattern>
+ </servlet-mapping>
+
+- <servlet-mapping>
+- <servlet-name>CommandServlet</servlet-name>
+- <url-pattern>/commandservlet</url-pattern>
+- </servlet-mapping>
+-
+- <servlet-mapping>
+- <servlet-name>LoginServlet</servlet-name>
+- <url-pattern>/loginservlet</url-pattern>
+- </servlet-mapping>
+-
+- <servlet-mapping>
+- <servlet-name>ReportServlet</servlet-name>
+- <url-pattern>/reportservlet</url-pattern>
+- </servlet-mapping>
+-
+- <servlet-mapping>
+- <servlet-name>CloudRegistration</servlet-name>
+- <url-pattern>/register</url-pattern>
+- </servlet-mapping>
+-
+ </web-app>
Added: eucalyptus/trunk/debian/patches/enable-ivy.patch
===================================================================
--- eucalyptus/trunk/debian/patches/enable-ivy.patch (rev 0)
+++ eucalyptus/trunk/debian/patches/enable-ivy.patch 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,21 @@
+--- a/clc/build.xml.orig 2012-06-11 14:05:46.230648646 -0400
++++ b/clc/build.xml 2012-06-11 14:14:09.938657654 -0400
+@@ -61,7 +61,7 @@
+ ~ Author: chris grzegorczyk grze at eucalyptus.com
+ -->
+
+-<project name="eucalyptus" basedir=".">
++<project xmlns:ivy="antlib:org.apache.ivy.ant" name="eucalyptus" basedir=".">
+ <property environment="localenv" />
+ <property name="euca.home.0" value="${localenv.EUCALYPTUS}" />
+ <condition property="euca.home" value="/opt/eucalyptus" else="${localenv.EUCALYPTUS}">
+@@ -103,6 +103,9 @@
+ </sequential>
+ </macrodef>
+ <!--================================== build targets ==================================-->
++ <target name="resolve" description="--> retrieve dependencies with ivy">
++ <ivy:retrieve />
++ </target>
+ <target name="build">
+ <ant dir="." inheritall="false" target="build-all" />
+ <ant dir="." inheritall="false" target="jar" />
Added: eucalyptus/trunk/debian/patches/enable-wsdl.patch
===================================================================
--- eucalyptus/trunk/debian/patches/enable-wsdl.patch (rev 0)
+++ eucalyptus/trunk/debian/patches/enable-wsdl.patch 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,48 @@
+--- a/cluster/Makefile.orig 2012-06-18 22:10:36.857983494 -0400
++++ b/cluster/Makefile 2012-06-18 22:11:25.965984372 -0400
+@@ -35,11 +35,11 @@
+ rm -rf generated
+ mkdir -p generated
+ @echo Generating client stubs
+- sh $(WSDL2C) -uri $(CCWSDL) -g -d adb -u -uw -f -o generated | grep -v 'the classpath'
++ java -classpath /usr/share/java/wsdl2c.jar:/usr/share/java/wsdl4j.jar:/usr/share/java/commons-logging-1.1.1.jar:/usr/share/java/backport-util-concurrent.jar:/usr/share/java/xalan2.jar org.apache.axis2.wsdl.WSDL2C -uri $(CCWSDL) -g -d adb -u -uw -f -o generated
+ @echo Generating NCclient stubs
+- sh $(WSDL2C) -uri $(NCWSDL) -g -d adb -u -uw -f -o generated | grep -v 'the classpath'
++ java -classpath /usr/share/java/wsdl2c.jar:/usr/share/java/wsdl4j.jar:/usr/share/java/commons-logging-1.1.1.jar:/usr/share/java/backport-util-concurrent.jar:/usr/share/java/xalan2.jar org.apache.axis2.wsdl.WSDL2C -uri $(NCWSDL) -g -d adb -u -uw -f -o generated
+ @echo Generating server stubs
+- sh $(WSDL2C) -uri $(CCWSDL) -sd -ss -d adb -u -uw -f -o generated | grep -v 'the classpath'
++ java -classpath /usr/share/java/wsdl2c.jar:/usr/share/java/wsdl4j.jar:/usr/share/java/commons-logging-1.1.1.jar:/usr/share/java/backport-util-concurrent.jar:/usr/share/java/xalan2.jar org.apache.axis2.wsdl.WSDL2C -uri $(CCWSDL) -sd -ss -d adb -u -uw -f -o generated
+ @echo Adding marshalling calls to server stubs
+ # ../tools/add_marshalling.pl generated/axis2_skel_*.c generated/axis2_svc_skel_*.c
+ ../tools/add_marshalling.pl generated/axis2_skel_*.c
+--- a/node/Makefile.orig 2012-06-18 22:08:25.933981153 -0400
++++ b/node/Makefile 2012-06-18 22:10:28.809983350 -0400
+@@ -34,12 +34,12 @@
+ @echo Generating server stubs
+ rm -rf generated
+ mkdir -p generated
+- sh $(WSDL2C) -uri $(NCWSDL) -sd -ss -d adb -u -uw -f -o generated | grep -v 'the classpath'
++ java -classpath /usr/share/java/wsdl2c.jar:/usr/share/java/wsdl4j.jar:/usr/share/java/commons-logging-1.1.1.jar:/usr/share/java/backport-util-concurrent.jar:/usr/share/java/xalan2.jar org.apache.axis2.wsdl.WSDL2C -uri $(NCWSDL) -sd -ss -d adb -u -uw -f -o generated
+ @echo Adding marshalling calls to server stubs
+ # ../tools/add_marshalling.pl generated/axis2_skel_*.c generated/axis2_svc_skel_*.c
+ ../tools/add_marshalling.pl generated/axis2_skel_*.c
+ @echo Generating client stubs
+- sh $(WSDL2C) -uri $(NCWSDL) -g -d adb -u -uw -f -o generated | grep -v 'the classpath'
++ java -classpath /usr/share/java/wsdl2c.jar:/usr/share/java/wsdl4j.jar:/usr/share/java/commons-logging-1.1.1.jar:/usr/share/java/backport-util-concurrent.jar:/usr/share/java/xalan2.jar org.apache.axis2.wsdl.WSDL2C -uri $(NCWSDL) -g -d adb -u -uw -f -o generated
+ # @echo Compiling the stubs
+ cd generated; patch -p1 < ../axis2_svc_generated.patch; cd ../
+ @cp ../tools/Makefile.gen generated/Makefile
+--- a/gatherlog/Makefile.orig 2012-06-18 22:06:36.897979203 -0400
++++ b/gatherlog/Makefile 2012-06-18 22:08:17.173980997 -0400
+@@ -24,9 +24,9 @@
+ rm -rf generated
+ mkdir -p generated
+ @echo Generating client stubs
+- sh $(WSDL2C) -uri $(GLWSDL) -g -d adb -u -uw -f -o generated | grep -v 'the classpath'
++ java -classpath /usr/share/java/wsdl2c.jar:/usr/share/java/wsdl4j.jar:/usr/share/java/commons-logging-1.1.1.jar:/usr/share/java/backport-util-concurrent.jar:/usr/share/java/xalan2.jar org.apache.axis2.wsdl.WSDL2C -uri $(GLWSDL) -g -d adb -u -uw -f -o generated
+ @echo Generating server stubs
+- sh $(WSDL2C) -uri $(GLWSDL) -sd -ss -d adb -u -uw -f -o generated | grep -v 'the classpath'
++ java -classpath /usr/share/java/wsdl2c.jar:/usr/share/java/wsdl4j.jar:/usr/share/java/commons-logging-1.1.1.jar:/usr/share/java/backport-util-concurrent.jar:/usr/share/java/xalan2.jar org.apache.axis2.wsdl.WSDL2C -uri $(GLWSDL) -sd -ss -d adb -u -uw -f -o generated
+ @echo Adding marshalling calls to server stubs
+ ../tools/add_marshalling.pl generated/axis2_skel_*.c
+ @cp ../tools/Makefile.gen generated/Makefile
Added: eucalyptus/trunk/debian/patches/fix-postgres-hibernate-issue.patch
===================================================================
--- eucalyptus/trunk/debian/patches/fix-postgres-hibernate-issue.patch (rev 0)
+++ eucalyptus/trunk/debian/patches/fix-postgres-hibernate-issue.patch 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,61 @@
+diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/keys/SshKeyPair.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/keys/SshKeyPair.java
+index 868a396..495112d 100644
+--- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/keys/SshKeyPair.java
++++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/keys/SshKeyPair.java
+@@ -79,6 +79,8 @@ import com.eucalyptus.component.ComponentIds;
+ import com.eucalyptus.component.id.Eucalyptus;
+ import com.eucalyptus.util.FullName;
+ import com.eucalyptus.util.OwnerFullName;
++import org.hibernate.annotations.Type;
++import org.hibernate.type.StringClobType;
+
+ @Entity
+ @javax.persistence.Entity
+@@ -91,6 +93,7 @@ public class SshKeyPair extends UserMetadata<SshKeyPair.State> implements KeyPai
+ }
+
+ @Lob
++ @Type(type="org.hibernate.type.StringClobType")
+ @Column( name = "metadata_keypair_public_key" )
+ private String publicKey;
+ @Column( name = "metadata_keypair_finger_print" )
+diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/Volume.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/Volume.java
+index f92fafd..a96c01e 100644
+--- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/Volume.java
++++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/Volume.java
+@@ -72,6 +72,8 @@ import javax.persistence.Transient;
+ import org.hibernate.annotations.Cache;
+ import org.hibernate.annotations.CacheConcurrencyStrategy;
+ import org.hibernate.annotations.Entity;
++import org.hibernate.annotations.Type;
++
+ import com.eucalyptus.auth.principal.UserFullName;
+ import com.eucalyptus.cloud.CloudMetadata.VolumeMetadata;
+ import com.eucalyptus.cloud.UserMetadata;
+@@ -96,8 +98,8 @@ public class Volume extends UserMetadata<State> implements VolumeMetadata {
+ private String partition; //TODO:GRZE: change to injected ref.
+ @Column( name = "metadata_volume_parentsnapshot" )
+ private String parentSnapshot;
+- @Lob
+- @Column( name = "metadata_volume_remotedevice" )
++
++ @Transient
+ private String remoteDevice;
+ @Column( name = "metadata_volume_localdevice" )
+ private String localDevice;
+diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/AbstractStatefulPersistent.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/AbstractStatefulPersistent.java
+index 1442629..19ffbe3 100644
+--- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/AbstractStatefulPersistent.java
++++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/AbstractStatefulPersistent.java
+@@ -83,8 +83,9 @@ public abstract class AbstractStatefulPersistent<STATE extends Enum<STATE>> exte
+ @Column( name = "metadata_last_state" )
+ @Enumerated( EnumType.STRING )
+ STATE lastState;
+- @Lob
+- @Column( name = "metadata_state_change_stack" )
++// @Lob
++// @Column( name = "metadata_state_change_stack" )
++ @Transient
+ protected String stateChangeStack;
+ @Column( name = "metadata_display_name" )
+ protected String displayName;
Added: eucalyptus/trunk/debian/patches/modify-clc-build-file.patch
===================================================================
--- eucalyptus/trunk/debian/patches/modify-clc-build-file.patch (rev 0)
+++ eucalyptus/trunk/debian/patches/modify-clc-build-file.patch 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,28 @@
+--- a/clc/modules/www/build.xml 2012-06-20 06:21:42.000000000 +0000
++++ b/clc/modules/www/build.xml 2012-06-29 11:59:29.000000000 +0000
+@@ -123,7 +123,7 @@
+ <target name="compile-src">
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${test.dir}"/>
+- <javac deprecation="false" srcdir="${src.dir}" destdir="${build.dir}" classpathref="gwtclasspath" failonerror="true" debug="true" target="1.5" />
++ <javac deprecation="false" srcdir="${src.dir}" excludes="com/eucalyptus/webui/**,com/eucalyptus/www/CommandServlet.java,com/eucalyptus/www/LoginServlet.java,com/eucalyptus/www/ReportServlet.java" destdir="${build.dir}" classpathref="gwtclasspath" failonerror="true" debug="true" target="1.5" />
+ </target>
+
+ <target name="clean">
+@@ -138,13 +138,15 @@
+ <delete dir="${gwt.war.build.dir}" />
+ <mkdir dir="${gwt.war.build.dir}" />
+ <mkdir dir="${gwt.war.dir}" />
++ <!--
+ <java classpathref="gwtcompilerclasspath" fork="true" failonerror="true" classname="com.google.gwt.dev.Compiler">
+ <jvmarg value="-Xmx1024m" />
+ <jvmarg value="-Xss1024k" />
+ <arg line="-war ${gwt.war.build.dir}" />
+ <arg line="com.eucalyptus.webui.EucalyptusWebInterface" />
+ </java>
+- <war destfile="${gwt.war}" webxml="${conf.dir}/gwt-web.xml" basedir="${gwt.war.build.dir}/${gwt.module.rename}/" />
++ -->
++ <war destfile="${gwt.war}" webxml="${conf.dir}/gwt-web.xml" basedir="${gwt.war.build.dir}/" />
+ </target>
+
+ <target name="compile-gwt-debug" depends="check-src" unless="gwtc.notRequired">
Added: eucalyptus/trunk/debian/patches/modify-clc-makefile.patch
===================================================================
--- eucalyptus/trunk/debian/patches/modify-clc-makefile.patch (rev 0)
+++ eucalyptus/trunk/debian/patches/modify-clc-makefile.patch 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,42 @@
+--- a/clc/Makefile.orig 2012-06-29 11:29:29.000000000 +0000
++++ b/clc/Makefile 2012-06-29 11:30:44.000000000 +0000
+@@ -9,11 +9,11 @@
+ all: deps build
+ test: deps build-test
+
+-lib/bcprov.jar:
++ive.xml:
+ @mkdir -p ${TOP}/clc/lib
+ @git clone --depth=1 git://github.com/eucalyptus/eucalyptus-cloud-libs.git lib
+
+-deps: lib/bcprov.jar
++deps: ivy.xml
+
+ update_properties: ${web_prop_dir}/eucalyptus-web.properties
+
+@@ -22,15 +22,16 @@
+ @echo "Copied defaults to ${web_prop_dir}/eucalyptus-web.properties"
+
+ update_theme:
+- @if test -d ${theme_dir}/${euca_theme} ; then \
+- if [ "`readlink ${theme_dir}/active`" != "${euca_theme}" ] ; then \
+- echo "Making '${euca_theme}' the active theme" ; \
+- rm -f ${theme_dir}/active ; \
+- ln -sf ${euca_theme} ${theme_dir}/active ; \
+- fi \
+- else \
+- echo "Theme ${theme_dir}/${euca_theme} is not found!"; exit 1; \
+- fi \
++ echo "Disabling update_theme as GWT is not being used."
++ #@if test -d ${theme_dir}/${euca_theme} ; then \
++ # if [ "`readlink ${theme_dir}/active`" != "${euca_theme}" ] ; then \
++ # echo "Making '${euca_theme}' the active theme" ; \
++ # rm -f ${theme_dir}/active ; \
++ # ln -sf ${euca_theme} ${theme_dir}/active ; \
++ # fi \
++ #else \
++ # echo "Theme ${theme_dir}/${euca_theme} is not found!"; exit 1; \
++ #fi \
+
+ extras: update_properties
+ @if test -n "${euca_theme}" ; then \
Added: eucalyptus/trunk/debian/patches/modify-init-files.patch
===================================================================
--- eucalyptus/trunk/debian/patches/modify-init-files.patch (rev 0)
+++ eucalyptus/trunk/debian/patches/modify-init-files.patch 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,39 @@
+Description: Add force-reload option to init scripts
+Author: Brian Thomason <brian.thomason at eucalyptus.com>
+
+--- eucalyptus-3.0.999beta1.orig/tools/eucalyptus-cloud.in
++++ eucalyptus-3.0.999beta1/tools/eucalyptus-cloud.in
+@@ -390,6 +390,9 @@ case "$1" in
+ $0 stop
+ $0 start
+ ;;
++ force-reload)
++ restart
++ ;;
+ status)
+ if do_status ; then
+ echo "$DESC are running"
+--- eucalyptus-3.0.999beta1.orig/tools/eucalyptus-nc.in
++++ eucalyptus-3.0.999beta1/tools/eucalyptus-nc.in
+@@ -459,6 +459,9 @@ case "$1" in
+ fi
+ fi
+ ;;
++ force-reload)
++ restart
++ ;;
+ status)
+ if do_status ; then
+ echo "NC is running"
+--- eucalyptus-3.0.999beta1.orig/tools/eucalyptus-cc.in
++++ eucalyptus-3.0.999beta1/tools/eucalyptus-cc.in
+@@ -537,6 +537,9 @@ case "$1" in
+ fi
+ fi
+ ;;
++ force-reload)
++ restart
++ ;;
+ cleanrestart)
+ if [ "$VERBOSE" != no ]; then
+ if [ "$WE_HAVE_LSB" = "Y" ]; then
Modified: eucalyptus/trunk/debian/patches/series
===================================================================
--- eucalyptus/trunk/debian/patches/series 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/patches/series 2012-07-07 01:27:05 UTC (rev 244)
@@ -1,2 +1,10 @@
-002_temporary_lintian_fixes.patch
-001_hibernate-3.5.patch
+disable-config-validation.patch
+enable-wsdl.patch
+modify-init-files.patch
+create-var-run-euca.patch
+enable-ivy.patch
+disable-gwt.patch
+modify-clc-makefile.patch
+build-against-new-guava.patch
+fix-postgres-hibernate-issue.patch
+modify-clc-build-file.patch
Added: eucalyptus/trunk/debian/python-eucadmin.install
===================================================================
--- eucalyptus/trunk/debian/python-eucadmin.install (rev 0)
+++ eucalyptus/trunk/debian/python-eucadmin.install 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1 @@
+/usr/lib/python2.7/site-packages/eucadmin/*.py
Added: eucalyptus/trunk/debian/pyversions
===================================================================
--- eucalyptus/trunk/debian/pyversions (rev 0)
+++ eucalyptus/trunk/debian/pyversions 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1 @@
+2.7-
Modified: eucalyptus/trunk/debian/rules
===================================================================
--- eucalyptus/trunk/debian/rules 2012-07-07 00:51:47 UTC (rev 243)
+++ eucalyptus/trunk/debian/rules 2012-07-07 01:27:05 UTC (rev 244)
@@ -2,44 +2,83 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
DEB_DH_INSTALL_ARGS = --list-missing
EUCALYPTUS=/
JAVA_HOME=/usr/lib/jvm/default-java
AXIS2_CLASSPATH=$(shell echo $(CURDIR)/clc/lib/*.jar | tr \ :)
-# Axis2 jar classpath for testing.
-#AXIS2_CLASSPATH="$HOME//eucalyptus-src-deps/axis2-1.4"
+ANT_OPTS := -Xmx1024m -Xms512m
+EXTRA_VERSION_INFO=$(shell dpkg-parsechangelog |grep Version |awk -F"~" '{print $$2}'|awk -F"." '{print $$1}')
export EUCALYPTUS
export JAVA_HOME
export AXIS2_CLASSPATH
-DEB_MAKE_CLEAN_TARGET := clean
-DEB_CONFIGURE_EXTRA_FLAGS := --with-axis2c=/usr/lib/axis2 --with-axis2c-services=/usr/lib/axis2/services --prefix=$(EUCALYPTUS)
-DEB_DH_SHLIBDEPS_ARGS_ALL = -l/usr/lib/axis2/lib
+DEB_MAKE_CLEAN_TARGET := distclean
+DEB_CONFIGURE_EXTRA_FLAGS := --with-axis2c=/usr/lib/axis2 --with-axis2c-services=/usr/lib/axis2/services --prefix=$(EUCALYPTUS) --with-apache2-module-dir=/usr/lib/apache2/modules --with-vddk=/opt/packages/vddk --with-extra-version=$(EXTRA_VERSION_INFO) --with-db-home=/usr/lib/postgresql/9.1/
+DEB_DH_SHLIBDEPS_ARGS_ALL = -l/usr/lib/axis2/lib -Xeuca_imager
-makebuilddir/eucalyptus-common:: setup-lib
+makebuilddir/eucalyptus-common:: setup-cloud-lib
-setup-lib:
- @sed -i 's/EUCALYPTUS_HOME//g' tools/client-policy-template.xml
- @sed -i 's/AXIS2C_HOME\/lib/\/usr\/lib\/apache2\/modules/g' tools/httpd.conf
- @sed -i 's/rm -rf generated//g' cluster/Makefile node/Makefile gatherlog/Makefile
- @sed -i 's/patch -p1.*.patch; //g' cluster/Makefile node/Makefile gatherlog/Makefile
-# Makefile are not being patched to allow the build process to generate the stubs on built-time
-# @sed -i 's/.*WSDL2C.*//g' cluster/Makefile node/Makefile gatherlog/Makefile
+setup-cloud-lib: clc/ivy.xml
-# Build process doesn't use debian/build-jars to make symlinks, because it triggers a JarIndex error
-# mkdir -p clc/lib && for i in `cat debian/build-jars`; do if [ -e $$i ]; then ln -fsv $$i $(CURDIR)/clc/lib; fi; done
- touch setup-lib
+clc/ivy.xml:
+ mkdir -p clc/lib;
+ cp debian/ivy* clc;
+ cd clc && ant -lib /usr/share/java/ivy.jar resolve && cd -;
install/eucalyptus-java-common::
mkdir -p $(DEB_DESTDIR)/usr/share/eucalyptus
- cp -fvL /usr/share/java/antlr.jar $(DEB_DESTDIR)/usr/share/eucalyptus/antlr.jar
+binary-install/eucalyptus-java-common::
+ for FILE in `ls clc/lib`; do\
+ rm -f $(CURDIR)/debian/eucalyptus-java-common/usr/share/eucalyptus/$$FILE;\
+ done
+ dh_link
+
+binary-install/eucalyptus-cc::
+ find $(CURDIR)/debian/eucalyptus-cc -name *.xml |xargs chmod 644
+ find $(CURDIR)/debian/eucalyptus-cc -name *.wsdl |xargs chmod 644
+
+binary-install/eucalyptus-nc::
+ find $(CURDIR)/debian/eucalyptus-nc -name *.xml |xargs chmod 644
+
+binary-install/eucalyptus-gl::
+ find $(CURDIR)/debian/eucalyptus-gl -name *.xml |xargs chmod 644
+ find $(CURDIR)/debian/eucalyptus-gl -name *.wsdl |xargs chmod 644
+
+binary-install/eucalyptus-cloud::
+ find $(CURDIR)/debian/eucalyptus-cloud -name lic_* |xargs chmod 644
+
+binary-install/eucalyptus-common::
+ find $(CURDIR)/debian/eucalyptus-common -name *.xml |xargs chmod 644
+
+binary-install/eucalyptus-sc::
+ # TODO: install example somewhere sane
+ rm -rf $(CURDIR)/debian/eucalyptus-sc/tools
+
install/eucalyptus-common::
sed -i 's/^FILE=.*$$/FILE="\/etc\/eucalyptus\/eucalyptus.conf"/g' $(DEB_DESTDIR)/usr/sbin/euca_conf
rm -f $(DEB_DESTDIR)/etc/init.d/eucalyptus
+binary/eucalyptus-admin-tools::
+ dh_python2
+
+binary/python-eucadmin::
+ dh_python2
+
clean::
- rm -rf setup-lib clc/modules/msgs/resources/msgs-binding.xml clc/modules/storage-controller/lib/liblvm2control.so clc/modules/storage-manager/lib/libfsstorage.so clc/modules/www/webapps/root.war node/test_nc node/test config.status clc/modules/storage-controller/include/edu_ucsb_eucalyptus_storage_LVM2Manager.h clc/modules/storage-controller/include/edu_ucsb_eucalyptus_storage_AOEManager.h clc/modules/storage-manager/include/edu_ucsb_eucalyptus_storage_fs_FileSystemStorageManager.h cluster/cc-client-policy.xml node/nc-client-policy.xml util/config.h config.log Makedefs
+ find . -name "*.pyc" -exec $(RM) {} \;
+ rm -rf clc/eucadmin/eucadmin/__init__.py
+ rm -rf clc/modules/msgs/resources/msgs-binding.xml clc/modules/storage-controller/lib/liblvm2control.so clc/modules/storage-manager/lib/libfsstorage.so clc/modules/www/webapps/root.war node/test_nc node/test config.status clc/modules/storage-controller/include/edu_ucsb_eucalyptus_storage_LVM2Manager.h clc/modules/storage-controller/include/edu_ucsb_eucalyptus_storage_AOEManager.h clc/modules/storage-manager/include/edu_ucsb_eucalyptus_storage_fs_FileSystemStorageManager.h cluster/cc-client-policy.xml node/nc-client-policy.xml util/config.h util/eucalyptus-config.h config.log Makedefs
+ cd clc && ant clean || true && cd -
+ rm -f clc/ivy*
+ rm -rf clc/lib
+ rm -rf cluster/generated
+ rm -rf node/generated
+ rm -rf gatherlog/generated
+ rm -rf storage/euca-blobs
+ rm -rf clc/modules/www/gwt-unitCache
+ rm -rf tools/eucalyptus-cc
+ rm -rf tools/eucalyptus-nc
+ rm -rf node/test_hooks
Added: eucalyptus/trunk/debian/source/include-binaries
===================================================================
--- eucalyptus/trunk/debian/source/include-binaries (rev 0)
+++ eucalyptus/trunk/debian/source/include-binaries 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1,797 @@
+debian/generated/adb_AssignAddress.c
+debian/generated/adb_AssignAddress.h
+debian/generated/adb_AssignAddress.o
+debian/generated/adb_AssignAddressResponse.c
+debian/generated/adb_AssignAddressResponse.h
+debian/generated/adb_AssignAddressResponse.o
+debian/generated/adb_assignAddressResponseType.c
+debian/generated/adb_assignAddressResponseType.h
+debian/generated/adb_assignAddressResponseType.o
+debian/generated/adb_assignAddressType.c
+debian/generated/adb_assignAddressType.h
+debian/generated/adb_assignAddressType.o
+debian/generated/adb_AttachVolume.c
+debian/generated/adb_AttachVolume.h
+debian/generated/adb_AttachVolume.o
+debian/generated/adb_AttachVolumeResponse.c
+debian/generated/adb_AttachVolumeResponse.h
+debian/generated/adb_AttachVolumeResponse.o
+debian/generated/adb_attachVolumeResponseType.c
+debian/generated/adb_attachVolumeResponseType.h
+debian/generated/adb_attachVolumeResponseType.o
+debian/generated/adb_attachVolumeType.c
+debian/generated/adb_attachVolumeType.h
+debian/generated/adb_attachVolumeType.o
+debian/generated/adb_BundleInstance.c
+debian/generated/adb_BundleInstance.h
+debian/generated/adb_BundleInstance.o
+debian/generated/adb_BundleInstanceResponse.c
+debian/generated/adb_BundleInstanceResponse.h
+debian/generated/adb_BundleInstanceResponse.o
+debian/generated/adb_bundleInstanceResponseType.c
+debian/generated/adb_bundleInstanceResponseType.h
+debian/generated/adb_bundleInstanceResponseType.o
+debian/generated/adb_bundleInstanceType.c
+debian/generated/adb_bundleInstanceType.h
+debian/generated/adb_bundleInstanceType.o
+debian/generated/adb_bundleTaskType.c
+debian/generated/adb_bundleTaskType.h
+debian/generated/adb_bundleTaskType.o
+debian/generated/adb_CancelBundleTask.c
+debian/generated/adb_CancelBundleTask.h
+debian/generated/adb_CancelBundleTask.o
+debian/generated/adb_CancelBundleTaskResponse.c
+debian/generated/adb_CancelBundleTaskResponse.h
+debian/generated/adb_CancelBundleTaskResponse.o
+debian/generated/adb_cancelBundleTaskResponseType.c
+debian/generated/adb_cancelBundleTaskResponseType.h
+debian/generated/adb_cancelBundleTaskResponseType.o
+debian/generated/adb_cancelBundleTaskType.c
+debian/generated/adb_cancelBundleTaskType.h
+debian/generated/adb_cancelBundleTaskType.o
+debian/generated/adb_ccInstanceType.c
+debian/generated/adb_ccInstanceType.h
+debian/generated/adb_ccInstanceType.o
+debian/generated/adb_ccNodeType.c
+debian/generated/adb_ccNodeType.h
+debian/generated/adb_ccNodeType.o
+debian/generated/adb_ccResourceType.c
+debian/generated/adb_ccResourceType.h
+debian/generated/adb_ccResourceType.o
+debian/generated/adb_ccTerminatedInstanceType.c
+debian/generated/adb_ccTerminatedInstanceType.h
+debian/generated/adb_ccTerminatedInstanceType.o
+debian/generated/adb_ConfigureNetwork.c
+debian/generated/adb_ConfigureNetwork.h
+debian/generated/adb_ConfigureNetwork.o
+debian/generated/adb_ConfigureNetworkResponse.c
+debian/generated/adb_ConfigureNetworkResponse.h
+debian/generated/adb_ConfigureNetworkResponse.o
+debian/generated/adb_configureNetworkResponseType.c
+debian/generated/adb_configureNetworkResponseType.h
+debian/generated/adb_configureNetworkResponseType.o
+debian/generated/adb_configureNetworkType.c
+debian/generated/adb_configureNetworkType.h
+debian/generated/adb_configureNetworkType.o
+debian/generated/adb_CreateImage.c
+debian/generated/adb_CreateImage.h
+debian/generated/adb_CreateImage.o
+debian/generated/adb_CreateImageResponse.c
+debian/generated/adb_CreateImageResponse.h
+debian/generated/adb_CreateImageResponse.o
+debian/generated/adb_createImageResponseType.c
+debian/generated/adb_createImageResponseType.h
+debian/generated/adb_createImageResponseType.o
+debian/generated/adb_createImageType.c
+debian/generated/adb_createImageType.h
+debian/generated/adb_createImageType.o
+debian/generated/adb_DescribeInstances.c
+debian/generated/adb_DescribeInstances.h
+debian/generated/adb_DescribeInstances.o
+debian/generated/adb_DescribeInstancesResponse.c
+debian/generated/adb_DescribeInstancesResponse.h
+debian/generated/adb_DescribeInstancesResponse.o
+debian/generated/adb_describeInstancesResponseType.c
+debian/generated/adb_describeInstancesResponseType.h
+debian/generated/adb_describeInstancesResponseType.o
+debian/generated/adb_describeInstancesType.c
+debian/generated/adb_describeInstancesType.h
+debian/generated/adb_describeInstancesType.o
+debian/generated/adb_DescribeNetworks.c
+debian/generated/adb_DescribeNetworks.h
+debian/generated/adb_DescribeNetworks.o
+debian/generated/adb_DescribeNetworksResponse.c
+debian/generated/adb_DescribeNetworksResponse.h
+debian/generated/adb_DescribeNetworksResponse.o
+debian/generated/adb_describeNetworksResponseType.c
+debian/generated/adb_describeNetworksResponseType.h
+debian/generated/adb_describeNetworksResponseType.o
+debian/generated/adb_describeNetworksType.c
+debian/generated/adb_describeNetworksType.h
+debian/generated/adb_describeNetworksType.o
+debian/generated/adb_DescribePublicAddresses.c
+debian/generated/adb_DescribePublicAddresses.h
+debian/generated/adb_DescribePublicAddresses.o
+debian/generated/adb_DescribePublicAddressesResponse.c
+debian/generated/adb_DescribePublicAddressesResponse.h
+debian/generated/adb_DescribePublicAddressesResponse.o
+debian/generated/adb_describePublicAddressesResponseType.c
+debian/generated/adb_describePublicAddressesResponseType.h
+debian/generated/adb_describePublicAddressesResponseType.o
+debian/generated/adb_describePublicAddressesType.c
+debian/generated/adb_describePublicAddressesType.h
+debian/generated/adb_describePublicAddressesType.o
+debian/generated/adb_DescribeResources.c
+debian/generated/adb_DescribeResources.h
+debian/generated/adb_DescribeResources.o
+debian/generated/adb_DescribeResourcesResponse.c
+debian/generated/adb_DescribeResourcesResponse.h
+debian/generated/adb_DescribeResourcesResponse.o
+debian/generated/adb_describeResourcesResponseType.c
+debian/generated/adb_describeResourcesResponseType.h
+debian/generated/adb_describeResourcesResponseType.o
+debian/generated/adb_describeResourcesType.c
+debian/generated/adb_describeResourcesType.h
+debian/generated/adb_describeResourcesType.o
+debian/generated/adb_DescribeServices.c
+debian/generated/adb_DescribeServices.h
+debian/generated/adb_DescribeServices.o
+debian/generated/adb_DescribeServicesResponse.c
+debian/generated/adb_DescribeServicesResponse.h
+debian/generated/adb_DescribeServicesResponse.o
+debian/generated/adb_describeServicesResponseType.c
+debian/generated/adb_describeServicesResponseType.h
+debian/generated/adb_describeServicesResponseType.o
+debian/generated/adb_describeServicesType.c
+debian/generated/adb_describeServicesType.h
+debian/generated/adb_describeServicesType.o
+debian/generated/adb_DetachVolume.c
+debian/generated/adb_DetachVolume.h
+debian/generated/adb_DetachVolume.o
+debian/generated/adb_DetachVolumeResponse.c
+debian/generated/adb_DetachVolumeResponse.h
+debian/generated/adb_DetachVolumeResponse.o
+debian/generated/adb_detachVolumeResponseType.c
+debian/generated/adb_detachVolumeResponseType.h
+debian/generated/adb_detachVolumeResponseType.o
+debian/generated/adb_detachVolumeType.c
+debian/generated/adb_detachVolumeType.h
+debian/generated/adb_detachVolumeType.o
+debian/generated/adb_DisableService.c
+debian/generated/adb_DisableService.h
+debian/generated/adb_DisableService.o
+debian/generated/adb_DisableServiceResponse.c
+debian/generated/adb_DisableServiceResponse.h
+debian/generated/adb_DisableServiceResponse.o
+debian/generated/adb_disableServiceResponseType.c
+debian/generated/adb_disableServiceResponseType.h
+debian/generated/adb_disableServiceResponseType.o
+debian/generated/adb_disableServiceType.c
+debian/generated/adb_disableServiceType.h
+debian/generated/adb_disableServiceType.o
+debian/generated/adb_EnableService.c
+debian/generated/adb_EnableService.h
+debian/generated/adb_EnableService.o
+debian/generated/adb_EnableServiceResponse.c
+debian/generated/adb_EnableServiceResponse.h
+debian/generated/adb_EnableServiceResponse.o
+debian/generated/adb_enableServiceResponseType.c
+debian/generated/adb_enableServiceResponseType.h
+debian/generated/adb_enableServiceResponseType.o
+debian/generated/adb_enableServiceType.c
+debian/generated/adb_enableServiceType.h
+debian/generated/adb_enableServiceType.o
+debian/generated/adb_eucalyptusMessage.c
+debian/generated/adb_eucalyptusMessage.h
+debian/generated/adb_eucalyptusMessage.o
+debian/generated/adb_GetConsoleOutput.c
+debian/generated/adb_GetConsoleOutput.h
+debian/generated/adb_GetConsoleOutput.o
+debian/generated/adb_GetConsoleOutputResponse.c
+debian/generated/adb_GetConsoleOutputResponse.h
+debian/generated/adb_GetConsoleOutputResponse.o
+debian/generated/adb_getConsoleOutputResponseType.c
+debian/generated/adb_getConsoleOutputResponseType.h
+debian/generated/adb_getConsoleOutputResponseType.o
+debian/generated/adb_getConsoleOutputType.c
+debian/generated/adb_getConsoleOutputType.h
+debian/generated/adb_getConsoleOutputType.o
+debian/generated/adb_instanceType.c
+debian/generated/adb_instanceType.h
+debian/generated/adb_instanceType.o
+debian/generated/adb_ncAssignAddress.c
+debian/generated/adb_ncAssignAddress.h
+debian/generated/adb_ncAssignAddress.o
+debian/generated/adb_ncAssignAddressResponse.c
+debian/generated/adb_ncAssignAddressResponse.h
+debian/generated/adb_ncAssignAddressResponse.o
+debian/generated/adb_ncAssignAddressResponseType.c
+debian/generated/adb_ncAssignAddressResponseType.h
+debian/generated/adb_ncAssignAddressResponseType.o
+debian/generated/adb_ncAssignAddressType.c
+debian/generated/adb_ncAssignAddressType.h
+debian/generated/adb_ncAssignAddressType.o
+debian/generated/adb_ncAttachVolume.c
+debian/generated/adb_ncAttachVolume.h
+debian/generated/adb_ncAttachVolume.o
+debian/generated/adb_ncAttachVolumeResponse.c
+debian/generated/adb_ncAttachVolumeResponse.h
+debian/generated/adb_ncAttachVolumeResponse.o
+debian/generated/adb_ncAttachVolumeResponseType.c
+debian/generated/adb_ncAttachVolumeResponseType.h
+debian/generated/adb_ncAttachVolumeResponseType.o
+debian/generated/adb_ncAttachVolumeType.c
+debian/generated/adb_ncAttachVolumeType.h
+debian/generated/adb_ncAttachVolumeType.o
+debian/generated/adb_ncBundleInstance.c
+debian/generated/adb_ncBundleInstance.h
+debian/generated/adb_ncBundleInstance.o
+debian/generated/adb_ncBundleInstanceResponse.c
+debian/generated/adb_ncBundleInstanceResponse.h
+debian/generated/adb_ncBundleInstanceResponse.o
+debian/generated/adb_ncBundleInstanceResponseType.c
+debian/generated/adb_ncBundleInstanceResponseType.h
+debian/generated/adb_ncBundleInstanceResponseType.o
+debian/generated/adb_ncBundleInstanceType.c
+debian/generated/adb_ncBundleInstanceType.h
+debian/generated/adb_ncBundleInstanceType.o
+debian/generated/adb_ncCancelBundleTask.c
+debian/generated/adb_ncCancelBundleTask.h
+debian/generated/adb_ncCancelBundleTask.o
+debian/generated/adb_ncCancelBundleTaskResponse.c
+debian/generated/adb_ncCancelBundleTaskResponse.h
+debian/generated/adb_ncCancelBundleTaskResponse.o
+debian/generated/adb_ncCancelBundleTaskResponseType.c
+debian/generated/adb_ncCancelBundleTaskResponseType.h
+debian/generated/adb_ncCancelBundleTaskResponseType.o
+debian/generated/adb_ncCancelBundleTaskType.c
+debian/generated/adb_ncCancelBundleTaskType.h
+debian/generated/adb_ncCancelBundleTaskType.o
+debian/generated/adb_ncCreateImage.c
+debian/generated/adb_ncCreateImage.h
+debian/generated/adb_ncCreateImage.o
+debian/generated/adb_ncCreateImageResponse.c
+debian/generated/adb_ncCreateImageResponse.h
+debian/generated/adb_ncCreateImageResponse.o
+debian/generated/adb_ncCreateImageResponseType.c
+debian/generated/adb_ncCreateImageResponseType.h
+debian/generated/adb_ncCreateImageResponseType.o
+debian/generated/adb_ncCreateImageType.c
+debian/generated/adb_ncCreateImageType.h
+debian/generated/adb_ncCreateImageType.o
+debian/generated/adb_ncDescribeBundleTasks.c
+debian/generated/adb_ncDescribeBundleTasks.h
+debian/generated/adb_ncDescribeBundleTasks.o
+debian/generated/adb_ncDescribeBundleTasksResponse.c
+debian/generated/adb_ncDescribeBundleTasksResponse.h
+debian/generated/adb_ncDescribeBundleTasksResponse.o
+debian/generated/adb_ncDescribeBundleTasksResponseType.c
+debian/generated/adb_ncDescribeBundleTasksResponseType.h
+debian/generated/adb_ncDescribeBundleTasksResponseType.o
+debian/generated/adb_ncDescribeBundleTasksType.c
+debian/generated/adb_ncDescribeBundleTasksType.h
+debian/generated/adb_ncDescribeBundleTasksType.o
+debian/generated/adb_ncDescribeInstances.c
+debian/generated/adb_ncDescribeInstances.h
+debian/generated/adb_ncDescribeInstances.o
+debian/generated/adb_ncDescribeInstancesResponse.c
+debian/generated/adb_ncDescribeInstancesResponse.h
+debian/generated/adb_ncDescribeInstancesResponse.o
+debian/generated/adb_ncDescribeInstancesResponseType.c
+debian/generated/adb_ncDescribeInstancesResponseType.h
+debian/generated/adb_ncDescribeInstancesResponseType.o
+debian/generated/adb_ncDescribeInstancesType.c
+debian/generated/adb_ncDescribeInstancesType.h
+debian/generated/adb_ncDescribeInstancesType.o
+debian/generated/adb_ncDescribeResource.c
+debian/generated/adb_ncDescribeResource.h
+debian/generated/adb_ncDescribeResource.o
+debian/generated/adb_ncDescribeResourceResponse.c
+debian/generated/adb_ncDescribeResourceResponse.h
+debian/generated/adb_ncDescribeResourceResponse.o
+debian/generated/adb_ncDescribeResourceResponseType.c
+debian/generated/adb_ncDescribeResourceResponseType.h
+debian/generated/adb_ncDescribeResourceResponseType.o
+debian/generated/adb_ncDescribeResourceType.c
+debian/generated/adb_ncDescribeResourceType.h
+debian/generated/adb_ncDescribeResourceType.o
+debian/generated/adb_ncDetachVolume.c
+debian/generated/adb_ncDetachVolume.h
+debian/generated/adb_ncDetachVolume.o
+debian/generated/adb_ncDetachVolumeResponse.c
+debian/generated/adb_ncDetachVolumeResponse.h
+debian/generated/adb_ncDetachVolumeResponse.o
+debian/generated/adb_ncDetachVolumeResponseType.c
+debian/generated/adb_ncDetachVolumeResponseType.h
+debian/generated/adb_ncDetachVolumeResponseType.o
+debian/generated/adb_ncDetachVolumeType.c
+debian/generated/adb_ncDetachVolumeType.h
+debian/generated/adb_ncDetachVolumeType.o
+debian/generated/adb_ncGetConsoleOutput.c
+debian/generated/adb_ncGetConsoleOutput.h
+debian/generated/adb_ncGetConsoleOutput.o
+debian/generated/adb_ncGetConsoleOutputResponse.c
+debian/generated/adb_ncGetConsoleOutputResponse.h
+debian/generated/adb_ncGetConsoleOutputResponse.o
+debian/generated/adb_ncGetConsoleOutputResponseType.c
+debian/generated/adb_ncGetConsoleOutputResponseType.h
+debian/generated/adb_ncGetConsoleOutputResponseType.o
+debian/generated/adb_ncGetConsoleOutputType.c
+debian/generated/adb_ncGetConsoleOutputType.h
+debian/generated/adb_ncGetConsoleOutputType.o
+debian/generated/adb_ncPowerDown.c
+debian/generated/adb_ncPowerDown.h
+debian/generated/adb_ncPowerDown.o
+debian/generated/adb_ncPowerDownResponse.c
+debian/generated/adb_ncPowerDownResponse.h
+debian/generated/adb_ncPowerDownResponse.o
+debian/generated/adb_ncPowerDownResponseType.c
+debian/generated/adb_ncPowerDownResponseType.h
+debian/generated/adb_ncPowerDownResponseType.o
+debian/generated/adb_ncPowerDownType.c
+debian/generated/adb_ncPowerDownType.h
+debian/generated/adb_ncPowerDownType.o
+debian/generated/adb_ncRebootInstance.c
+debian/generated/adb_ncRebootInstance.h
+debian/generated/adb_ncRebootInstance.o
+debian/generated/adb_ncRebootInstanceResponse.c
+debian/generated/adb_ncRebootInstanceResponse.h
+debian/generated/adb_ncRebootInstanceResponse.o
+debian/generated/adb_ncRebootInstanceResponseType.c
+debian/generated/adb_ncRebootInstanceResponseType.h
+debian/generated/adb_ncRebootInstanceResponseType.o
+debian/generated/adb_ncRebootInstanceType.c
+debian/generated/adb_ncRebootInstanceType.h
+debian/generated/adb_ncRebootInstanceType.o
+debian/generated/adb_ncRunInstance.c
+debian/generated/adb_ncRunInstance.h
+debian/generated/adb_ncRunInstance.o
+debian/generated/adb_ncRunInstanceResponse.c
+debian/generated/adb_ncRunInstanceResponse.h
+debian/generated/adb_ncRunInstanceResponse.o
+debian/generated/adb_ncRunInstanceResponseType.c
+debian/generated/adb_ncRunInstanceResponseType.h
+debian/generated/adb_ncRunInstanceResponseType.o
+debian/generated/adb_ncRunInstanceType.c
+debian/generated/adb_ncRunInstanceType.h
+debian/generated/adb_ncRunInstanceType.o
+debian/generated/adb_ncStartNetwork.c
+debian/generated/adb_ncStartNetwork.h
+debian/generated/adb_ncStartNetwork.o
+debian/generated/adb_ncStartNetworkResponse.c
+debian/generated/adb_ncStartNetworkResponse.h
+debian/generated/adb_ncStartNetworkResponse.o
+debian/generated/adb_ncStartNetworkResponseType.c
+debian/generated/adb_ncStartNetworkResponseType.h
+debian/generated/adb_ncStartNetworkResponseType.o
+debian/generated/adb_ncStartNetworkType.c
+debian/generated/adb_ncStartNetworkType.h
+debian/generated/adb_ncStartNetworkType.o
+debian/generated/adb_ncTerminateInstance.c
+debian/generated/adb_ncTerminateInstance.h
+debian/generated/adb_ncTerminateInstance.o
+debian/generated/adb_ncTerminateInstanceResponse.c
+debian/generated/adb_ncTerminateInstanceResponse.h
+debian/generated/adb_ncTerminateInstanceResponse.o
+debian/generated/adb_ncTerminateInstanceResponseType.c
+debian/generated/adb_ncTerminateInstanceResponseType.h
+debian/generated/adb_ncTerminateInstanceResponseType.o
+debian/generated/adb_ncTerminateInstanceType.c
+debian/generated/adb_ncTerminateInstanceType.h
+debian/generated/adb_ncTerminateInstanceType.o
+debian/generated/adb_netConfigType.c
+debian/generated/adb_netConfigType.h
+debian/generated/adb_netConfigType.o
+debian/generated/adb_networkRule.c
+debian/generated/adb_networkRule.h
+debian/generated/adb_networkRule.o
+debian/generated/adb_networkType.c
+debian/generated/adb_networkType.h
+debian/generated/adb_networkType.o
+debian/generated/adb_publicAddressType.c
+debian/generated/adb_publicAddressType.h
+debian/generated/adb_publicAddressType.o
+debian/generated/adb_RebootInstances.c
+debian/generated/adb_RebootInstances.h
+debian/generated/adb_RebootInstances.o
+debian/generated/adb_RebootInstancesResponse.c
+debian/generated/adb_RebootInstancesResponse.h
+debian/generated/adb_RebootInstancesResponse.o
+debian/generated/adb_rebootInstancesResponseType.c
+debian/generated/adb_rebootInstancesResponseType.h
+debian/generated/adb_rebootInstancesResponseType.o
+debian/generated/adb_rebootInstancesType.c
+debian/generated/adb_rebootInstancesType.h
+debian/generated/adb_rebootInstancesType.o
+debian/generated/adb_RunInstances.c
+debian/generated/adb_RunInstances.h
+debian/generated/adb_RunInstances.o
+debian/generated/adb_RunInstancesResponse.c
+debian/generated/adb_RunInstancesResponse.h
+debian/generated/adb_RunInstancesResponse.o
+debian/generated/adb_runInstancesResponseType.c
+debian/generated/adb_runInstancesResponseType.h
+debian/generated/adb_runInstancesResponseType.o
+debian/generated/adb_runInstancesType.c
+debian/generated/adb_runInstancesType.h
+debian/generated/adb_runInstancesType.o
+debian/generated/adb_serviceInfoType.c
+debian/generated/adb_serviceInfoType.h
+debian/generated/adb_serviceInfoType.o
+debian/generated/adb_serviceStatusType.c
+debian/generated/adb_serviceStatusType.h
+debian/generated/adb_serviceStatusType.o
+debian/generated/adb_serviceTransitionType.c
+debian/generated/adb_serviceTransitionType.h
+debian/generated/adb_serviceTransitionType.o
+debian/generated/adb_ShutdownService.c
+debian/generated/adb_ShutdownService.h
+debian/generated/adb_ShutdownService.o
+debian/generated/adb_ShutdownServiceResponse.c
+debian/generated/adb_ShutdownServiceResponse.h
+debian/generated/adb_ShutdownServiceResponse.o
+debian/generated/adb_shutdownServiceResponseType.c
+debian/generated/adb_shutdownServiceResponseType.h
+debian/generated/adb_shutdownServiceResponseType.o
+debian/generated/adb_shutdownServiceType.c
+debian/generated/adb_shutdownServiceType.h
+debian/generated/adb_shutdownServiceType.o
+debian/generated/adb_StartNetwork.c
+debian/generated/adb_StartNetwork.h
+debian/generated/adb_StartNetwork.o
+debian/generated/adb_StartNetworkResponse.c
+debian/generated/adb_StartNetworkResponse.h
+debian/generated/adb_StartNetworkResponse.o
+debian/generated/adb_startNetworkResponseType.c
+debian/generated/adb_startNetworkResponseType.h
+debian/generated/adb_startNetworkResponseType.o
+debian/generated/adb_startNetworkType.c
+debian/generated/adb_startNetworkType.h
+debian/generated/adb_startNetworkType.o
+debian/generated/adb_StartService.c
+debian/generated/adb_StartService.h
+debian/generated/adb_StartService.o
+debian/generated/adb_StartServiceResponse.c
+debian/generated/adb_StartServiceResponse.h
+debian/generated/adb_StartServiceResponse.o
+debian/generated/adb_startServiceResponseType.c
+debian/generated/adb_startServiceResponseType.h
+debian/generated/adb_startServiceResponseType.o
+debian/generated/adb_startServiceType.c
+debian/generated/adb_startServiceType.h
+debian/generated/adb_startServiceType.o
+debian/generated/adb_StopNetwork.c
+debian/generated/adb_StopNetwork.h
+debian/generated/adb_StopNetwork.o
+debian/generated/adb_StopNetworkResponse.c
+debian/generated/adb_StopNetworkResponse.h
+debian/generated/adb_StopNetworkResponse.o
+debian/generated/adb_stopNetworkResponseType.c
+debian/generated/adb_stopNetworkResponseType.h
+debian/generated/adb_stopNetworkResponseType.o
+debian/generated/adb_stopNetworkType.c
+debian/generated/adb_stopNetworkType.h
+debian/generated/adb_stopNetworkType.o
+debian/generated/adb_StopService.c
+debian/generated/adb_StopService.h
+debian/generated/adb_StopService.o
+debian/generated/adb_StopServiceResponse.c
+debian/generated/adb_StopServiceResponse.h
+debian/generated/adb_StopServiceResponse.o
+debian/generated/adb_stopServiceResponseType.c
+debian/generated/adb_stopServiceResponseType.h
+debian/generated/adb_stopServiceResponseType.o
+debian/generated/adb_stopServiceType.c
+debian/generated/adb_stopServiceType.h
+debian/generated/adb_stopServiceType.o
+debian/generated/adb_TerminateInstances.c
+debian/generated/adb_TerminateInstances.h
+debian/generated/adb_TerminateInstances.o
+debian/generated/adb_TerminateInstancesResponse.c
+debian/generated/adb_TerminateInstancesResponse.h
+debian/generated/adb_TerminateInstancesResponse.o
+debian/generated/adb_terminateInstancesResponseType.c
+debian/generated/adb_terminateInstancesResponseType.h
+debian/generated/adb_terminateInstancesResponseType.o
+debian/generated/adb_terminateInstancesType.c
+debian/generated/adb_terminateInstancesType.h
+debian/generated/adb_terminateInstancesType.o
+debian/generated/adb_UnassignAddress.c
+debian/generated/adb_UnassignAddress.h
+debian/generated/adb_UnassignAddress.o
+debian/generated/adb_UnassignAddressResponse.c
+debian/generated/adb_UnassignAddressResponse.h
+debian/generated/adb_UnassignAddressResponse.o
+debian/generated/adb_unassignAddressResponseType.c
+debian/generated/adb_unassignAddressResponseType.h
+debian/generated/adb_unassignAddressResponseType.o
+debian/generated/adb_unassignAddressType.c
+debian/generated/adb_unassignAddressType.h
+debian/generated/adb_unassignAddressType.o
+debian/generated/adb_virtualBootRecordType.c
+debian/generated/adb_virtualBootRecordType.h
+debian/generated/adb_virtualBootRecordType.o
+debian/generated/adb_virtualMachineType.c
+debian/generated/adb_virtualMachineType.h
+debian/generated/adb_virtualMachineType.o
+debian/generated/adb_volumeType.c
+debian/generated/adb_volumeType.h
+debian/generated/adb_volumeType.o
+debian/generated/axis2_skel_EucalyptusCC.c
+debian/generated/axis2_skel_EucalyptusCC.h
+debian/generated/axis2_skel_EucalyptusCC.o
+debian/generated/axis2_stub_EucalyptusCC.c
+debian/generated/axis2_stub_EucalyptusCC.h
+debian/generated/axis2_stub_EucalyptusCC.o
+debian/generated/axis2_stub_EucalyptusNC.c
+debian/generated/axis2_stub_EucalyptusNC.h
+debian/generated/axis2_stub_EucalyptusNC.o
+debian/generated/axis2_svc_skel_EucalyptusCC.c
+debian/generated/axis2_svc_skel_EucalyptusCC.o
+debian/generated/build.sh
+debian/generated/Makefile
+debian/generated/services.xml
+debian/generated/stubs
+node-generated/
+node-generated/adb_ncPowerDownType.o
+node-generated/axis2_stub_EucalyptusNC.c
+node-generated/adb_virtualBootRecordType.c
+node-generated/adb_ncTerminateInstanceResponse.c
+node-generated/adb_ncDescribeResourceType.o
+node-generated/adb_ncBundleInstanceType.h
+node-generated/adb_ncAssignAddressResponse.c
+node-generated/adb_ncTerminateInstance.h
+node-generated/adb_bundleTaskType.o
+node-generated/adb_ncCreateImage.o
+node-generated/adb_ncPowerDownResponse.h
+node-generated/adb_ncTerminateInstanceResponse.o
+node-generated/adb_ncAttachVolume.c
+node-generated/adb_ncRebootInstanceType.h
+node-generated/adb_ncDescribeResource.h
+node-generated/adb_ncDescribeInstances.o
+node-generated/adb_eucalyptusMessage.h
+node-generated/adb_ncGetConsoleOutputType.h
+node-generated/adb_ncAssignAddressResponse.h
+node-generated/adb_ncRebootInstanceResponseType.o
+node-generated/adb_ncDescribeBundleTasksType.h
+node-generated/adb_ncCreateImageResponseType.o
+node-generated/adb_ncBundleInstance.o
+node-generated/adb_ncStartNetworkType.c
+node-generated/adb_ncBundleInstanceType.o
+node-generated/adb_ncDescribeBundleTasks.h
+node-generated/adb_virtualMachineType.h
+node-generated/adb_ncRunInstanceResponseType.o
+node-generated/adb_ncPowerDownResponseType.h
+node-generated/adb_instanceType.h
+node-generated/adb_ncGetConsoleOutputResponse.c
+node-generated/adb_ncDetachVolumeType.o
+node-generated/adb_ncBundleInstanceResponse.h
+node-generated/adb_ncRebootInstanceType.c
+node-generated/adb_ncAttachVolumeResponse.o
+node-generated/adb_ncDescribeResourceResponse.h
+node-generated/adb_virtualBootRecordType.h
+node-generated/adb_ncStartNetworkResponse.c
+node-generated/adb_ncPowerDown.o
+node-generated/adb_ncRunInstanceType.h
+node-generated/adb_serviceInfoType.c
+node-generated/adb_ncRunInstanceType.c
+node-generated/axis2_skel_EucalyptusNC.o
+node-generated/adb_ncRebootInstanceType.o
+node-generated/adb_ncAttachVolumeResponseType.c
+node-generated/services.xml
+node-generated/adb_ncCancelBundleTask.c
+node-generated/adb_ncTerminateInstanceResponseType.c
+node-generated/adb_ncStartNetworkResponseType.o
+node-generated/adb_virtualBootRecordType.o
+node-generated/adb_ncStartNetworkResponse.o
+node-generated/adb_netConfigType.h
+node-generated/adb_ncRunInstanceResponseType.h
+node-generated/adb_serviceStatusType.h
+node-generated/adb_ncDescribeInstancesType.c
+node-generated/adb_ncDetachVolumeResponseType.c
+node-generated/adb_ncCancelBundleTaskResponse.h
+node-generated/adb_ncTerminateInstanceType.c
+node-generated/adb_ncCancelBundleTaskResponse.o
+node-generated/adb_ncDescribeBundleTasksResponseType.c
+node-generated/adb_ncCreateImageResponseType.c
+node-generated/adb_ncCreateImage.h
+node-generated/adb_ncBundleInstanceResponseType.h
+node-generated/adb_ncAttachVolumeResponse.c
+node-generated/adb_ncDescribeResourceResponseType.h
+node-generated/adb_ncGetConsoleOutput.h
+node-generated/adb_ncPowerDownResponse.c
+node-generated/adb_virtualMachineType.o
+node-generated/adb_volumeType.o
+node-generated/adb_ncCancelBundleTask.o
+node-generated/adb_ncPowerDown.c
+node-generated/adb_instanceType.o
+node-generated/adb_ncCreateImageType.o
+node-generated/adb_ncDescribeBundleTasksResponse.o
+node-generated/adb_ncCreateImageType.h
+node-generated/adb_ncPowerDownResponseType.c
+node-generated/adb_ncDescribeBundleTasksType.o
+node-generated/adb_ncAttachVolume.o
+node-generated/adb_ncDescribeResourceResponseType.c
+node-generated/adb_ncAssignAddressType.c
+node-generated/adb_ncDescribeInstances.c
+node-generated/adb_ncCancelBundleTaskResponseType.o
+node-generated/adb_ncDescribeBundleTasks.c
+node-generated/adb_ncAssignAddressResponseType.h
+node-generated/adb_ncAssignAddressResponseType.c
+node-generated/adb_ncRebootInstance.h
+node-generated/adb_ncDetachVolume.o
+node-generated/adb_ncAttachVolumeType.c
+node-generated/adb_ncDescribeInstancesType.o
+node-generated/adb_ncStartNetwork.o
+node-generated/adb_ncGetConsoleOutput.o
+node-generated/adb_ncCancelBundleTaskType.o
+node-generated/adb_volumeType.h
+node-generated/adb_ncGetConsoleOutput.c
+node-generated/adb_ncCreateImageResponse.c
+node-generated/adb_ncBundleInstance.h
+node-generated/adb_ncDescribeResourceResponseType.o
+node-generated/adb_ncPowerDownResponseType.o
+node-generated/adb_ncRunInstance.o
+node-generated/adb_ncDescribeInstancesResponseType.h
+node-generated/adb_ncPowerDown.h
+node-generated/adb_ncAttachVolumeType.o
+node-generated/adb_virtualMachineType.c
+node-generated/adb_ncDescribeInstancesResponse.o
+node-generated/adb_ncRebootInstance.c
+node-generated/adb_ncGetConsoleOutputResponseType.o
+node-generated/adb_ncRebootInstanceResponse.c
+node-generated/adb_ncRunInstanceResponseType.c
+node-generated/axis2_stub_EucalyptusNC.o
+node-generated/adb_ncCancelBundleTaskType.h
+node-generated/adb_ncRunInstanceType.o
+node-generated/adb_ncDescribeBundleTasksResponseType.h
+node-generated/adb_ncStartNetwork.c
+node-generated/adb_ncDescribeResourceType.c
+node-generated/adb_ncTerminateInstanceType.h
+node-generated/adb_instanceType.c
+node-generated/adb_ncPowerDownType.h
+node-generated/adb_ncRunInstanceResponse.c
+node-generated/adb_ncAssignAddressResponse.o
+node-generated/stubs
+node-generated/adb_ncDescribeBundleTasksResponse.c
+node-generated/adb_ncStartNetworkType.o
+node-generated/adb_ncTerminateInstanceResponseType.o
+node-generated/adb_bundleTaskType.c
+node-generated/adb_ncAssignAddress.o
+node-generated/axis2_skel_EucalyptusNC.h
+node-generated/adb_bundleTaskType.h
+node-generated/adb_ncCreateImage.c
+node-generated/adb_ncAssignAddressType.o
+node-generated/adb_ncBundleInstanceType.c
+node-generated/adb_ncRebootInstanceResponseType.h
+node-generated/adb_serviceStatusType.o
+node-generated/adb_ncCancelBundleTaskType.c
+node-generated/adb_ncDetachVolumeResponse.c
+node-generated/adb_ncCreateImageResponseType.h
+node-generated/adb_ncStartNetwork.h
+node-generated/adb_ncDescribeInstancesResponseType.c
+node-generated/adb_ncBundleInstanceResponse.o
+node-generated/axis2_stub_EucalyptusNC.h
+node-generated/adb_ncRebootInstanceResponse.h
+node-generated/adb_ncCancelBundleTaskResponse.c
+node-generated/adb_ncTerminateInstance.o
+node-generated/axis2_svc_skel_EucalyptusNC.c
+node-generated/adb_ncGetConsoleOutputType.o
+node-generated/Makefile
+node-generated/adb_ncDescribeInstancesResponse.h
+node-generated/adb_ncDescribeBundleTasks.o
+node-generated/adb_ncDescribeResource.c
+node-generated/adb_ncCancelBundleTask.h
+node-generated/adb_ncBundleInstanceResponseType.c
+node-generated/adb_ncRebootInstanceResponse.o
+node-generated/adb_ncGetConsoleOutputType.c
+node-generated/adb_ncPowerDownType.c
+node-generated/adb_netConfigType.o
+node-generated/adb_ncRunInstance.h
+node-generated/axis2_svc_skel_EucalyptusNC.o
+node-generated/adb_ncDetachVolumeType.h
+node-generated/adb_ncDetachVolume.c
+node-generated/adb_ncAttachVolumeResponseType.h
+node-generated/axis2_skel_EucalyptusNC.c
+node-generated/adb_ncBundleInstanceResponseType.o
+node-generated/adb_ncDescribeResourceResponse.c
+node-generated/adb_ncAttachVolumeType.h
+node-generated/adb_ncStartNetworkResponse.h
+node-generated/adb_ncDetachVolume.h
+node-generated/adb_netConfigType.c
+node-generated/adb_ncDescribeInstancesType.h
+node-generated/adb_ncAssignAddress.c
+node-generated/adb_ncGetConsoleOutputResponse.h
+node-generated/adb_ncDescribeInstancesResponseType.o
+node-generated/adb_ncDetachVolumeResponse.h
+node-generated/adb_ncDescribeResourceResponse.o
+node-generated/adb_ncAssignAddressType.h
+node-generated/adb_ncCreateImageType.c
+node-generated/adb_ncRunInstanceResponse.h
+node-generated/adb_ncAssignAddressResponseType.o
+node-generated/adb_ncDetachVolumeResponseType.o
+node-generated/adb_ncRebootInstance.o
+node-generated/adb_ncBundleInstanceResponse.c
+node-generated/adb_ncDescribeBundleTasksResponse.h
+node-generated/adb_ncAttachVolumeResponseType.o
+node-generated/build.sh
+node-generated/adb_ncDescribeBundleTasksResponseType.o
+node-generated/adb_ncBundleInstance.c
+node-generated/adb_ncRunInstanceResponse.o
+node-generated/adb_ncDetachVolumeType.c
+node-generated/adb_ncCancelBundleTaskResponseType.h
+node-generated/adb_ncTerminateInstance.c
+node-generated/adb_ncGetConsoleOutputResponseType.c
+node-generated/adb_ncGetConsoleOutputResponseType.h
+node-generated/adb_eucalyptusMessage.o
+node-generated/adb_ncStartNetworkType.h
+node-generated/adb_ncPowerDownResponse.o
+node-generated/adb_ncTerminateInstanceResponseType.h
+node-generated/adb_serviceInfoType.o
+node-generated/adb_serviceStatusType.c
+node-generated/adb_ncDetachVolumeResponseType.h
+node-generated/adb_ncRunInstance.c
+node-generated/adb_ncCreateImageResponse.o
+node-generated/adb_ncTerminateInstanceResponse.h
+node-generated/adb_ncRebootInstanceResponseType.c
+node-generated/adb_ncAssignAddress.h
+node-generated/adb_ncAttachVolumeResponse.h
+node-generated/adb_ncCreateImageResponse.h
+node-generated/adb_ncDescribeInstances.h
+node-generated/adb_eucalyptusMessage.c
+node-generated/adb_volumeType.c
+node-generated/adb_ncDescribeResourceType.h
+node-generated/adb_ncDescribeBundleTasksType.c
+node-generated/adb_ncDescribeResource.o
+node-generated/adb_ncDetachVolumeResponse.o
+node-generated/adb_ncStartNetworkResponseType.c
+node-generated/adb_ncGetConsoleOutputResponse.o
+node-generated/adb_ncCancelBundleTaskResponseType.c
+node-generated/adb_ncStartNetworkResponseType.h
+node-generated/adb_ncDescribeInstancesResponse.c
+node-generated/adb_ncTerminateInstanceType.o
+node-generated/adb_ncAttachVolume.h
+node-generated/adb_serviceInfoType.h
+gatherlog-generated/
+gatherlog-generated/adb_GetKeysResponse.c
+gatherlog-generated/adb_getLogsResponseType.o
+gatherlog-generated/axis2_stub_EucalyptusGL.h
+gatherlog-generated/adb_getLogsType.h
+gatherlog-generated/adb_eucalyptusMessage.h
+gatherlog-generated/adb_GetKeys.c
+gatherlog-generated/axis2_stub_EucalyptusGL.c
+gatherlog-generated/adb_serviceInfoType.c
+gatherlog-generated/adb_GetLogsResponse.h
+gatherlog-generated/adb_GetLogsResponse.o
+gatherlog-generated/adb_GetLogsResponse.c
+gatherlog-generated/services.xml
+gatherlog-generated/axis2_skel_EucalyptusGL.c
+gatherlog-generated/axis2_stub_EucalyptusGL.o
+gatherlog-generated/adb_GetKeys.h
+gatherlog-generated/axis2_skel_EucalyptusGL.h
+gatherlog-generated/adb_GetLogs.o
+gatherlog-generated/adb_getLogsType.o
+gatherlog-generated/adb_getKeysType.o
+gatherlog-generated/adb_getKeysResponseType.h
+gatherlog-generated/adb_GetLogs.c
+gatherlog-generated/axis2_skel_EucalyptusGL.o
+gatherlog-generated/adb_GetKeys.o
+gatherlog-generated/axis2_svc_skel_EucalyptusGL.o
+gatherlog-generated/adb_getLogsType.c
+gatherlog-generated/adb_GetLogs.h
+gatherlog-generated/stubs
+gatherlog-generated/adb_GetKeysResponse.o
+gatherlog-generated/adb_getKeysType.h
+gatherlog-generated/Makefile
+gatherlog-generated/adb_getKeysResponseType.o
+gatherlog-generated/axis2_svc_skel_EucalyptusGL.c
+gatherlog-generated/adb_getKeysType.c
+gatherlog-generated/build.sh
+gatherlog-generated/adb_eucalyptusMessage.o
+gatherlog-generated/adb_serviceInfoType.o
+gatherlog-generated/adb_getLogsResponseType.h
+gatherlog-generated/adb_getKeysResponseType.c
+gatherlog-generated/adb_GetKeysResponse.h
+gatherlog-generated/adb_eucalyptusMessage.c
+gatherlog-generated/adb_getLogsResponseType.c
+gatherlog-generated/adb_serviceInfoType.h
Added: eucalyptus/trunk/debian/source/local-options
===================================================================
--- eucalyptus/trunk/debian/source/local-options (rev 0)
+++ eucalyptus/trunk/debian/source/local-options 2012-07-07 01:27:05 UTC (rev 244)
@@ -0,0 +1 @@
+extend-diff-ignore="(^|/)(clc\/modules\/bootstrap\/src\/main\/native\/arguments.ggo|clc\/modules\/bootstrap\/src\/main\/resources\/version.properties|clc\/modules\/postgresql\/src\/main\/resources\/postgresql-binaries.properties|clc\/modules\/www\/conf\/eucalyptus-web.properties)$"
More information about the pkg-eucalyptus-commits
mailing list