Merge lp:~syuu1228/eucalyptus/rados4eucalyptus-devel into lp:eucalyptus

[Takuya ASADA]

Hi,

I'm trying to integrate a distributed storage system named "RADOS" for both S3 service and EBS service on Eucalyptus, to make it scalable.

RADOS is a part of Ceph filesystem, which provides distributed object store.
It provides API for C/C++ and S3 compatible server, EBS compatible block device for qemu/kvm.
Details are described on this page:
http://ceph.newdream.net/2009/05/the-rados-distributed-object-store/

This patch is minimum implement of the work, it's implements SystemStorageManager, FileIO, ChunkedDataFile for RADOS.
This provides RADOS based Walrus backend, when it's enabled Walrus stores objects to RADOS cluster instead of local file system.

Existing local file system module is moved from storage-common to storage-fs, and new rados module added as storage-rados.
It can switch via configure option --with-rados=[rados home], if it specified storage-rados will install. Otherwise storage-fs will install.

And this patch doesn't include following features, it going to be another patches:
- Zerocopy on JNI
  Currently the implementation copy buffer between librados and Java code, we need to prevent it to get better performance.
  To make it zerocopy, we need to modify Ceph implementation, not only my code.
  I'm discussing it on Ceph ML now, but it takes few more time.
- Multiple Walrus support for CLC
  We need to support multiple Walrus to make it scalable.
  I just implemented "quick hack" support Multiple Walrus, but I need to make it better before posting the patch.
- RADOS based EBS(rbd) support
  I only worked on Walrus now, but I also would like to work on rbd support for Storage Controller.

*Performance test1: chunk size
On storage-rados, default chunk size(8KB) in StorageManager.sendObject() is too small.
Here's throughput on default chunk size:
- storage-fs: 33.34MB/s
- storage-rados: 4.81MB/s

And here's read throughput when extending chunk size from 8KB to 80MB on storage-rados:
8K 4.81MB/s
80K 13.37MB/s
800K 29.52MB/s
1M 31.58MB/s
2M 33.54MB/s
3M 35.19MB/s
4M 35.67MB/s
5M 37.49MB/s
6M 35MB/s
8M 33.65MB/s
80M 23.85MB/s

So we need to change the default chunk size to 5MB on storage-rados.
I also measured 5MB on rados-fs for comparison, it's 65.60MB/s.
That means changing the default chunk size also makes rados-fs faster anyway.

Testing environment as follows:
Throughput are measured by s3cmd from Gigabit ethernet, same segment with Walrus.
RADOS cluster constructed with 9 nodes, 1 node for monitor, the others are storage(OSD).
Test file size is 1GB, single file.

[node assignment]
node0: CC/CLC, s3cmd
node1: Walrus, RADOS Monitor
node2: RADOS Storage
node3: RADOS Storage
node4: RADOS Storage
node5: RADOS Storage
node6: RADOS Storage
node7: RADOS Storage
node8: RADOS Storage
node9: RADOS Storage

[node spec]
CPU: Athlon II X4 605e
Memory: 16GB
HDD: SATA 250GB via Areca SATA Host Adapter RAID Controller
OS: Ubuntu Server 10.04

*Performance test2: scalability
I also measured the throughput when requesting multiple read request concurrently.
(This actually requires multiple Walrus implementation which doesn't include the patch, as I described earlier)

Test condition as follows:
Compared the performance when number of Walrus node is 1, 2, 4, 8 using storage-rados, and also storage-fs.
Storage node for RADOS is always 8 node, sharing Walrus node.
Read requests are sending from 2 nodes, each node sends 1, 2, 4, 8, 16, 32, 64 requests concurrently.
So overall requests are 2, 4, 8, 16, 32, 64, 128.

The graph is on following URL:
http://cid-35288454e2692e6b.photos.live.com/self.aspx/public/graph.png
Y-axis is average throughput(per request), unit is MB/s.
X-axis is number of request.

From the graph we can see the system scaling when adding Walrus nodes.
Even on 1 Walrus node, it's faster than storage-fs. This probably means 8 nodes of storage cluster is faster than local filesystem when multiple requests occurred.

Testing environment as follows:
Throughput are measured by modified s3cmd from Gigabit ethernet, same segment with Walrus, 2 nodes.
RADOS cluster constructed 1 node for monitor, 8 nodes for storage(OSD).
Test file size is 10MB, 64 files.

[node assignment]
node0: CC/CLC, s3cmd
node1: Walrus, RADOS Monitor, RADOS Storage
node2: Walrus, RADOS Storage
node3: Walrus, RADOS Storage
node4: Walrus, RADOS Storage
node5: Walrus, RADOS Storage
node6: Walrus, RADOS Storage
node7: Walrus, RADOS Storage
node8: Walrus, RADOS Storage
node9: s3cmd

[node spec]
same as test1

*Documents
Here's a document for install procedure:
http://r4eucalyptus.wikia.com/wiki/Installing_RADOS4Eucalyptus_2.0

Unmerged revisions

1239. By tasada <tasada@7ae02a3f> on 2010-11-11

storage-rados module implemented. local filesystem classes moved to storage-rados module.

=== modified file 'Makedefs.in'
--- Makedefs.in	2010-10-22 17:50:41 +0000
+++ Makedefs.in	2010-11-15 08:38:14 +0000
@@ -11,6 +11,8 @@
 export AXIS2C_SERVICES	= @AXIS2C_SERVICES@
 export AXIS2_HOME	= @AXIS2_HOME@
 export LIBVIRT_HOME	= @LIBVIRT_HOME@
+export RADOS_HOME	= @RADOS_HOME@
+export STORAGE_MODULE	= @STORAGE_MODULE@
 
 # where eucalyptus will install and other standard stuff: eventually we'll
 # comply to the GNU standard

=== modified file 'clc/Makefile'
--- clc/Makefile	2010-06-02 20:29:20 +0000
+++ clc/Makefile	2010-11-15 08:38:14 +0000
@@ -50,27 +50,42 @@
 #		echo "Cannot find java deps, please run 'make deps' in the 'clc/' subdirectory."; exit 1; fi
 	@ANT_OPTS="-Xmx512m" $(ANT) build
 	@make -C modules/storage-controller/native
+	@if test "${STORAGE_MODULE}" = "storage-rados"; then \
+		make -C modules/storage-rados/native RADOS_HOME="${RADOS_HOME}"; \
+	fi
 	@make -C modules/bootstrap
 
 clean:
 	$(ANT) clean
 	make -C modules/bootstrap clean
+	@if test "${STORAGE_MODULE}" = "storage-rados"; then \
+		make -C modules/storage-rados/native clean; \
+	fi
 	make -C modules/storage-controller/native clean
 
 distclean: clean
 	$(ANT) distclean
 	make -C modules/bootstrap distclean
+	@if test "${STORAGE_MODULE}" = "storage-rados"; then \
+		make -C modules/storage-rados/native distclean; \
+	fi
 	make -C modules/storage-controller/native distclean
 
 install: build
 	@$(ANT) install
 	@make -C modules/storage-controller/native install
+	@if test "${STORAGE_MODULE}" = "storage-rados"; then \
+		make -C modules/storage-rados/native install; \
+	fi
 	@make -C modules/bootstrap install
 
 deploy: install
 
 uninstall:
 	make -C modules/storage-controller/native uninstall
+	@if test "${STORAGE_MODULE}" = "storage-rados"; then \
+		make -C modules/storage-rados/native uninstall; \
+	fi
 	make -C modules/bootstrap uninstall
 	$(RM) -rf $(DESTDIR)$(etcdir)/eucalyptus/cloud.d
 	$(RM) -rf $(DESTDIR)$(datarootdir)/eucalyptus/*jar

=== modified file 'clc/build.xml'
--- clc/build.xml	2010-11-09 19:31:25 +0000
+++ clc/build.xml	2010-11-15 08:38:14 +0000
@@ -98,6 +98,7 @@
 		<ant dir="modules/cloud" inheritall="false" target="builder" />
 		<ant dir="modules/cluster-manager" inheritall="false" target="builder" />
 		<ant dir="modules/storage-common" inheritall="false" target="builder" />
+		<ant dir="modules/storage-rados" inheritall="false" target="builder" />
 		<ant dir="modules/walrus" inheritall="false" target="builder" />
 		<ant dir="modules/storage-controller" inheritall="false" target="builder" />
 		<ant dir="modules/dns" inheritall="false" target="builder" />
@@ -122,6 +123,7 @@
 		<ant dir="modules/wsstack" inheritall="false" target="jar" />
 		<ant dir="modules/cluster-manager" inheritall="false" target="jar" />
 		<ant dir="modules/storage-common" inheritall="false" target="jar" />
+		<ant dir="modules/storage-rados" inheritall="false" target="jar" />
 		<ant dir="modules/walrus" inheritall="false" target="jar" />
 		<ant dir="modules/storage-controller" inheritall="false" target="jar" />
 		<ant dir="modules/dns" inheritall="false" target="jar" />
@@ -177,6 +179,7 @@
 		<ant dir="modules/wsstack" inheritall="false" target="clean" />
 		<ant dir="modules/cluster-manager" inheritall="false" target="clean" />
 		<ant dir="modules/storage-common" inheritall="false" target="clean" />
+		<ant dir="modules/storage-rados" inheritall="false" target="clean" />
 		<ant dir="modules/walrus" inheritall="false" target="clean" />
 		<ant dir="modules/storage-controller" inheritall="false" target="clean" />
 		<ant dir="modules/dns" inheritall="false" target="clean" />
@@ -244,6 +247,11 @@
 		<ant dir="modules/core" inheritall="false" target="install" />
 		<ant dir="modules/wsstack" inheritall="false" target="install" />
 		<ant dir="modules/storage-common" inheritall="false" target="install" />
+<<<<<<< TREE
+=======
+		<ant dir="modules/storage-rados" inheritall="false" target="install" />
+		<ant dir="modules/interface" inheritall="false" target="install" />
+>>>>>>> MERGE-SOURCE
 		<ant dir="modules/cluster-manager" inheritall="false" target="install" />
 		<ant dir="modules/walrus" inheritall="false" target="install" />
 		<ant dir="modules/storage-controller" inheritall="false" target="install" />

=== added file 'clc/build.xml.in'
--- clc/build.xml.in	1970-01-01 00:00:00 +0000
+++ clc/build.xml.in	2010-11-15 08:38:14 +0000
@@ -0,0 +1,292 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright (c) 2009  Eucalyptus Systems, Inc.
+  ~
+  ~ 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, only version 3 of the License.
+  ~
+  ~
+  ~ This file 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/.
+  ~
+  ~ Please contact Eucalyptus Systems, Inc., 130 Castilian
+  ~ Dr., Goleta, CA 93101 USA or visit http://www.eucalyptus.com/licenses/
+  ~ if you need additional information or have any questions.
+  ~
+  ~ This file may incorporate work covered under the following copyright and
+  ~ permission notice:
+  ~
+  ~   Software License Agreement (BSD License)
+  ~
+  ~   Copyright (c) 2008, Regents of the University of California
+  ~   All rights reserved.
+  ~
+  ~   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 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. USERS OF
+  ~   THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
+  ~   LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
+  ~   SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
+  ~   IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
+  ~   BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
+  ~   THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+  ~   OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
+  ~   WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
+  ~   ANY SUCH LICENSES OR RIGHTS.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Author: chris grzegorczyk [e-mail]
+  -->
+
+<project name="eucalyptus" basedir=".">
+	<property environment="localenv" />
+	<property name="euca.home.0" value="${localenv.EUCALYPTUS}" />
+	<condition property="euca.home" value="/opt/eucalyptus" else="${localenv.EUCALYPTUS}">
+		<contains string="${euca.home.0}" substring="localenv" />
+	</condition>
+	<property name="DESTDIR.0" value="${localenv.DESTDIR}" />
+	<condition property="DESTDIR" value="/" else="${localenv.DESTDIR}">
+		<contains string="${DESTDIR.0}" substring="localenv" />
+	</condition>
+	<property name="project.basedir" value="${user.dir}" />
+	<loadfile srcfile="${project.basedir}/../VERSION" property="euca.version">
+		<filterchain>
+			<filterreader classname="org.apache.tools.ant.filters.StripLineBreaks" />
+		</filterchain>
+	</loadfile>
+	<!--================================== other vars ==================================-->
+	<property name="jvm.heap" value="256m" />
+	<property name="deps.url" value="http://eucalyptussoftware.com/downloads/dependencies/${euca.version}" />
+	<property name="deps.dir" value="deps" />
+	<property name="deps.lib.dir" value="lib" />
+	<property name="tools.dir" value="tools/src" />
+	<property name="deps.lib" value="cloud-lib" />
+	<property name="bind.timestamp" value="target/.bind-timestamp" />
+	<!--================================== build targets ==================================-->
+	<target name="build">
+		<ant dir="modules/msgs" inheritall="false" target="builder" />
+		<ant dir="modules/database" inheritall="false" target="builder" />
+		<ant dir="modules/hsqldb" inheritall="false" target="builder" />
+		<ant dir="modules/authentication" inheritall="false" target="builder" />
+		<ant dir="modules/cloud" inheritall="false" target="builder" />
+		<ant dir="modules/configuration" inheritall="false" target="builder" />
+		<ant dir="modules/core" inheritall="false" target="builder" />
+		<ant dir="modules/wsstack" inheritall="false" target="builder" />
+		<ant dir="modules/component" inheritall="false" target="builder" />
+		<ant dir="modules/interface" inheritall="false" target="builder" />
+		<ant dir="modules/group-manager" inheritall="false" target="builder" />
+		<ant dir="modules/cluster-manager" inheritall="false" target="builder" />
+		<ant dir="modules/image-manager" inheritall="false" target="builder" />
+		<ant dir="modules/key-manager" inheritall="false" target="builder" />
+		<ant dir="modules/storage-common" inheritall="false" target="builder" />
+		<ant dir="modules/@STORAGE_MODULE@" inheritall="false" target="builder" />
+		<ant dir="modules/walrus" inheritall="false" target="builder" />
+		<ant dir="modules/storage-controller" inheritall="false" target="builder" />
+		<ant dir="modules/dns" inheritall="false" target="builder" />
+		<ant dir="modules/www" inheritall="false" target="builder" />
+		<ant dir="." inheritall="false" target="jar" />
+	</target>
+	<target name="jar" depends="bind">
+		<ant dir="modules/msgs" inheritall="false" target="jar" />
+		<ant dir="modules/database" inheritall="false" target="jar" />
+		<ant dir="modules/hsqldb" inheritall="false" target="jar" />
+		<ant dir="modules/authentication" inheritall="false" target="jar" />
+		<ant dir="modules/cloud" inheritall="false" target="jar" />
+		<ant dir="modules/configuration" inheritall="false" target="jar" />
+		<ant dir="modules/component" inheritall="false" target="jar" />
+		<ant dir="modules/core" inheritall="false" target="jar" />
+		<ant dir="modules/wsstack" inheritall="false" target="jar" />
+		<ant dir="modules/interface" inheritall="false" target="jar" />
+		<ant dir="modules/group-manager" inheritall="false" target="jar" />
+		<ant dir="modules/cluster-manager" inheritall="false" target="jar" />
+		<ant dir="modules/image-manager" inheritall="false" target="jar" />
+		<ant dir="modules/key-manager" inheritall="false" target="jar" />
+		<ant dir="modules/storage-common" inheritall="false" target="jar" />
+		<ant dir="modules/@STORAGE_MODULE@" inheritall="false" target="jar" />
+		<ant dir="modules/walrus" inheritall="false" target="jar" />
+		<ant dir="modules/storage-controller" inheritall="false" target="jar" />
+		<ant dir="modules/dns" inheritall="false" target="jar" />
+		<ant dir="modules/www" inheritall="false" target="jar" />
+	</target>
+	<target name="shouldBind">
+		<uptodate property="bind.notRequired" targetfile="${bind.timestamp}">
+			<srcfiles dir="modules">
+				<include name="**/*.java"/>
+			</srcfiles>
+		</uptodate>
+		<echo message="[BINDING] Up-to-date check shows bind.notRequred=${bind.notRequired}." />
+	</target>
+	<target name="bind" depends="shouldBind" unless="bind.notRequired">
+		<echo message="[BINDING] Running binding compiler." />
+		<path id="bindingclasspath">
+			<dirset dir="modules">
+				<include name="**/build" />
+			</dirset>
+			<fileset dir="lib">
+				<include name="**/*.jar" />
+			</fileset>
+		</path>
+		<delete>
+			<fileset dir="modules" includes="**/*JiBX*" />
+		</delete>
+		<delete file="modules/msgs/src/main/resources/msgs-binding.xml" />
+		<taskdef name="bindings" classname="com.eucalyptus.binding.BuildBindings" classpathref="bindingclasspath" />
+		<bindings>
+			<classfileset dir="${project.basedir}/modules" includes="*/build/**" />
+			<bindingfileset dir="${project.basedir}/modules" includes="**/*-binding.xml" />
+		</bindings>
+		<touch file="${bind.timestamp}"/>
+	</target>
+
+	<!--================================== clean targets ==================================-->
+	<target name="clean">
+		<delete file="${bind.timestamp}"/>
+		<ant dir="modules/msgs" inheritall="false" target="clean" />
+		<ant dir="modules/database" inheritall="false" target="clean" />
+		<ant dir="modules/hsqldb" inheritall="false" target="clean" />
+		<ant dir="modules/cloud" inheritall="false" target="clean" />
+		<ant dir="modules/authentication" inheritall="false" target="clean" />
+		<ant dir="modules/configuration" inheritall="false" target="clean" />
+		<ant dir="modules/component" inheritall="false" target="clean" />
+		<ant dir="modules/core" inheritall="false" target="clean" />
+		<ant dir="modules/wsstack" inheritall="false" target="clean" />
+		<ant dir="modules/interface" inheritall="false" target="clean" />
+		<ant dir="modules/cluster-manager" inheritall="false" target="clean" />
+		<ant dir="modules/image-manager" inheritall="false" target="clean" />
+		<ant dir="modules/group-manager" inheritall="false" target="clean" />
+		<ant dir="modules/key-manager" inheritall="false" target="clean" />
+		<ant dir="modules/storage-common" inheritall="false" target="clean" />
+		<ant dir="modules/@STORAGE_MODULE@" inheritall="false" target="clean" />
+		<ant dir="modules/walrus" inheritall="false" target="clean" />
+		<ant dir="modules/storage-controller" inheritall="false" target="clean" />
+		<ant dir="modules/dns" inheritall="false" target="clean" />
+		<ant dir="modules/www" inheritall="false" target="clean" />
+		<delete dir="${target.dir}" />
+	</target>
+	<target name="distclean" depends="clean">
+		<delete dir="${deps.dir}" />
+		<delete dir="${deps.lib.dir}" />
+		<delete dir="target" />
+	</target>
+	<!--================================== install target ==================================-->
+	<property name="euca.conf.dir" value="${euca.home}/etc/eucalyptus/cloud.d" />
+	<property name="euca.lib.dir" value="${euca.home}/usr/share/eucalyptus" />
+	<property name="euca.var.dir" value="${euca.home}/var/lib/eucalyptus" />
+	<property name="euca.run.dir" value="${euca.home}/var/run/eucalyptus" />
+	<property name="euca.log.dir" value="${euca.home}/var/log/eucalyptus" />
+	<property name="euca.bin.dir" value="${euca.home}/usr/sbin" />
+	<target name="install">
+		<!-- copy libraries over -->
+		<mkdir dir="${DESTDIR}${euca.lib.dir}" />
+		<copy todir="${DESTDIR}${euca.lib.dir}" overwrite="true">
+			<fileset dir="${deps.lib.dir}">
+				<include name="**/*" />
+				<exclude name="**/gwt-api-checker-*.jar" />
+				<exclude name="**/gwt-dev-*.jar" />
+				<exclude name="**/gwt-soyc-vis-*.jar" />
+				<exclude name="**/gwt-user-*.jar" />
+			</fileset>
+		</copy>
+		<!--copy admin tools -->
+		<mkdir dir="${DESTDIR}${euca.bin.dir}" />
+		<copy todir="${DESTDIR}${euca.bin.dir}" overwrite="true">
+			<fileset dir="${tools.dir}">
+				<include name="**/*" />
+			</fileset>
+		</copy>
+		<chmod dir="${DESTDIR}${euca.bin.dir}" perm="0755">
+			<include name="**/euca-*" />
+		</chmod>
+		<mkdir dir="${DESTDIR}${euca.conf.dir}" />
+		<chmod dir="${DESTDIR}${euca.conf.dir}" perm="0755" />
+		<mkdir dir="${DESTDIR}${euca.var.dir}/" />
+		<mkdir dir="${DESTDIR}${euca.var.dir}/db" />
+		<mkdir dir="${DESTDIR}${euca.var.dir}/keys" />
+		<mkdir dir="${DESTDIR}${euca.log.dir}" />
+		<mkdir dir="${DESTDIR}${euca.var.dir}/webapps" />
+		<mkdir dir="${DESTDIR}${euca.var.dir}/modules" />
+		<mkdir dir="${DESTDIR}${euca.run.dir}" />
+		<ant dir="modules/msgs" inheritall="false" target="install" />
+		<ant dir="modules/database" inheritall="false" target="install" />
+		<ant dir="modules/hsqldb" inheritall="false" target="install" />
+		<ant dir="modules/cloud" inheritall="false" target="install" />
+		<ant dir="modules/authentication" inheritall="false" target="install" />
+		<ant dir="modules/configuration" inheritall="false" target="install" />
+		<ant dir="modules/component" inheritall="false" target="install" />
+		<ant dir="modules/core" inheritall="false" target="install" />
+		<ant dir="modules/wsstack" inheritall="false" target="install" />
+		<ant dir="modules/storage-common" inheritall="false" target="install" />
+		<ant dir="modules/@STORAGE_MODULE@" inheritall="false" target="install" />
+		<ant dir="modules/interface" inheritall="false" target="install" />
+		<ant dir="modules/cluster-manager" inheritall="false" target="install" />
+		<ant dir="modules/image-manager" inheritall="false" target="install" />
+		<ant dir="modules/group-manager" inheritall="false" target="install" />
+		<ant dir="modules/key-manager" inheritall="false" target="install" />
+		<ant dir="modules/walrus" inheritall="false" target="install" />
+		<ant dir="modules/storage-controller" inheritall="false" target="install" />
+		<ant dir="modules/dns" inheritall="false" target="install" />
+		<ant dir="modules/www" inheritall="false" target="install" />
+	</target>
+	<!--================================== unzipping target ==================================-->
+	<target name="deps">
+		<condition property="needDownload">
+			<and>
+				<not>
+					<available file="${deps.lib.dir}/bcprov.jar" />
+				</not>
+				<and>
+					<not>
+						<available file="${deps.dir}/${deps.lib}.tar.gz" />
+					</not>
+				</and>
+			</and>
+		</condition>
+		<ant target="download-deps" />
+		<condition property="needUnzipping">
+			<and>
+				<not>
+					<available file="${deps.lib.dir}/bcprov.jar" />
+				</not>
+				<and>
+					<available file="${deps.dir}/${deps.lib}.tar.gz" />
+				</and>
+			</and>
+		</condition>
+		<ant target="untar" />
+	</target>
+	<target name="dist-deps" depends="deps">
+		<delete dir="${deps.dir}" />
+	</target>
+	<target name="untar" if="needUnzipping">
+		<untar compression="gzip" src="${deps.dir}/${deps.lib}.tar.gz" dest="${deps.lib.dir}" />
+	</target>
+	<target name="download-deps" if="needDownload">
+		<mkdir dir="${deps.dir}" />
+		<mkdir dir="${deps.lib.dir}" />
+		<!--===========  download the dependency libraries  ===========-->
+		<get src="${deps.url}/${deps.lib}.tar.gz" dest="${deps.dir}/${deps.lib}.tar.gz" />
+	</target>
+</project>

=== added file 'clc/modules/database/conf/scripts/caches.groovy.OTHER'
--- clc/modules/database/conf/scripts/caches.groovy.OTHER	1970-01-01 00:00:00 +0000
+++ clc/modules/database/conf/scripts/caches.groovy.OTHER	2010-11-15 08:38:14 +0000
@@ -0,0 +1,7 @@
+cacheProps = [
+    'hibernate.cache.provider_class': 'net.sf.ehcache.hibernate.SingletonEhCacheProvider',
+    'hibernate.cache.region_prefix': "eucalyptus_${context_name}_cache",
+    'hibernate.cache.use_second_level_cache': 'false',
+    'hibernate.cache.use_query_cache': 'false',
+    'hibernate.cache.use_structured_entries': 'false',
+]

=== removed directory 'clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/cloud'
=== removed directory 'clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/cloud/ws'
=== removed file 'clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/cloud/ws/ChunkedDataFile.java'
--- clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/cloud/ws/ChunkedDataFile.java	2009-08-27 18:38:18 +0000
+++ clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/cloud/ws/ChunkedDataFile.java	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-/*******************************************************************************
-*Copyright (c) 2009  Eucalyptus Systems, Inc.
-* 
-*  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, only version 3 of the License.
-* 
-* 
-*  This file 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/>.
-* 
-*  Please contact Eucalyptus Systems, Inc., 130 Castilian
-*  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
-*  if you need additional information or have any questions.
-* 
-*  This file may incorporate work covered under the following copyright and
-*  permission notice:
-* 
-*    Software License Agreement (BSD License)
-* 
-*    Copyright (c) 2008, Regents of the University of California
-*    All rights reserved.
-* 
-*    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 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. USERS OF
-*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
-*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
-*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
-*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
-*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
-*    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
-*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
-*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
-*    ANY SUCH LICENSES OR RIGHTS.
-*******************************************************************************/
-package edu.ucsb.eucalyptus.cloud.ws;
-
-import java.io.IOException;
-import java.io.RandomAccessFile;
-
-import org.jboss.netty.handler.stream.ChunkedFile;
-
-import edu.ucsb.eucalyptus.constants.IsData;
-
-public class ChunkedDataFile extends ChunkedFile implements IsData {
-
-	public ChunkedDataFile(RandomAccessFile file, long offset, long length,
-			int chunkSize) throws IOException {
-		super(file, offset, length, chunkSize);
-	}		
-}
-

=== removed file 'clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/cloud/ws/CompressedChunkedFile.java'
--- clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/cloud/ws/CompressedChunkedFile.java	2009-08-27 18:38:18 +0000
+++ clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/cloud/ws/CompressedChunkedFile.java	1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-/*******************************************************************************
-*Copyright (c) 2009  Eucalyptus Systems, Inc.
-* 
-*  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, only version 3 of the License.
-* 
-* 
-*  This file 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/>.
-* 
-*  Please contact Eucalyptus Systems, Inc., 130 Castilian
-*  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
-*  if you need additional information or have any questions.
-* 
-*  This file may incorporate work covered under the following copyright and
-*  permission notice:
-* 
-*    Software License Agreement (BSD License)
-* 
-*    Copyright (c) 2008, Regents of the University of California
-*    All rights reserved.
-* 
-*    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 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. USERS OF
-*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
-*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
-*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
-*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
-*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
-*    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
-*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
-*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
-*    ANY SUCH LICENSES OR RIGHTS.
-*******************************************************************************/
-package edu.ucsb.eucalyptus.cloud.ws;
-
-import java.io.ByteArrayOutputStream;
-import java.io.RandomAccessFile;
-import java.util.zip.GZIPOutputStream;
-
-import org.apache.log4j.Logger;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.handler.stream.ChunkedInput;
-
-import edu.ucsb.eucalyptus.constants.IsData;
-
-public class CompressedChunkedFile implements ChunkedInput, IsData {
-	private Logger LOG = Logger.getLogger( CompressedChunkedFile.class );
-	private RandomAccessFile file;
-	private long offset;
-	private int CHUNK_SIZE = 8192;
-	private long fileLength;
-
-	public CompressedChunkedFile(RandomAccessFile file, long fileLength) {
-		this.file = file;
-		this.offset = 0;
-		this.fileLength = fileLength;
-	}
-
-	public CompressedChunkedFile(RandomAccessFile file, long start, long end, int chunkSize) {
-		this.file = file;
-		this.offset = start;
-		this.fileLength = end;
-		CHUNK_SIZE = chunkSize;
-	}
-	
-	@Override
-	public void close() throws Exception {
-		file.close();
-	}
-
-	@Override
-	public boolean hasNextChunk() throws Exception {
-		return offset < fileLength && file.getChannel().isOpen();
-	}
-
-	@Override
-	public Object nextChunk() throws Exception {
-		long offset = this.offset;
-		if (offset >= fileLength) {
-			return null;
-		}
-		int chunkSize = (int) Math.min(CHUNK_SIZE, fileLength - offset);
-		byte[] chunk = new byte[chunkSize];
-		file.readFully(chunk);
-		this.offset = offset + chunkSize;
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		GZIPOutputStream zip = new GZIPOutputStream(out);
-		zip.write(chunk);
-		zip.close();
-		return ChannelBuffers.wrappedBuffer(out.toByteArray());
-	}	
-}
-

=== added file 'clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/StorageIO.java'
--- clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/StorageIO.java	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/StorageIO.java	2010-11-15 08:38:14 +0000
@@ -0,0 +1,80 @@
+/*******************************************************************************
+*Copyright (c) 2009  Eucalyptus Systems, Inc.
+* 
+*  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, only version 3 of the License.
+* 
+* 
+*  This file 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/>.
+* 
+*  Please contact Eucalyptus Systems, Inc., 130 Castilian
+*  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
+*  if you need additional information or have any questions.
+* 
+*  This file may incorporate work covered under the following copyright and
+*  permission notice:
+* 
+*    Software License Agreement (BSD License)
+* 
+*    Copyright (c) 2008, Regents of the University of California
+*    All rights reserved.
+* 
+*    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 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. USERS OF
+*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
+*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
+*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
+*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
+*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
+*    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
+*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
+*    ANY SUCH LICENSES OR RIGHTS.
+*******************************************************************************/
+/*
+ *
+ * Author: Sunil Soman [e-mail]
+ */
+
+package edu.ucsb.eucalyptus.storage;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+public abstract class StorageIO {
+
+    public abstract int read(long offset) throws IOException;
+
+    public abstract void write(byte[] bytes) throws IOException;
+
+    public abstract ByteBuffer getBuffer();
+
+    public abstract void finish();
+}

=== modified file 'clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/StorageManager.java'
--- clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/StorageManager.java	2010-04-26 20:50:11 +0000
+++ clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/StorageManager.java	2010-11-15 08:38:14 +0000
@@ -75,7 +75,6 @@
 
 import edu.ucsb.eucalyptus.cloud.BucketLogData;
 import edu.ucsb.eucalyptus.msgs.WalrusDataGetRequestType;
-import edu.ucsb.eucalyptus.storage.fs.FileIO;
 
 public interface StorageManager {
 
@@ -95,9 +94,9 @@
 
     public void putObject(String bucket, String object, byte[] base64Data, boolean append) throws IOException;
 
-    public FileIO prepareForRead(String bucket, String object) throws Exception;
+    public StorageIO prepareForRead(String bucket, String object) throws Exception;
 
-    public FileIO prepareForWrite(String bucket, String object) throws Exception;
+    public StorageIO prepareForWrite(String bucket, String object) throws Exception;
 
     public int readObject(String bucket, String object, byte[] bytes, long offset) throws IOException;
 

=== removed directory 'clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs'
=== removed file 'clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileIO.java'
--- clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileIO.java	2009-08-27 18:38:18 +0000
+++ clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileIO.java	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-/*******************************************************************************
-*Copyright (c) 2009  Eucalyptus Systems, Inc.
-* 
-*  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, only version 3 of the License.
-* 
-* 
-*  This file 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/>.
-* 
-*  Please contact Eucalyptus Systems, Inc., 130 Castilian
-*  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
-*  if you need additional information or have any questions.
-* 
-*  This file may incorporate work covered under the following copyright and
-*  permission notice:
-* 
-*    Software License Agreement (BSD License)
-* 
-*    Copyright (c) 2008, Regents of the University of California
-*    All rights reserved.
-* 
-*    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 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. USERS OF
-*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
-*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
-*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
-*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
-*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
-*    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
-*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
-*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
-*    ANY SUCH LICENSES OR RIGHTS.
-*******************************************************************************/
-/*
- *
- * Author: Sunil Soman [e-mail]
- */
-
-package edu.ucsb.eucalyptus.storage.fs;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
-
-public abstract class FileIO {
-
-    protected FileChannel channel;
-
-    public abstract int read(long offset) throws IOException;
-
-    public abstract void write(byte[] bytes) throws IOException;
-
-    public abstract ByteBuffer getBuffer();
-
-    public abstract void finish();
-}

=== removed file 'clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileReader.java'
--- clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileReader.java	2009-10-02 17:47:47 +0000
+++ clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileReader.java	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-/*******************************************************************************
-*Copyright (c) 2009  Eucalyptus Systems, Inc.
-* 
-*  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, only version 3 of the License.
-* 
-* 
-*  This file 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/>.
-* 
-*  Please contact Eucalyptus Systems, Inc., 130 Castilian
-*  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
-*  if you need additional information or have any questions.
-* 
-*  This file may incorporate work covered under the following copyright and
-*  permission notice:
-* 
-*    Software License Agreement (BSD License)
-* 
-*    Copyright (c) 2008, Regents of the University of California
-*    All rights reserved.
-* 
-*    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 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. USERS OF
-*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
-*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
-*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
-*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
-*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
-*    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
-*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
-*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
-*    ANY SUCH LICENSES OR RIGHTS.
-*******************************************************************************/
-/*
- *
- * Author: Sunil Soman [e-mail]
- */
-
-package edu.ucsb.eucalyptus.storage.fs;
-
-import org.apache.log4j.Logger;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-public  class FileReader extends FileIO {
-
-    private static Logger LOG = Logger.getLogger(FileReader.class);
-    private ByteBuffer buffer;
-
-    public FileReader(String filename) throws Exception {
-        try {
-            channel = new FileInputStream(filename).getChannel();
-            buffer = ByteBuffer.allocate(102400/*TODO: NEIL WalrusQueryDispatcher.DATA_MESSAGE_SIZE */);
-        } catch( FileNotFoundException ex) {
-            LOG.error(ex);
-            throw ex;
-        }
-    }
-
-    public  int read(long offset) throws IOException {
-        buffer.clear();
-        int bytesRead = channel.read(buffer, offset);
-        buffer.flip();
-        return bytesRead;
-    }
-
-    public  void write(byte[] bytes) throws IOException {}
-
-    public ByteBuffer getBuffer() {
-        return buffer;
-    }
-
-    public void finish() {
-        try {
-            channel.close();
-        } catch(IOException ex) {
-            LOG.error(ex);
-        }
-    }
-}

=== removed file 'clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileSystemStorageManager.java'
--- clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileSystemStorageManager.java	2010-11-03 19:16:45 +0000
+++ clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileSystemStorageManager.java	1970-01-01 00:00:00 +0000
@@ -1,465 +0,0 @@
-/*******************************************************************************
- *Copyright (c) 2009  Eucalyptus Systems, Inc.
- * 
- *  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, only version 3 of the License.
- * 
- * 
- *  This file 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/>.
- * 
- *  Please contact Eucalyptus Systems, Inc., 130 Castilian
- *  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
- *  if you need additional information or have any questions.
- * 
- *  This file may incorporate work covered under the following copyright and
- *  permission notice:
- * 
- *    Software License Agreement (BSD License)
- * 
- *    Copyright (c) 2008, Regents of the University of California
- *    All rights reserved.
- * 
- *    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 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. USERS OF
- *    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
- *    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
- *    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
- *    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
- *    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
- *    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
- *    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
- *    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
- *    ANY SUCH LICENSES OR RIGHTS.
- *******************************************************************************/
-/*
- *
- * Author: Sunil Soman [e-mail]
- */
-
-package edu.ucsb.eucalyptus.storage.fs;
-
-import com.eucalyptus.auth.util.Hashes;
-import com.eucalyptus.context.Contexts;
-import com.eucalyptus.http.MappingHttpResponse;
-import com.eucalyptus.util.EucalyptusCloudException;
-import com.eucalyptus.util.ExecutionException;
-import com.eucalyptus.util.WalrusProperties;
-import com.eucalyptus.ws.util.ChannelUtil;
-import com.eucalyptus.ws.util.WalrusBucketLogger;
-
-import edu.ucsb.eucalyptus.cloud.BucketLogData;
-import edu.ucsb.eucalyptus.cloud.ws.CompressedChunkedFile;
-import edu.ucsb.eucalyptus.cloud.ws.ChunkedDataFile;
-import edu.ucsb.eucalyptus.msgs.WalrusDataGetRequestType;
-import edu.ucsb.eucalyptus.storage.StorageManager;
-import edu.ucsb.eucalyptus.util.StreamConsumer;
-import edu.ucsb.eucalyptus.util.SystemUtil;
-
-import org.apache.log4j.Logger;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
-import org.jboss.netty.handler.codec.http.HttpHeaders;
-import org.jboss.netty.handler.stream.ChunkedInput;
-
-import java.io.*;
-import java.nio.channels.FileChannel;
-import java.util.ArrayList;
-import java.util.List;
-
-public class FileSystemStorageManager implements StorageManager {
-
-	public static final String FILE_SEPARATOR = "/";
-	public static final String lvmRootDirectory = "/dev";
-	private static boolean initialized = false;
-	private static String eucaHome = "/opt/eucalyptus";
-	public static final String EUCA_ROOT_WRAPPER = "/usr/lib/eucalyptus/euca_rootwrap";
-	public static final int MAX_LOOP_DEVICES = 256;
-	private static Logger LOG = Logger.getLogger(FileSystemStorageManager.class);
-
-	private String rootDirectory;
-	public FileSystemStorageManager(String rootDirectory) {
-		this.rootDirectory = rootDirectory;
-	}
-
-	public void checkPreconditions() throws EucalyptusCloudException {
-		try {
-			String eucaHomeDir = System.getProperty("euca.home");
-			if(eucaHomeDir == null) {
-				throw new EucalyptusCloudException("euca.home not set");
-			}
-			eucaHome = eucaHomeDir;
-			if(!new File(eucaHome + EUCA_ROOT_WRAPPER).exists()) {
-				throw new EucalyptusCloudException("root wrapper (euca_rootwrap) does not exist");
-			}
-			String returnValue = getLvmVersion();
-			if(returnValue.length() == 0) {
-				throw new EucalyptusCloudException("Is lvm installed?");
-			} else {
-				LOG.info(returnValue);
-			}
-		} catch(ExecutionException ex) {
-			String error = "Unable to run command: " + ex.getMessage();
-			LOG.error(error);
-			throw new EucalyptusCloudException(error);
-		}
-	}
-
-	public void setRootDirectory(String rootDirectory) {
-		this.rootDirectory = rootDirectory;
-	}
-
-	public boolean bucketExists(String bucket) {
-		return new File (rootDirectory + FILE_SEPARATOR + bucket).exists();        
-	}
-
-	public boolean objectExists(String bucket, String object) {
-		return new File (rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object).exists();
-	}
-
-	public void createBucket(String bucket) throws IOException {
-		File bukkit = new File (rootDirectory + FILE_SEPARATOR + bucket);
-		if(!bukkit.exists()) {
-			if(!bukkit.mkdirs()) {
-				throw new IOException("Unable to create bucket: " + bucket);
-			}
-		}
-	}
-
-	public long getSize(String bucket, String object) {
-		File objectFile = new File (rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object);
-		if(objectFile.exists())
-			return objectFile.length();
-		return -1;
-	}
-
-	public void deleteBucket(String bucket) throws IOException {
-		File bukkit = new File (rootDirectory + FILE_SEPARATOR + bucket);
-		if(!bukkit.delete()) {
-			throw new IOException("Unable to delete bucket: " + bucket);
-		}
-	}
-
-	public void createObject(String bucket, String object) throws IOException {
-		File objectFile = new File (rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object);
-		if (!objectFile.exists()) {
-			if (!objectFile.createNewFile()) {
-				throw new IOException("Unable to create: " + objectFile.getAbsolutePath());
-			}
-		}
-	}
-
-	public FileIO prepareForRead(String bucket, String object) throws Exception {
-		return new FileReader(rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object);
-	}
-
-	public FileIO prepareForWrite(String bucket, String object) throws Exception {
-		return new FileWriter(rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object);
-	}
-
-	public int readObject(String bucket, String object, byte[] bytes, long offset) throws IOException {
-		return readObject(rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object, bytes, offset);
-	}
-
-	public int readObject(String path, byte[] bytes, long offset) throws IOException {
-		File objectFile = new File (path);
-		if (!objectFile.exists()) {
-			throw new IOException("Unable to read: " + path);
-		}
-		BufferedInputStream inputStream = new BufferedInputStream(new FileInputStream(objectFile));
-		if (offset > 0) {
-			inputStream.skip(offset);
-		}
-		int bytesRead = inputStream.read(bytes);
-		inputStream.close();
-		return bytesRead;
-	}
-
-	public void deleteObject(String bucket, String object) throws IOException {
-		File objectFile = new File (rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object);
-		if (objectFile.exists()) {
-			if(!objectFile.delete()) {
-				throw new IOException("Unable to delete: " + objectFile.getAbsolutePath());
-			}
-		}
-	}
-
-	public void deleteAbsoluteObject(String object) throws IOException {
-		File objectFile = new File (object);
-		if (objectFile.exists()) {
-			if(!objectFile.delete()) {
-				throw new IOException("Unable to delete: " + object);
-			}
-		}
-	}
-
-	public void putObject(String bucket, String object, byte[] base64Data, boolean append) throws IOException {
-		File objectFile = new File (rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object);
-		if (!objectFile.exists()) {
-			objectFile.createNewFile();
-		}
-		BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(objectFile, append));
-		outputStream.write(base64Data);
-		outputStream.close();
-	}
-
-	public void renameObject(String bucket, String oldName, String newName) throws IOException {
-		File oldObjectFile = new File (rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + oldName);
-		File newObjectFile = new File (rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + newName);
-		if(oldObjectFile.exists()) {
-			if (!oldObjectFile.renameTo(newObjectFile)) {
-				throw new IOException("Unable to rename " + oldObjectFile.getAbsolutePath() + " to " + newObjectFile.getAbsolutePath());
-			}
-		}
-	}
-
-	public void copyObject(String sourceBucket, String sourceObject, String destinationBucket, String destinationObject) throws IOException {
-		File oldObjectFile = new File (rootDirectory + FILE_SEPARATOR + sourceBucket + FILE_SEPARATOR + sourceObject);
-		File newObjectFile = new File (rootDirectory + FILE_SEPARATOR + destinationBucket + FILE_SEPARATOR + destinationObject);
-		if(!oldObjectFile.equals(newObjectFile)) {			
-			FileInputStream fileInputStream = new FileInputStream(oldObjectFile);
-			FileChannel fileIn = fileInputStream.getChannel();
-			FileOutputStream fileOutputStream = new FileOutputStream(newObjectFile);
-			FileChannel fileOut = fileOutputStream.getChannel();
-			fileIn.transferTo(0, fileIn.size(), fileOut);
-			fileIn.close();
-			fileInputStream.close();
-			fileOut.close();
-			fileOutputStream.close();
-		}
-	}
-
-	public String getObjectPath(String bucket, String object) {
-		return rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object;
-	}
-
-	public long getObjectSize(String bucket, String object) {
-		String absoluteObjectPath = rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object;
-
-		File objectFile = new File(absoluteObjectPath);
-		if(objectFile.exists())
-			return objectFile.length();
-		return -1;
-	}
-
-	public void sendObject(final WalrusDataGetRequestType request, DefaultHttpResponse httpResponse, String bucketName, String objectName, long size, String etag, String lastModified, String contentType, String contentDisposition, Boolean isCompressed, String versionId, final BucketLogData logData) {
-		try {
-			Channel channel = request.getChannel();
-			RandomAccessFile raf = new RandomAccessFile(new File(getObjectPath(bucketName, objectName)), "r");
-			httpResponse.addHeader( HttpHeaders.Names.CONTENT_TYPE, contentType != null ? contentType : "binary/octet-stream" );
-			if(etag != null)
-				httpResponse.addHeader(HttpHeaders.Names.ETAG, etag);
-			httpResponse.addHeader(HttpHeaders.Names.LAST_MODIFIED, lastModified);
-			if(contentDisposition != null)
-				httpResponse.addHeader("Content-Disposition", contentDisposition);
-			final ChunkedInput file;
-			isCompressed = isCompressed == null ? false : isCompressed;
-			if(isCompressed) {
-				file = new CompressedChunkedFile(raf, size);
-			} else {
-				file = new ChunkedDataFile(raf, 0, size, 8192);
-				httpResponse.addHeader( HttpHeaders.Names.CONTENT_LENGTH, String.valueOf(size));
-			}
-			if(logData != null) {
-				logData.setTurnAroundTime(System.currentTimeMillis() - logData.getTurnAroundTime());
-				logData.setBytesSent(size);
-			}
-			if(versionId != null) {
-				httpResponse.addHeader(WalrusProperties.X_AMZ_VERSION_ID, versionId);
-			}
-			channel.write(httpResponse);
-			channel.write(file).addListener(new ChannelFutureListener( ) {
-				@Override public void operationComplete( ChannelFuture future ) throws Exception {
-					Contexts.clear(request.getCorrelationId());
-					file.close();
-					if(logData != null) {
-						logData.setTotalTime(System.currentTimeMillis() - logData.getTotalTime());
-						WalrusBucketLogger.getInstance().addLogEntry(logData);	
-					}
-				}
-			});
-		} catch(Exception ex) {
-			LOG.error(ex, ex);
-		}	
-	}
-
-	public void sendObject(final WalrusDataGetRequestType request, DefaultHttpResponse httpResponse, String bucketName, String objectName, long start, long end, long size, String etag, String lastModified, String contentType, String contentDisposition, Boolean isCompressed, String versionId, final BucketLogData logData) {
-		try {
-			Channel channel = request.getChannel();
-			RandomAccessFile raf = new RandomAccessFile(new File(getObjectPath(bucketName, objectName)), "r");
-			httpResponse.addHeader( HttpHeaders.Names.CONTENT_TYPE, contentType != null ? contentType : "binary/octet-stream" );
-			if(etag != null)
-				httpResponse.addHeader(HttpHeaders.Names.ETAG, etag);
-			httpResponse.addHeader(HttpHeaders.Names.LAST_MODIFIED, lastModified);
-			if(contentDisposition != null)
-				httpResponse.addHeader("Content-Disposition", contentDisposition);
-			final ChunkedInput file;
-			isCompressed = isCompressed == null ? false : isCompressed;
-			if(isCompressed) {
-				file = new CompressedChunkedFile(raf, start, end, (int)Math.min((end - start), 8192));
-			} else {
-				file = new ChunkedDataFile(raf, start, end, (int)Math.min((end - start), 8192));
-				httpResponse.addHeader( HttpHeaders.Names.CONTENT_LENGTH, String.valueOf((end - start)));
-			}
-			httpResponse.addHeader("Content-Range", start + "-" + end + "/" + size);
-			if(logData != null) {
-				logData.setTurnAroundTime(System.currentTimeMillis() - logData.getTurnAroundTime());
-				logData.setBytesSent(size);
-			}
-			if(versionId != null) {
-				httpResponse.addHeader(WalrusProperties.X_AMZ_VERSION_ID, versionId);
-			}
-			channel.write(httpResponse);
-			channel.write(file).addListener(new ChannelFutureListener( ) {
-				@Override public void operationComplete( ChannelFuture future ) throws Exception {
-					Contexts.clear(request.getCorrelationId());
-					file.close();
-					if(logData != null) {
-						logData.setTotalTime(System.currentTimeMillis() - logData.getTotalTime());
-						WalrusBucketLogger.getInstance().addLogEntry(logData);
-					}
-				}
-			});
-		} catch(Exception ex) {
-			LOG.error(ex, ex);
-		}	
-	}
-
-	public void sendHeaders(final WalrusDataGetRequestType request, DefaultHttpResponse httpResponse, Long size, String etag,
-			String lastModified, String contentType, String contentDisposition, String versionId, final BucketLogData logData) {
-		Channel channel = request.getChannel();
-		httpResponse.addHeader( HttpHeaders.Names.CONTENT_LENGTH, String.valueOf(size));
-		httpResponse.addHeader( HttpHeaders.Names.CONTENT_TYPE, contentType != null ? contentType : "binary/octet-stream" );
-		if(etag != null)
-			httpResponse.addHeader(HttpHeaders.Names.ETAG, etag);
-		httpResponse.addHeader(HttpHeaders.Names.LAST_MODIFIED, lastModified);
-		if(contentDisposition != null) 
-			httpResponse.addHeader("Content-Disposition", contentDisposition);
-		if(versionId != null) {
-			httpResponse.addHeader(WalrusProperties.X_AMZ_VERSION_ID, versionId);
-		}
-		if(logData != null) {
-			logData.setTurnAroundTime(System.currentTimeMillis() - logData.getTurnAroundTime());
-		}
-		channel.write(httpResponse).addListener(new ChannelFutureListener( ) {
-			@Override public void operationComplete( ChannelFuture future ) throws Exception {
-				Contexts.clear(request.getCorrelationId());
-				if(logData != null) {
-					logData.setTotalTime(System.currentTimeMillis() - logData.getTotalTime());
-					WalrusBucketLogger.getInstance().addLogEntry(logData);	
-				}
-			}
-		});
-	}
-
-	private String removeLoopback(String loDevName) throws ExecutionException {
-		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "losetup", "-d", loDevName});
-	}
-
-	private int losetup(String absoluteFileName, String loDevName) {
-		try
-		{
-			Runtime rt = Runtime.getRuntime();
-			Process proc = rt.exec(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "losetup", loDevName, absoluteFileName});
-			StreamConsumer error = new StreamConsumer(proc.getErrorStream());
-			StreamConsumer output = new StreamConsumer(proc.getInputStream());
-			error.start();
-			output.start();
-			int errorCode = proc.waitFor();
-			output.join();
-			LOG.info("losetup " + loDevName + " " + absoluteFileName);
-			LOG.info(output.getReturnValue());
-			LOG.info(error.getReturnValue());
-			return errorCode;
-		} catch (Throwable t) {
-			LOG.error(t);
-		}
-		return -1;
-	}
-
-	private String findFreeLoopback() throws ExecutionException {
-		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "losetup", "-f"}).replaceAll("\n", "");
-	}
-
-	private String removeLogicalVolume(String lvName) throws ExecutionException {
-		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "lvremove", "-f", lvName});
-	}
-
-	private String reduceVolumeGroup(String vgName, String pvName) throws ExecutionException {
-		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "vgreduce", vgName, pvName});
-	}
-
-	private String removePhysicalVolume(String loDevName) throws ExecutionException {
-		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "pvremove", loDevName});
-	}
-
-	private String createVolumeFromLv(String lvName, String volumeKey) throws ExecutionException {
-		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "dd", "if=" + lvName, "of=" + volumeKey, "bs=1M"});
-	}
-
-	private String enableLogicalVolume(String lvName) throws ExecutionException {
-		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "lvchange", "-ay", lvName});
-	}
-
-	private String disableLogicalVolume(String lvName) throws ExecutionException {
-		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "lvchange", "-an", lvName});
-	}
-
-	private String removeVolumeGroup(String vgName) throws ExecutionException {
-		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "vgremove", vgName});
-	}
-
-	private String getLvmVersion() throws ExecutionException {
-		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "lvm", "version"});
-	}
-
-
-
-	public String createLoopback(String fileName) throws EucalyptusCloudException, ExecutionException {
-		int number_of_retries = 0;
-		int status = -1;
-		String loDevName;
-		do {
-			loDevName = findFreeLoopback();
-			if(loDevName.length() > 0) {
-				status = losetup(fileName, loDevName);
-			}
-			if(number_of_retries++ >= MAX_LOOP_DEVICES)
-				break;
-		} while(status != 0);
-
-		if(status != 0) {
-			throw new EucalyptusCloudException("Could not create loopback device for " + fileName +
-			". Please check the max loop value and permissions");
-		}
-		return loDevName;
-	}
-}

=== removed file 'clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileWriter.java'
--- clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileWriter.java	2009-10-02 17:47:47 +0000
+++ clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileWriter.java	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-/*******************************************************************************
-*Copyright (c) 2009  Eucalyptus Systems, Inc.
-* 
-*  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, only version 3 of the License.
-* 
-* 
-*  This file 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/>.
-* 
-*  Please contact Eucalyptus Systems, Inc., 130 Castilian
-*  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
-*  if you need additional information or have any questions.
-* 
-*  This file may incorporate work covered under the following copyright and
-*  permission notice:
-* 
-*    Software License Agreement (BSD License)
-* 
-*    Copyright (c) 2008, Regents of the University of California
-*    All rights reserved.
-* 
-*    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 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. USERS OF
-*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
-*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
-*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
-*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
-*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
-*    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
-*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
-*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
-*    ANY SUCH LICENSES OR RIGHTS.
-*******************************************************************************/
-/*
- *
- * Author: Sunil Soman [e-mail]
- */
-
-package edu.ucsb.eucalyptus.storage.fs;
-
-import org.apache.log4j.Logger;
-
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-public  class FileWriter extends FileIO {
-
-    private static Logger LOG = Logger.getLogger(FileWriter.class);
-
-    public FileWriter(String filename) throws Exception {
-        try {
-            channel = new FileOutputStream(filename).getChannel();
-        } catch( FileNotFoundException ex) {
-            LOG.error(ex);
-            throw ex;
-        }
-    }
-
-    public  int read(long offset) throws IOException {
-        return -1;
-    }
-
-    public void write(byte[] bytes) throws IOException {
-        ByteBuffer buffer = ByteBuffer.wrap(bytes);
-        channel.write(buffer);
-    }
-
-    public ByteBuffer getBuffer() {
-        return null;
-    }
-
-    public void finish() {
-        try {
-            channel.close();
-        } catch(IOException ex) {
-            LOG.error(ex);
-        }
-    }
-}

=== added directory 'clc/modules/storage-fs'
=== added file 'clc/modules/storage-fs/build.xml'
--- clc/modules/storage-fs/build.xml	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-fs/build.xml	2010-11-15 08:38:14 +0000
@@ -0,0 +1,68 @@
+<!--
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright (c) 2009  Eucalyptus Systems, Inc.
+  ~
+  ~ 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, only version 3 of the License.
+  ~
+  ~
+  ~ This file 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/.
+  ~
+  ~ Please contact Eucalyptus Systems, Inc., 130 Castilian
+  ~ Dr., Goleta, CA 93101 USA or visit http://www.eucalyptus.com/licenses/
+  ~ if you need additional information or have any questions.
+  ~
+  ~ This file may incorporate work covered under the following copyright and
+  ~ permission notice:
+  ~
+  ~   Software License Agreement (BSD License)
+  ~
+  ~   Copyright (c) 2008, Regents of the University of California
+  ~   All rights reserved.
+  ~
+  ~   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 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. USERS OF
+  ~   THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
+  ~   LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
+  ~   SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
+  ~   IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
+  ~   BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
+  ~   THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+  ~   OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
+  ~   WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
+  ~   ANY SUCH LICENSES OR RIGHTS.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Author: Sunil Soman [e-mail]
+  -->
+
+<project name="eucalyptus-storage-fs" basedir=".">
+    <import file="../module-inc.xml"/>
+</project>
+

=== added directory 'clc/modules/storage-fs/conf'
=== added directory 'clc/modules/storage-fs/src'
=== added directory 'clc/modules/storage-fs/src/main'
=== added directory 'clc/modules/storage-fs/src/main/java'
=== added directory 'clc/modules/storage-fs/src/main/java/edu'
=== added directory 'clc/modules/storage-fs/src/main/java/edu/ucsb'
=== added directory 'clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus'
=== added directory 'clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/cloud'
=== added directory 'clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/cloud/ws'
=== added file 'clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/cloud/ws/ChunkedDataFile.java'
--- clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/cloud/ws/ChunkedDataFile.java	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/cloud/ws/ChunkedDataFile.java	2010-11-15 08:38:14 +0000
@@ -0,0 +1,77 @@
+/*******************************************************************************
+*Copyright (c) 2009  Eucalyptus Systems, Inc.
+* 
+*  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, only version 3 of the License.
+* 
+* 
+*  This file 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/>.
+* 
+*  Please contact Eucalyptus Systems, Inc., 130 Castilian
+*  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
+*  if you need additional information or have any questions.
+* 
+*  This file may incorporate work covered under the following copyright and
+*  permission notice:
+* 
+*    Software License Agreement (BSD License)
+* 
+*    Copyright (c) 2008, Regents of the University of California
+*    All rights reserved.
+* 
+*    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 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. USERS OF
+*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
+*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
+*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
+*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
+*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
+*    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
+*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
+*    ANY SUCH LICENSES OR RIGHTS.
+*******************************************************************************/
+package edu.ucsb.eucalyptus.cloud.ws;
+
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+import org.jboss.netty.handler.stream.ChunkedFile;
+
+import edu.ucsb.eucalyptus.constants.IsData;
+
+public class ChunkedDataFile extends ChunkedFile implements IsData {
+
+	public ChunkedDataFile(RandomAccessFile file, long offset, long length,
+			int chunkSize) throws IOException {
+		super(file, offset, length, chunkSize);
+	}		
+}
+

=== added file 'clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/cloud/ws/CompressedChunkedFile.java'
--- clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/cloud/ws/CompressedChunkedFile.java	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/cloud/ws/CompressedChunkedFile.java	2010-11-15 08:38:14 +0000
@@ -0,0 +1,120 @@
+/*******************************************************************************
+*Copyright (c) 2009  Eucalyptus Systems, Inc.
+* 
+*  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, only version 3 of the License.
+* 
+* 
+*  This file 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/>.
+* 
+*  Please contact Eucalyptus Systems, Inc., 130 Castilian
+*  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
+*  if you need additional information or have any questions.
+* 
+*  This file may incorporate work covered under the following copyright and
+*  permission notice:
+* 
+*    Software License Agreement (BSD License)
+* 
+*    Copyright (c) 2008, Regents of the University of California
+*    All rights reserved.
+* 
+*    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 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. USERS OF
+*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
+*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
+*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
+*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
+*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
+*    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
+*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
+*    ANY SUCH LICENSES OR RIGHTS.
+*******************************************************************************/
+package edu.ucsb.eucalyptus.cloud.ws;
+
+import java.io.ByteArrayOutputStream;
+import java.io.RandomAccessFile;
+import java.util.zip.GZIPOutputStream;
+
+import org.apache.log4j.Logger;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.handler.stream.ChunkedInput;
+
+import edu.ucsb.eucalyptus.constants.IsData;
+
+public class CompressedChunkedFile implements ChunkedInput, IsData {
+	private Logger LOG = Logger.getLogger( CompressedChunkedFile.class );
+	private RandomAccessFile file;
+	private long offset;
+	private int CHUNK_SIZE = 8192;
+	private long fileLength;
+
+	public CompressedChunkedFile(RandomAccessFile file, long fileLength) {
+		this.file = file;
+		this.offset = 0;
+		this.fileLength = fileLength;
+	}
+
+	public CompressedChunkedFile(RandomAccessFile file, long start, long end, int chunkSize) {
+		this.file = file;
+		this.offset = start;
+		this.fileLength = end;
+		CHUNK_SIZE = chunkSize;
+	}
+	
+	@Override
+	public void close() throws Exception {
+		file.close();
+	}
+
+	@Override
+	public boolean hasNextChunk() throws Exception {
+		return offset < fileLength && file.getChannel().isOpen();
+	}
+
+	@Override
+	public Object nextChunk() throws Exception {
+		long offset = this.offset;
+		if (offset >= fileLength) {
+			return null;
+		}
+		int chunkSize = (int) Math.min(CHUNK_SIZE, fileLength - offset);
+		byte[] chunk = new byte[chunkSize];
+		file.readFully(chunk);
+		this.offset = offset + chunkSize;
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
+		GZIPOutputStream zip = new GZIPOutputStream(out);
+		zip.write(chunk);
+		zip.close();
+		return ChannelBuffers.wrappedBuffer(out.toByteArray());
+	}	
+}
+

=== added directory 'clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/storage'
=== added file 'clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/storage/StorageManagerFactory.java'
--- clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/storage/StorageManagerFactory.java	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/storage/StorageManagerFactory.java	2010-11-15 08:38:14 +0000
@@ -0,0 +1,71 @@
+/*******************************************************************************
+*Copyright (c) 2010 Takuya ASADA
+* 
+*  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, only version 3 of the License.
+* 
+* 
+*  This file 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/>.
+* 
+*  Please contact Eucalyptus Systems, Inc., 130 Castilian
+*  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
+*  if you need additional information or have any questions.
+* 
+*  This file may incorporate work covered under the following copyright and
+*  permission notice:
+* 
+*    Software License Agreement (BSD License)
+* 
+*    Copyright (c) 2008, Regents of the University of California
+*    All rights reserved.
+* 
+*    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 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. USERS OF
+*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
+*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
+*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
+*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
+*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
+*    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
+*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
+*    ANY SUCH LICENSES OR RIGHTS.
+*******************************************************************************/
+
+package edu.ucsb.eucalyptus.storage;
+
+import edu.ucsb.eucalyptus.cloud.entities.WalrusInfo;
+import edu.ucsb.eucalyptus.storage.fs.FileSystemStorageManager;
+
+public class StorageManagerFactory {
+    public static StorageManager getStorageManager(WalrusInfo walrusInfo) {
+	return new FileSystemStorageManager(walrusInfo);
+    }
+}

=== added directory 'clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/storage/fs'
=== added file 'clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileReader.java'
--- clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileReader.java	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileReader.java	2010-11-15 08:38:14 +0000
@@ -0,0 +1,114 @@
+/*******************************************************************************
+*Copyright (c) 2009  Eucalyptus Systems, Inc.
+* 
+*  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, only version 3 of the License.
+* 
+* 
+*  This file 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/>.
+* 
+*  Please contact Eucalyptus Systems, Inc., 130 Castilian
+*  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
+*  if you need additional information or have any questions.
+* 
+*  This file may incorporate work covered under the following copyright and
+*  permission notice:
+* 
+*    Software License Agreement (BSD License)
+* 
+*    Copyright (c) 2008, Regents of the University of California
+*    All rights reserved.
+* 
+*    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 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. USERS OF
+*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
+*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
+*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
+*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
+*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
+*    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
+*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
+*    ANY SUCH LICENSES OR RIGHTS.
+*******************************************************************************/
+/*
+ *
+ * Author: Sunil Soman [e-mail]
+ */
+
+package edu.ucsb.eucalyptus.storage.fs;
+
+import edu.ucsb.eucalyptus.storage.StorageIO;
+
+import org.apache.log4j.Logger;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+
+public  class FileReader extends StorageIO {
+
+    private static Logger LOG = Logger.getLogger(FileReader.class);
+    private ByteBuffer buffer;
+    protected FileChannel channel;
+
+    public FileReader(String filename) throws Exception {
+        try {
+            channel = new FileInputStream(filename).getChannel();
+            buffer = ByteBuffer.allocate(102400/*TODO: NEIL WalrusQueryDispatcher.DATA_MESSAGE_SIZE */);
+        } catch( FileNotFoundException ex) {
+            LOG.error(ex);
+            throw ex;
+        }
+    }
+
+    public  int read(long offset) throws IOException {
+        buffer.clear();
+        int bytesRead = channel.read(buffer, offset);
+        buffer.flip();
+        return bytesRead;
+    }
+
+    public  void write(byte[] bytes) throws IOException {}
+
+    public ByteBuffer getBuffer() {
+        return buffer;
+    }
+
+    public void finish() {
+        try {
+            channel.close();
+        } catch(IOException ex) {
+            LOG.error(ex);
+        }
+    }
+}

=== added file 'clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileSystemStorageManager.java'
--- clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileSystemStorageManager.java	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileSystemStorageManager.java	2010-11-15 08:38:14 +0000
@@ -0,0 +1,468 @@
+/*******************************************************************************
+ *Copyright (c) 2009  Eucalyptus Systems, Inc.
+ * 
+ *  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, only version 3 of the License.
+ * 
+ * 
+ *  This file 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/>.
+ * 
+ *  Please contact Eucalyptus Systems, Inc., 130 Castilian
+ *  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
+ *  if you need additional information or have any questions.
+ * 
+ *  This file may incorporate work covered under the following copyright and
+ *  permission notice:
+ * 
+ *    Software License Agreement (BSD License)
+ * 
+ *    Copyright (c) 2008, Regents of the University of California
+ *    All rights reserved.
+ * 
+ *    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 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. USERS OF
+ *    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
+ *    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
+ *    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
+ *    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
+ *    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
+ *    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+ *    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
+ *    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
+ *    ANY SUCH LICENSES OR RIGHTS.
+ *******************************************************************************/
+/*
+ *
+ * Author: Sunil Soman [e-mail]
+ */
+
+package edu.ucsb.eucalyptus.storage.fs;
+
+import com.eucalyptus.auth.util.Hashes;
+import com.eucalyptus.context.Contexts;
+import com.eucalyptus.http.MappingHttpResponse;
+import com.eucalyptus.util.EucalyptusCloudException;
+import com.eucalyptus.util.ExecutionException;
+import com.eucalyptus.util.WalrusProperties;
+import com.eucalyptus.ws.util.ChannelUtil;
+import com.eucalyptus.ws.util.WalrusBucketLogger;
+
+import edu.ucsb.eucalyptus.cloud.BucketLogData;
+import edu.ucsb.eucalyptus.cloud.ws.CompressedChunkedFile;
+import edu.ucsb.eucalyptus.cloud.ws.ChunkedDataFile;
+import edu.ucsb.eucalyptus.msgs.WalrusDataGetRequestType;
+import edu.ucsb.eucalyptus.storage.StorageManager;
+import edu.ucsb.eucalyptus.storage.StorageIO;
+import edu.ucsb.eucalyptus.util.StreamConsumer;
+import edu.ucsb.eucalyptus.util.SystemUtil;
+
+import edu.ucsb.eucalyptus.cloud.entities.WalrusInfo;
+
+import org.apache.log4j.Logger;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelFutureListener;
+import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
+import org.jboss.netty.handler.codec.http.HttpHeaders;
+import org.jboss.netty.handler.stream.ChunkedInput;
+
+import java.io.*;
+import java.nio.channels.FileChannel;
+import java.util.ArrayList;
+import java.util.List;
+
+public class FileSystemStorageManager implements StorageManager {
+
+	public static final String FILE_SEPARATOR = "/";
+	public static final String lvmRootDirectory = "/dev";
+	private static boolean initialized = false;
+	private static String eucaHome = "/opt/eucalyptus";
+	public static final String EUCA_ROOT_WRAPPER = "/usr/lib/eucalyptus/euca_rootwrap";
+	public static final int MAX_LOOP_DEVICES = 256;
+	private static Logger LOG = Logger.getLogger(FileSystemStorageManager.class);
+
+	private String rootDirectory;
+	public FileSystemStorageManager(WalrusInfo walrusInfo) {
+	        this.rootDirectory = walrusInfo.getStorageDir();
+	}
+
+	public void checkPreconditions() throws EucalyptusCloudException {
+		try {
+			String eucaHomeDir = System.getProperty("euca.home");
+			if(eucaHomeDir == null) {
+				throw new EucalyptusCloudException("euca.home not set");
+			}
+			eucaHome = eucaHomeDir;
+			if(!new File(eucaHome + EUCA_ROOT_WRAPPER).exists()) {
+				throw new EucalyptusCloudException("root wrapper (euca_rootwrap) does not exist");
+			}
+			String returnValue = getLvmVersion();
+			if(returnValue.length() == 0) {
+				throw new EucalyptusCloudException("Is lvm installed?");
+			} else {
+				LOG.info(returnValue);
+			}
+		} catch(ExecutionException ex) {
+			String error = "Unable to run command: " + ex.getMessage();
+			LOG.error(error);
+			throw new EucalyptusCloudException(error);
+		}
+	}
+
+	public void setRootDirectory(String rootDirectory) {
+		this.rootDirectory = rootDirectory;
+	}
+
+	public boolean bucketExists(String bucket) {
+		return new File (rootDirectory + FILE_SEPARATOR + bucket).exists();        
+	}
+
+	public boolean objectExists(String bucket, String object) {
+		return new File (rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object).exists();
+	}
+
+	public void createBucket(String bucket) throws IOException {
+		File bukkit = new File (rootDirectory + FILE_SEPARATOR + bucket);
+		if(!bukkit.exists()) {
+			if(!bukkit.mkdirs()) {
+				throw new IOException("Unable to create bucket: " + bucket);
+			}
+		}
+	}
+
+	public long getSize(String bucket, String object) {
+		File objectFile = new File (rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object);
+		if(objectFile.exists())
+			return objectFile.length();
+		return -1;
+	}
+
+	public void deleteBucket(String bucket) throws IOException {
+		File bukkit = new File (rootDirectory + FILE_SEPARATOR + bucket);
+		if(!bukkit.delete()) {
+			throw new IOException("Unable to delete bucket: " + bucket);
+		}
+	}
+
+	public void createObject(String bucket, String object) throws IOException {
+		File objectFile = new File (rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object);
+		if (!objectFile.exists()) {
+			if (!objectFile.createNewFile()) {
+				throw new IOException("Unable to create: " + objectFile.getAbsolutePath());
+			}
+		}
+	}
+
+	public StorageIO prepareForRead(String bucket, String object) throws Exception {
+		return new FileReader(rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object);
+	}
+
+	public StorageIO prepareForWrite(String bucket, String object) throws Exception {
+		return new FileWriter(rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object);
+	}
+
+	public int readObject(String bucket, String object, byte[] bytes, long offset) throws IOException {
+		return readObject(rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object, bytes, offset);
+	}
+
+	public int readObject(String path, byte[] bytes, long offset) throws IOException {
+		File objectFile = new File (path);
+		if (!objectFile.exists()) {
+			throw new IOException("Unable to read: " + path);
+		}
+		BufferedInputStream inputStream = new BufferedInputStream(new FileInputStream(objectFile));
+		if (offset > 0) {
+			inputStream.skip(offset);
+		}
+		int bytesRead = inputStream.read(bytes);
+		inputStream.close();
+		return bytesRead;
+	}
+
+	public void deleteObject(String bucket, String object) throws IOException {
+		File objectFile = new File (rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object);
+		if (objectFile.exists()) {
+			if(!objectFile.delete()) {
+				throw new IOException("Unable to delete: " + objectFile.getAbsolutePath());
+			}
+		}
+	}
+
+	public void deleteAbsoluteObject(String object) throws IOException {
+		File objectFile = new File (object);
+		if (objectFile.exists()) {
+			if(!objectFile.delete()) {
+				throw new IOException("Unable to delete: " + object);
+			}
+		}
+	}
+
+	public void putObject(String bucket, String object, byte[] base64Data, boolean append) throws IOException {
+		File objectFile = new File (rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object);
+		if (!objectFile.exists()) {
+			objectFile.createNewFile();
+		}
+		BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(objectFile, append));
+		outputStream.write(base64Data);
+		outputStream.close();
+	}
+
+	public void renameObject(String bucket, String oldName, String newName) throws IOException {
+		File oldObjectFile = new File (rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + oldName);
+		File newObjectFile = new File (rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + newName);
+		if(oldObjectFile.exists()) {
+			if (!oldObjectFile.renameTo(newObjectFile)) {
+				throw new IOException("Unable to rename " + oldObjectFile.getAbsolutePath() + " to " + newObjectFile.getAbsolutePath());
+			}
+		}
+	}
+
+	public void copyObject(String sourceBucket, String sourceObject, String destinationBucket, String destinationObject) throws IOException {
+		File oldObjectFile = new File (rootDirectory + FILE_SEPARATOR + sourceBucket + FILE_SEPARATOR + sourceObject);
+		File newObjectFile = new File (rootDirectory + FILE_SEPARATOR + destinationBucket + FILE_SEPARATOR + destinationObject);
+		if(!oldObjectFile.equals(newObjectFile)) {			
+			FileInputStream fileInputStream = new FileInputStream(oldObjectFile);
+			FileChannel fileIn = fileInputStream.getChannel();
+			FileOutputStream fileOutputStream = new FileOutputStream(newObjectFile);
+			FileChannel fileOut = fileOutputStream.getChannel();
+			fileIn.transferTo(0, fileIn.size(), fileOut);
+			fileIn.close();
+			fileInputStream.close();
+			fileOut.close();
+			fileOutputStream.close();
+		}
+	}
+
+	public String getObjectPath(String bucket, String object) {
+		return rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object;
+	}
+
+	public long getObjectSize(String bucket, String object) {
+		String absoluteObjectPath = rootDirectory + FILE_SEPARATOR + bucket + FILE_SEPARATOR + object;
+
+		File objectFile = new File(absoluteObjectPath);
+		if(objectFile.exists())
+			return objectFile.length();
+		return -1;
+	}
+
+	public void sendObject(final WalrusDataGetRequestType request, DefaultHttpResponse httpResponse, String bucketName, String objectName, long size, String etag, String lastModified, String contentType, String contentDisposition, Boolean isCompressed, String versionId, final BucketLogData logData) {
+		try {
+			Channel channel = request.getChannel();
+			RandomAccessFile raf = new RandomAccessFile(new File(getObjectPath(bucketName, objectName)), "r");
+			httpResponse.addHeader( HttpHeaders.Names.CONTENT_TYPE, contentType != null ? contentType : "binary/octet-stream" );
+			if(etag != null)
+				httpResponse.addHeader(HttpHeaders.Names.ETAG, etag);
+			httpResponse.addHeader(HttpHeaders.Names.LAST_MODIFIED, lastModified);
+			if(contentDisposition != null)
+				httpResponse.addHeader("Content-Disposition", contentDisposition);
+			final ChunkedInput file;
+			isCompressed = isCompressed == null ? false : isCompressed;
+			if(isCompressed) {
+				file = new CompressedChunkedFile(raf, size);
+			} else {
+				file = new ChunkedDataFile(raf, 0, size, 8192);
+				httpResponse.addHeader( HttpHeaders.Names.CONTENT_LENGTH, String.valueOf(size));
+			}
+			if(logData != null) {
+				logData.setTurnAroundTime(System.currentTimeMillis() - logData.getTurnAroundTime());
+				logData.setBytesSent(size);
+			}
+			if(versionId != null) {
+				httpResponse.addHeader(WalrusProperties.X_AMZ_VERSION_ID, versionId);
+			}
+			channel.write(httpResponse);
+			channel.write(file).addListener(new ChannelFutureListener( ) {
+				@Override public void operationComplete( ChannelFuture future ) throws Exception {
+					Contexts.clear(request.getCorrelationId());
+					file.close();
+					if(logData != null) {
+						logData.setTotalTime(System.currentTimeMillis() - logData.getTotalTime());
+						WalrusBucketLogger.getInstance().addLogEntry(logData);	
+					}
+				}
+			});
+		} catch(Exception ex) {
+			LOG.error(ex, ex);
+		}	
+	}
+
+	public void sendObject(final WalrusDataGetRequestType request, DefaultHttpResponse httpResponse, String bucketName, String objectName, long start, long end, long size, String etag, String lastModified, String contentType, String contentDisposition, Boolean isCompressed, String versionId, final BucketLogData logData) {
+		try {
+			Channel channel = request.getChannel();
+			RandomAccessFile raf = new RandomAccessFile(new File(getObjectPath(bucketName, objectName)), "r");
+			httpResponse.addHeader( HttpHeaders.Names.CONTENT_TYPE, contentType != null ? contentType : "binary/octet-stream" );
+			if(etag != null)
+				httpResponse.addHeader(HttpHeaders.Names.ETAG, etag);
+			httpResponse.addHeader(HttpHeaders.Names.LAST_MODIFIED, lastModified);
+			if(contentDisposition != null)
+				httpResponse.addHeader("Content-Disposition", contentDisposition);
+			final ChunkedInput file;
+			isCompressed = isCompressed == null ? false : isCompressed;
+			if(isCompressed) {
+				file = new CompressedChunkedFile(raf, start, end, (int)Math.min((end - start), 8192));
+			} else {
+				file = new ChunkedDataFile(raf, start, end, (int)Math.min((end - start), 8192));
+				httpResponse.addHeader( HttpHeaders.Names.CONTENT_LENGTH, String.valueOf((end - start)));
+			}
+			httpResponse.addHeader("Content-Range", start + "-" + end + "/" + size);
+			if(logData != null) {
+				logData.setTurnAroundTime(System.currentTimeMillis() - logData.getTurnAroundTime());
+				logData.setBytesSent(size);
+			}
+			if(versionId != null) {
+				httpResponse.addHeader(WalrusProperties.X_AMZ_VERSION_ID, versionId);
+			}
+			channel.write(httpResponse);
+			channel.write(file).addListener(new ChannelFutureListener( ) {
+				@Override public void operationComplete( ChannelFuture future ) throws Exception {
+					Contexts.clear(request.getCorrelationId());
+					file.close();
+					if(logData != null) {
+						logData.setTotalTime(System.currentTimeMillis() - logData.getTotalTime());
+						WalrusBucketLogger.getInstance().addLogEntry(logData);
+					}
+				}
+			});
+		} catch(Exception ex) {
+			LOG.error(ex, ex);
+		}	
+	}
+
+	public void sendHeaders(final WalrusDataGetRequestType request, DefaultHttpResponse httpResponse, Long size, String etag,
+			String lastModified, String contentType, String contentDisposition, String versionId, final BucketLogData logData) {
+		Channel channel = request.getChannel();
+		httpResponse.addHeader( HttpHeaders.Names.CONTENT_LENGTH, String.valueOf(size));
+		httpResponse.addHeader( HttpHeaders.Names.CONTENT_TYPE, contentType != null ? contentType : "binary/octet-stream" );
+		if(etag != null)
+			httpResponse.addHeader(HttpHeaders.Names.ETAG, etag);
+		httpResponse.addHeader(HttpHeaders.Names.LAST_MODIFIED, lastModified);
+		if(contentDisposition != null) 
+			httpResponse.addHeader("Content-Disposition", contentDisposition);
+		if(versionId != null) {
+			httpResponse.addHeader(WalrusProperties.X_AMZ_VERSION_ID, versionId);
+		}
+		if(logData != null) {
+			logData.setTurnAroundTime(System.currentTimeMillis() - logData.getTurnAroundTime());
+		}
+		channel.write(httpResponse).addListener(new ChannelFutureListener( ) {
+			@Override public void operationComplete( ChannelFuture future ) throws Exception {
+				Contexts.clear(request.getCorrelationId());
+				if(logData != null) {
+					logData.setTotalTime(System.currentTimeMillis() - logData.getTotalTime());
+					WalrusBucketLogger.getInstance().addLogEntry(logData);	
+				}
+			}
+		});
+	}
+
+	private String removeLoopback(String loDevName) throws ExecutionException {
+		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "losetup", "-d", loDevName});
+	}
+
+	private int losetup(String absoluteFileName, String loDevName) {
+		try
+		{
+			Runtime rt = Runtime.getRuntime();
+			Process proc = rt.exec(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "losetup", loDevName, absoluteFileName});
+			StreamConsumer error = new StreamConsumer(proc.getErrorStream());
+			StreamConsumer output = new StreamConsumer(proc.getInputStream());
+			error.start();
+			output.start();
+			int errorCode = proc.waitFor();
+			output.join();
+			LOG.info("losetup " + loDevName + " " + absoluteFileName);
+			LOG.info(output.getReturnValue());
+			LOG.info(error.getReturnValue());
+			return errorCode;
+		} catch (Throwable t) {
+			LOG.error(t);
+		}
+		return -1;
+	}
+
+	private String findFreeLoopback() throws ExecutionException {
+		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "losetup", "-f"}).replaceAll("\n", "");
+	}
+
+	private String removeLogicalVolume(String lvName) throws ExecutionException {
+		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "lvremove", "-f", lvName});
+	}
+
+	private String reduceVolumeGroup(String vgName, String pvName) throws ExecutionException {
+		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "vgreduce", vgName, pvName});
+	}
+
+	private String removePhysicalVolume(String loDevName) throws ExecutionException {
+		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "pvremove", loDevName});
+	}
+
+	private String createVolumeFromLv(String lvName, String volumeKey) throws ExecutionException {
+		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "dd", "if=" + lvName, "of=" + volumeKey, "bs=1M"});
+	}
+
+	private String enableLogicalVolume(String lvName) throws ExecutionException {
+		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "lvchange", "-ay", lvName});
+	}
+
+	private String disableLogicalVolume(String lvName) throws ExecutionException {
+		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "lvchange", "-an", lvName});
+	}
+
+	private String removeVolumeGroup(String vgName) throws ExecutionException {
+		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "vgremove", vgName});
+	}
+
+	private String getLvmVersion() throws ExecutionException {
+		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "lvm", "version"});
+	}
+
+
+
+	public String createLoopback(String fileName) throws EucalyptusCloudException, ExecutionException {
+		int number_of_retries = 0;
+		int status = -1;
+		String loDevName;
+		do {
+			loDevName = findFreeLoopback();
+			if(loDevName.length() > 0) {
+				status = losetup(fileName, loDevName);
+			}
+			if(number_of_retries++ >= MAX_LOOP_DEVICES)
+				break;
+		} while(status != 0);
+
+		if(status != 0) {
+			throw new EucalyptusCloudException("Could not create loopback device for " + fileName +
+			". Please check the max loop value and permissions");
+		}
+		return loDevName;
+	}
+}

=== added file 'clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileWriter.java'
--- clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileWriter.java	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-fs/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileWriter.java	2010-11-15 08:38:14 +0000
@@ -0,0 +1,112 @@
+/*******************************************************************************
+*Copyright (c) 2009  Eucalyptus Systems, Inc.
+* 
+*  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, only version 3 of the License.
+* 
+* 
+*  This file 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/>.
+* 
+*  Please contact Eucalyptus Systems, Inc., 130 Castilian
+*  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
+*  if you need additional information or have any questions.
+* 
+*  This file may incorporate work covered under the following copyright and
+*  permission notice:
+* 
+*    Software License Agreement (BSD License)
+* 
+*    Copyright (c) 2008, Regents of the University of California
+*    All rights reserved.
+* 
+*    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 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. USERS OF
+*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
+*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
+*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
+*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
+*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
+*    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
+*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
+*    ANY SUCH LICENSES OR RIGHTS.
+*******************************************************************************/
+/*
+ *
+ * Author: Sunil Soman [e-mail]
+ */
+
+package edu.ucsb.eucalyptus.storage.fs;
+
+import edu.ucsb.eucalyptus.storage.StorageIO;
+
+import org.apache.log4j.Logger;
+
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+
+public  class FileWriter extends StorageIO {
+
+    private static Logger LOG = Logger.getLogger(FileWriter.class);
+    protected FileChannel channel;
+
+    public FileWriter(String filename) throws Exception {
+        try {
+            channel = new FileOutputStream(filename).getChannel();
+        } catch( FileNotFoundException ex) {
+            LOG.error(ex);
+            throw ex;
+        }
+    }
+
+    public  int read(long offset) throws IOException {
+        return -1;
+    }
+
+    public void write(byte[] bytes) throws IOException {
+        ByteBuffer buffer = ByteBuffer.wrap(bytes);
+        channel.write(buffer);
+    }
+
+    public ByteBuffer getBuffer() {
+        return null;
+    }
+
+    public void finish() {
+        try {
+            channel.close();
+        } catch(IOException ex) {
+            LOG.error(ex);
+        }
+    }
+}

=== added directory 'clc/modules/storage-fs/src/main/resources'
=== added directory 'clc/modules/storage-rados'
=== added file 'clc/modules/storage-rados/build.xml'
--- clc/modules/storage-rados/build.xml	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-rados/build.xml	2010-11-15 08:38:14 +0000
@@ -0,0 +1,68 @@
+<!--
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright (c) 2009  Eucalyptus Systems, Inc.
+  ~
+  ~ 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, only version 3 of the License.
+  ~
+  ~
+  ~ This file 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/.
+  ~
+  ~ Please contact Eucalyptus Systems, Inc., 130 Castilian
+  ~ Dr., Goleta, CA 93101 USA or visit http://www.eucalyptus.com/licenses/
+  ~ if you need additional information or have any questions.
+  ~
+  ~ This file may incorporate work covered under the following copyright and
+  ~ permission notice:
+  ~
+  ~   Software License Agreement (BSD License)
+  ~
+  ~   Copyright (c) 2008, Regents of the University of California
+  ~   All rights reserved.
+  ~
+  ~   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 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. USERS OF
+  ~   THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
+  ~   LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
+  ~   SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
+  ~   IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
+  ~   BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
+  ~   THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+  ~   OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
+  ~   WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
+  ~   ANY SUCH LICENSES OR RIGHTS.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Author: Sunil Soman [e-mail]
+  -->
+
+<project name="eucalyptus-storage-rados" basedir=".">
+    <import file="../module-inc.xml"/>
+</project>
+

=== added directory 'clc/modules/storage-rados/conf'
=== added directory 'clc/modules/storage-rados/include'
=== added file 'clc/modules/storage-rados/include/com_dokukino_rados4j_ListCtx.h'
--- clc/modules/storage-rados/include/com_dokukino_rados4j_ListCtx.h	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-rados/include/com_dokukino_rados4j_ListCtx.h	2010-11-15 08:38:14 +0000
@@ -0,0 +1,29 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_dokukino_rados4j_ListCtx */
+
+#ifndef _Included_com_dokukino_rados4j_ListCtx
+#define _Included_com_dokukino_rados4j_ListCtx
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     com_dokukino_rados4j_ListCtx
+ * Method:    more
+ * Signature: (I[Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_ListCtx_more
+  (JNIEnv *, jobject, jint, jobjectArray);
+
+/*
+ * Class:     com_dokukino_rados4j_ListCtx
+ * Method:    close
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_com_dokukino_rados4j_ListCtx_close
+  (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

=== added file 'clc/modules/storage-rados/include/com_dokukino_rados4j_Pool.h'
--- clc/modules/storage-rados/include/com_dokukino_rados4j_Pool.h	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-rados/include/com_dokukino_rados4j_Pool.h	2010-11-15 08:38:14 +0000
@@ -0,0 +1,93 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_dokukino_rados4j_Pool */
+
+#ifndef _Included_com_dokukino_rados4j_Pool
+#define _Included_com_dokukino_rados4j_Pool
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     com_dokukino_rados4j_Pool
+ * Method:    delete
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Pool_delete
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     com_dokukino_rados4j_Pool
+ * Method:    close
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_com_dokukino_rados4j_Pool_close
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     com_dokukino_rados4j_Pool
+ * Method:    createObj
+ * Signature: (Ljava/lang/String;Z)I
+ */
+JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Pool_createObj
+  (JNIEnv *, jobject, jstring, jboolean);
+
+/*
+ * Class:     com_dokukino_rados4j_Pool
+ * Method:    writeObj
+ * Signature: (Ljava/lang/String;J[BJ)I
+ */
+JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Pool_writeObj
+  (JNIEnv *, jobject, jstring, jlong, jbyteArray, jlong);
+
+/*
+ * Class:     com_dokukino_rados4j_Pool
+ * Method:    readObj
+ * Signature: (Ljava/lang/String;J[BJ)I
+ */
+JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Pool_readObj
+  (JNIEnv *, jobject, jstring, jlong, jbyteArray, jlong);
+
+/*
+ * Class:     com_dokukino_rados4j_Pool
+ * Method:    renameObj
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Pool_renameObj
+  (JNIEnv *, jobject, jstring, jstring);
+
+/*
+ * Class:     com_dokukino_rados4j_Pool
+ * Method:    copyObj
+ * Signature: (Ljava/lang/String;Lcom/dokukino/rados4j/Pool;Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Pool_copyObj
+  (JNIEnv *, jobject, jstring, jobject, jstring);
+
+/*
+ * Class:     com_dokukino_rados4j_Pool
+ * Method:    removeObj
+ * Signature: (Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Pool_removeObj
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     com_dokukino_rados4j_Pool
+ * Method:    statObj
+ * Signature: (Ljava/lang/String;)Lcom/dokukino/rados4j/Stat;
+ */
+JNIEXPORT jobject JNICALL Java_com_dokukino_rados4j_Pool_statObj
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     com_dokukino_rados4j_Pool
+ * Method:    openList
+ * Signature: ()Lcom/dokukino/rados4j/ListCtx;
+ */
+JNIEXPORT jobject JNICALL Java_com_dokukino_rados4j_Pool_openList
+  (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

=== added file 'clc/modules/storage-rados/include/com_dokukino_rados4j_Rados.h'
--- clc/modules/storage-rados/include/com_dokukino_rados4j_Rados.h	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-rados/include/com_dokukino_rados4j_Rados.h	2010-11-15 08:38:14 +0000
@@ -0,0 +1,61 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_dokukino_rados4j_Rados */
+
+#ifndef _Included_com_dokukino_rados4j_Rados
+#define _Included_com_dokukino_rados4j_Rados
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     com_dokukino_rados4j_Rados
+ * Method:    initialize
+ * Signature: ([Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Rados_initialize
+  (JNIEnv *, jobject, jobjectArray);
+
+/*
+ * Class:     com_dokukino_rados4j_Rados
+ * Method:    shutdown
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_com_dokukino_rados4j_Rados_shutdown
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     com_dokukino_rados4j_Rados
+ * Method:    openPool
+ * Signature: (Ljava/lang/String;)Lcom/dokukino/rados4j/Pool;
+ */
+JNIEXPORT jobject JNICALL Java_com_dokukino_rados4j_Rados_openPool
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     com_dokukino_rados4j_Rados
+ * Method:    lookupPool
+ * Signature: (Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_com_dokukino_rados4j_Rados_lookupPool
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     com_dokukino_rados4j_Rados
+ * Method:    listPools
+ * Signature: ([Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Rados_listPools
+  (JNIEnv *, jobject, jobjectArray);
+
+/*
+ * Class:     com_dokukino_rados4j_Rados
+ * Method:    createPool
+ * Signature: (Ljava/lang/String;J)I
+ */
+JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Rados_createPool
+  (JNIEnv *, jobject, jstring, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

=== added directory 'clc/modules/storage-rados/lib'
=== added directory 'clc/modules/storage-rados/native'
=== added file 'clc/modules/storage-rados/native/Makefile'
--- clc/modules/storage-rados/native/Makefile	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-rados/native/Makefile	2010-11-15 08:38:14 +0000
@@ -0,0 +1,28 @@
+LIBDIR=../lib
+RADOS4J_SO=librados4j.so
+PLATFORM=linux
+CXXFLAGS=-g -fpic -Wall -D_FILE_OFFSET_BITS=64 -O0 -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/$(PLATFORM) -I. -I../include -I$(RADOS_HOME)/include -L$(RADOS_HOME)/lib -lcrypto -lrados -lcrush
+WARN=-Wall -Wno-unused-variable
+
+.PHONY: all clean install
+
+all: $(LIBDIR)/$(RADOS4J_SO) 
+
+.cpp.o:
+	g++ -c $(WARN) $(CXXFLAGS) $<
+
+$(LIBDIR)/$(RADOS4J_SO): 
+	mkdir -p $(LIBDIR)
+	gcc -shared $(CXXFLAGS) -o $(LIBDIR)/$(RADOS4J_SO) *.cpp
+
+clean:
+	rm -f $(LIBDIR)/$(RADOS4J_SO) *.o *~* *#*  
+
+distclean: clean
+
+install:
+	mkdir -p $(DESTDIR)$(EUCALYPTUS)/usr/lib/eucalyptus/
+	cp $(LIBDIR)/$(RADOS4J_SO) $(DESTDIR)$(EUCALYPTUS)/usr/lib/eucalyptus/
+
+uninstall:
+	rm -r $(DESTDIR)$(EUCALYPTUS)/usr/lib/eucalyptus/$(RADOS4J_SO)

=== added file 'clc/modules/storage-rados/native/com_dokukino_rados4j_ListCtx.cpp'
--- clc/modules/storage-rados/native/com_dokukino_rados4j_ListCtx.cpp	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-rados/native/com_dokukino_rados4j_ListCtx.cpp	2010-11-15 08:38:14 +0000
@@ -0,0 +1,109 @@
+#include "com_dokukino_rados4j_ListCtx.h"
+#include <rados/librados.hpp>
+#include <list>
+
+jclass list_ctx_class = NULL;
+jmethodID list_ctx_constructor = NULL;
+jfieldID list_ctx_instance_ptr = NULL, list_ctx_rados_ptr = NULL;
+
+int
+list_ctx_field_initialize(JNIEnv *env)
+{
+    jclass clsj = env->FindClass("Lcom/dokukino/rados4j/ListCtx;");
+    if (!clsj)
+        return -1;
+    list_ctx_class = reinterpret_cast<jclass>(env->NewGlobalRef(clsj));
+    env->DeleteLocalRef(clsj);
+    list_ctx_constructor = env->GetMethodID(list_ctx_class, "<init>", "()V");
+    if (!list_ctx_constructor)
+        return -1;
+    list_ctx_instance_ptr = env->GetFieldID(list_ctx_class, "instancePtr", "J");
+    if (!list_ctx_instance_ptr)
+        return -1;
+    list_ctx_rados_ptr = env->GetFieldID(list_ctx_class, "radosPtr", "J");
+    if (!list_ctx_rados_ptr)
+        return -1;
+    return 0;
+}
+
+static inline void
+list_ctx_set_instance_ptr(JNIEnv *env, jobject obj, librados::Rados::ListCtx *ptr)
+{
+    env->SetLongField(obj, list_ctx_instance_ptr, reinterpret_cast<long>(ptr));
+}
+
+static inline librados::Rados::ListCtx *
+list_ctx_get_instance_ptr(JNIEnv *env, jobject obj)
+{
+    jlong ptr = env->GetLongField(obj, list_ctx_instance_ptr);
+    return reinterpret_cast<librados::Rados::ListCtx *>(ptr);
+}
+
+static inline librados::Rados *
+list_ctx_get_rados_ptr(JNIEnv *env, jobject obj)
+{
+    jlong ptr = env->GetLongField(obj, list_ctx_rados_ptr);
+    return reinterpret_cast<librados::Rados *>(ptr);
+}
+
+extern "C"
+{
+    /*
+     * Class:     com_dokukino_rados4j_ListCtx
+     * Method:    more
+     * Signature: (I[Ljava/lang/String;)I
+     */
+    JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_ListCtx_more
+    (JNIEnv *env, jobject obj, jint max, jobjectArray entries)
+    {
+        librados::Rados::ListCtx *ctx;
+        librados::Rados *rados;
+        std::list<std::string> entries_list;
+        jint r;
+
+        if (!entries)
+            return -1;
+        ctx = list_ctx_get_instance_ptr(env, obj);
+        if (!ctx)
+            return -1;
+        rados = list_ctx_get_rados_ptr(env, obj);
+        if (!rados)
+            return -1;
+        r = rados->list_objects_more(*ctx, max, entries_list);
+        if (r < 0)
+            return r;
+        int i = 0;
+        const int len = env->GetArrayLength(entries);
+        for (std::list<std::string>::iterator iter = entries_list.begin();
+                i < len && iter != entries_list.end(); ++iter, ++i)
+        {
+            jstring entry = env->NewStringUTF((*iter).c_str());
+            env->SetObjectArrayElement(entries, i, entry);
+        }
+
+        return r;
+    }
+
+    /*
+     * Class:     com_dokukino_rados4j_ListCtx
+     * Method:    close
+     * Signature: ()V
+     */
+    JNIEXPORT void JNICALL Java_com_dokukino_rados4j_ListCtx_close
+    (JNIEnv *env, jobject obj)
+    {
+        librados::Rados::ListCtx *ctx;
+        librados::Rados *rados;
+
+        ctx = list_ctx_get_instance_ptr(env, obj);
+        if (!ctx)
+            return;
+        rados = list_ctx_get_rados_ptr(env, obj);
+        if (!rados)
+            return;
+        rados->list_objects_close(*ctx);
+        delete ctx;
+	list_ctx_set_instance_ptr(env, obj, NULL);
+    }
+
+}

=== added file 'clc/modules/storage-rados/native/com_dokukino_rados4j_Pool.cpp'
--- clc/modules/storage-rados/native/com_dokukino_rados4j_Pool.cpp	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-rados/native/com_dokukino_rados4j_Pool.cpp	2010-11-15 08:38:14 +0000
@@ -0,0 +1,484 @@
+#include "com_dokukino_rados4j_Pool.h"
+#include <rados/librados.hpp>
+#include <iostream>
+
+jclass pool_class = NULL, stat_class = NULL;
+jfieldID pool_instance_ptr = NULL, pool_rados_ptr = NULL, stat_psize = NULL, stat_pmtime = NULL;
+jmethodID pool_constructor = NULL, stat_constructor = NULL;
+
+extern jclass list_ctx_class;
+extern jmethodID list_ctx_constructor;
+extern jfieldID list_ctx_instance_ptr, list_ctx_rados_ptr;
+
+int
+pool_field_initialize(JNIEnv *env)
+{
+    jclass clsj = env->FindClass("Lcom/dokukino/rados4j/Pool;");
+    if (!clsj)
+        return -1;
+    pool_class = reinterpret_cast<jclass>(env->NewGlobalRef(clsj));
+    env->DeleteLocalRef(clsj);
+
+    pool_constructor = env->GetMethodID(pool_class, "<init>", "()V");
+    if (!pool_constructor)
+        return -1;
+    pool_instance_ptr = env->GetFieldID(pool_class, "instancePtr", "J");
+    if (!pool_instance_ptr)
+        return -1;
+    pool_rados_ptr = env->GetFieldID(pool_class, "radosPtr", "J");
+    if (!pool_rados_ptr)
+        return -1;
+    return 0;
+}
+
+int
+stat_field_initialize(JNIEnv *env)
+{
+    jclass clsj = env->FindClass("Lcom/dokukino/rados4j/Stat;");
+    if (!clsj)
+        return -1;
+    stat_class = reinterpret_cast<jclass>(env->NewGlobalRef(clsj));
+    env->DeleteLocalRef(clsj);
+
+    stat_constructor = env->GetMethodID(stat_class, "<init>", "()V");
+    if (!stat_constructor)
+        return -1;
+    stat_psize = env->GetFieldID(stat_class, "psize", "J");
+    if (!stat_psize)
+        return -1;
+    stat_pmtime = env->GetFieldID(stat_class, "pmtime", "J");
+    if (!stat_pmtime)
+        return -1;
+    return 0;
+}
+
+static inline void
+pool_set_instance_ptr(JNIEnv *env, jobject obj, librados::pool_t pool)
+{
+    env->SetLongField(obj, pool_instance_ptr, reinterpret_cast<jlong>(pool));
+}
+
+static inline void
+pool_set_rados_ptr(JNIEnv *env, jobject obj, librados::Rados *rados)
+{
+    env->SetLongField(obj, pool_rados_ptr, reinterpret_cast<jlong>(rados));
+}
+
+static inline librados::pool_t
+pool_get_instance_ptr(JNIEnv *env, jobject obj)
+{
+    jlong ptr = env->GetLongField(obj, pool_instance_ptr);
+    return reinterpret_cast<librados::pool_t>(ptr);
+}
+
+static inline librados::Rados *
+pool_get_rados_ptr(JNIEnv *env, jobject obj)
+{
+    jlong ptr = env->GetLongField(obj, pool_rados_ptr);
+    return reinterpret_cast<librados::Rados *>(ptr);
+}
+
+static inline jobject
+pool_new_instance(JNIEnv *env)
+{
+    return env->NewObject(pool_class, pool_constructor);
+}
+
+static inline jobject
+stat_new_instance(JNIEnv *env)
+{
+    return env->NewObject(stat_class, stat_constructor);
+}
+
+static inline void
+stat_set_psize(JNIEnv *env, jobject obj, uint64_t psize)
+{
+    env->SetLongField(obj, stat_psize, static_cast<jlong>(psize));
+}
+
+static inline void
+stat_set_pmtime(JNIEnv *env, jobject obj, time_t pmtime)
+{
+    env->SetLongField(obj, stat_pmtime, static_cast<jlong>(pmtime));
+}
+
+static inline jobject
+list_ctx_new_instance(JNIEnv *env)
+{
+    return env->NewObject(list_ctx_class, list_ctx_constructor);
+}
+
+static inline void
+list_ctx_set_instance_ptr(JNIEnv *env, jobject obj, librados::Rados::ListCtx *ctx)
+{
+    env->SetLongField(obj, list_ctx_instance_ptr, reinterpret_cast<jlong>(ctx));
+}
+
+static inline void
+list_ctx_set_rados_ptr(JNIEnv *env, jobject obj, librados::Rados *rados)
+{
+    env->SetLongField(obj, list_ctx_rados_ptr, reinterpret_cast<jlong>(rados));
+}
+
+extern "C"
+{
+
+    /*
+     * Class:     com_dokukino_rados4j_Pool
+     * Method:    delete
+     * Signature: ()I
+     */
+    JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Pool_delete
+    (JNIEnv *env, jobject obj)
+    {
+        librados::Rados *rados;
+        librados::pool_t pool_ptr;
+
+        rados = pool_get_rados_ptr(env, obj);
+        if (!rados)
+            return -1;
+        pool_ptr = pool_get_instance_ptr(env, obj);
+        if (!pool_ptr)
+            return -1;
+        return rados->delete_pool(pool_ptr);
+    }
+
+    /*
+     * Class:     com_dokukino_rados4j_Pool
+     * Method:    close
+     * Signature: ()V
+     */
+    JNIEXPORT void JNICALL Java_com_dokukino_rados4j_Pool_close
+    (JNIEnv *env, jobject obj)
+    {
+        librados::Rados *rados;
+        librados::pool_t pool_ptr;
+
+        rados = pool_get_rados_ptr(env, obj);
+        if (!rados)
+            return;
+        pool_ptr = pool_get_instance_ptr(env, obj);
+        if (!pool_ptr)
+            return;
+
+        rados->close_pool(pool_ptr);
+        pool_set_instance_ptr(env, obj, NULL);
+    }
+
+    /*
+     * Class:     com_dokukino_rados4j_Pool
+     * Method:    createObj
+     * Signature: (Ljava/lang/String;Z)I
+     */
+    JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Pool_createObj
+    (JNIEnv *env, jobject obj, jstring oid, jboolean exclusive)
+    {
+        librados::Rados *rados;
+        librados::pool_t pool_ptr;
+        const char *oid_char;
+        jint ret;
+
+        if (!oid)
+            return -1;
+        rados = pool_get_rados_ptr(env, obj);
+        if (!rados)
+            return -1;
+        pool_ptr = pool_get_instance_ptr(env, obj);
+        if (!pool_ptr)
+            return -1;
+        oid_char = env->GetStringUTFChars(oid, NULL);
+        if (!oid_char)
+            return -1;
+        ret = rados->create(pool_ptr, oid_char, exclusive);
+        env->ReleaseStringUTFChars(oid, oid_char);
+        return ret;
+    }
+
+    /*
+     * Class:     com_dokukino_rados4j_Pool
+     * Method:    writeObj
+     * Signature: (Ljava/lang/String;J[BJ)I
+     */
+    JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Pool_writeObj
+    (JNIEnv *env, jobject obj, jstring oid, jlong off, jbyteArray buf, jlong len)
+    {
+        librados::Rados *rados;
+        librados::pool_t pool_ptr;
+        librados::bufferlist bl;
+        const char *oid_char;
+        jbyte* src;
+        jint ret;
+
+        if (!oid || !buf)
+            return -1;
+
+        rados = pool_get_rados_ptr(env, obj);
+        if (!rados)
+            return -1;
+
+        pool_ptr = pool_get_instance_ptr(env, obj);
+        if (!pool_ptr)
+            return -1;
+
+        oid_char = env->GetStringUTFChars(oid, NULL);
+        if (!oid_char)
+            return -1;
+
+        src = env->GetByteArrayElements(buf, NULL);
+        bl.append(reinterpret_cast<char *>(src), len);
+        ret = rados->write(pool_ptr, oid_char, off, bl, len);
+        env->ReleaseByteArrayElements(buf, src, 0);
+        env->ReleaseStringUTFChars(oid, oid_char);
+
+        return ret;
+    }
+
+    /*
+     * Class:     com_dokukino_rados4j_Pool
+     * Method:    readObj
+     * Signature: (Ljava/lang/String;J[BJ)I
+     */
+    JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Pool_readObj
+    (JNIEnv *env, jobject obj, jstring oid, jlong off, jbyteArray buf, jlong len)
+    {
+        librados::Rados *rados;
+        librados::pool_t pool_ptr;
+        librados::bufferlist bl;
+        const char *oid_char;
+        jint ret;
+
+        if (!oid || !buf)
+            return -1;
+        rados = pool_get_rados_ptr(env, obj);
+        if (!rados)
+            return -1;
+        pool_ptr = pool_get_instance_ptr(env, obj);
+        if (!pool_ptr)
+            return -1;
+        oid_char = env->GetStringUTFChars(oid, NULL);
+        if (!oid_char)
+            return -1;
+
+        ret = rados->read(pool_ptr, oid_char, off, bl, len);
+
+        if (ret > 0)
+            env->SetByteArrayRegion(buf, 0, ret, reinterpret_cast<jbyte*>(bl.c_str()));
+        env->ReleaseStringUTFChars(oid, oid_char);
+
+        return ret;
+    }
+
+
+    /*
+     * Class:     com_dokukino_rados4j_Pool
+     * Method:    renameObj
+     * Signature: (Ljava/lang/String;Ljava/lang/String;)I
+     */
+    JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Pool_renameObj
+    (JNIEnv *env, jobject obj, jstring old_oid, jstring new_oid)
+    {
+        librados::Rados *rados;
+        librados::pool_t pool_ptr;
+        librados::bufferlist bl;
+        const char *old_oid_char, *new_oid_char;
+        jint ret;
+
+        if (!old_oid || !new_oid)
+            return -1;
+        rados = pool_get_rados_ptr(env, obj);
+        if (!rados)
+            return -1;
+        pool_ptr = pool_get_instance_ptr(env, obj);
+        if (!pool_ptr)
+            return -1;
+        old_oid_char = env->GetStringUTFChars(old_oid, NULL);
+        if (!old_oid_char)
+            return -1;
+        new_oid_char = env->GetStringUTFChars(new_oid, NULL);
+        if (!new_oid_char)
+        {
+            env->ReleaseStringUTFChars(old_oid, old_oid_char);
+            return -1;
+        }
+
+        ret = rados->read(pool_ptr, old_oid_char, 0, bl, 0);
+        if (ret < 0)
+            goto err;
+
+        ret = rados->write_full(pool_ptr, new_oid_char, bl);
+        if (ret < 0)
+            goto err;
+
+        rados->remove(pool_ptr, old_oid_char);
+err:
+        env->ReleaseStringUTFChars(old_oid, old_oid_char);
+        env->ReleaseStringUTFChars(new_oid, new_oid_char);
+        return ret;
+    }
+
+    /*
+     * Class:     com_dokukino_rados4j_Pool
+     * Method:    copyObj
+     * Signature: (Ljava/lang/String;Lcom/dokukino/rados4j/Pool;Ljava/lang/String;)I
+     */
+    JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Pool_copyObj
+    (JNIEnv *env, jobject obj, jstring src_oid, jobject dest_pool, jstring dest_oid)
+    {
+        librados::Rados *rados;
+        librados::pool_t src_pool_ptr, dest_pool_ptr;
+        librados::bufferlist bl;
+        const char *src_oid_char, *dest_oid_char;
+        jint ret;
+
+        if (!src_oid || !dest_pool || !dest_oid)
+            return -1;
+        rados = pool_get_rados_ptr(env, obj);
+        if (!rados)
+            return -1;
+        src_pool_ptr = pool_get_instance_ptr(env, obj);
+        if (!src_pool_ptr)
+            return -1;
+        dest_pool_ptr = pool_get_instance_ptr(env, dest_pool);
+        if (!dest_pool_ptr)
+            return -1;
+        src_oid_char = env->GetStringUTFChars(src_oid, NULL);
+        if (!src_oid_char)
+            return -1;
+        dest_oid_char = env->GetStringUTFChars(dest_oid, NULL);
+        if (!dest_oid_char)
+        {
+            env->ReleaseStringUTFChars(src_oid, src_oid_char);
+            return -1;
+        }
+
+        ret = rados->read(src_pool_ptr, src_oid_char, 0, bl, 0);
+        if (ret < 0)
+            goto err;
+
+        ret = rados->write_full(dest_pool_ptr, dest_oid_char, bl);
+        if (ret < 0)
+            goto err;
+
+err:
+        env->ReleaseStringUTFChars(src_oid, src_oid_char);
+        env->ReleaseStringUTFChars(dest_oid, dest_oid_char);
+        return ret;
+    }
+
+
+    /*
+     * Class:     com_dokukino_rados4j_Pool
+     * Method:    removeObj
+     * Signature: (Ljava/lang/String;)I
+     */
+    JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Pool_removeObj
+    (JNIEnv *env, jobject obj, jstring oid)
+    {
+        librados::Rados *rados;
+        librados::pool_t pool_ptr;
+        const char *oid_char;
+        jint ret;
+
+        if (!oid)
+            return -1;
+        rados = pool_get_rados_ptr(env, obj);
+        if (!rados)
+            return -1;
+        pool_ptr = pool_get_instance_ptr(env, obj);
+        if (!pool_ptr)
+            return -1;
+        oid_char = env->GetStringUTFChars(oid, NULL);
+        if (!oid_char)
+            return -1;
+        ret = rados->remove(pool_ptr, oid_char);
+        env->ReleaseStringUTFChars(oid, oid_char);
+
+        return ret;
+    }
+
+    /*
+     * Class:     com_dokukino_rados4j_Pool
+     * Method:    statObj
+     * Signature: (Ljava/lang/String;)Lcom/dokukino/rados4j/Stat;
+     */
+    JNIEXPORT jobject JNICALL Java_com_dokukino_rados4j_Pool_statObj
+    (JNIEnv *env, jobject obj, jstring oid)
+    {
+        librados::Rados *rados;
+        librados::pool_t pool_ptr;
+        const char *oid_char;
+        uint64_t psize;
+        time_t pmtime;
+        jint ret;
+
+        if (!oid)
+            return NULL;
+
+        rados = pool_get_rados_ptr(env, obj);
+        if (!rados)
+            return NULL;
+
+        pool_ptr = pool_get_instance_ptr(env, obj);
+        if (!pool_ptr)
+            return NULL;
+
+        oid_char = env->GetStringUTFChars(oid, NULL);
+        if (!oid_char)
+            return NULL;
+
+        ret = rados->stat(pool_ptr, oid_char, &psize, &pmtime);
+
+        env->ReleaseStringUTFChars(oid, oid_char);
+        if (ret < 0)
+            return NULL;
+        else
+        {
+            jobject obj = stat_new_instance(env);
+            if (!obj)
+                return NULL;
+            stat_set_psize(env, obj, psize);
+            stat_set_pmtime(env, obj, pmtime);
+            return obj;
+        }
+    }
+
+    /*
+     * Class:     com_dokukino_rados4j_Pool
+     * Method:    openList
+     * Signature: ()Lcom/dokukino/rados4j/ListCtx;
+     */
+    JNIEXPORT jobject JNICALL Java_com_dokukino_rados4j_Pool_openList
+    (JNIEnv *env, jobject obj)
+    {
+        librados::Rados *rados;
+        librados::pool_t pool_ptr;
+        librados::Rados::ListCtx *ctx = NULL;
+        jint ret;
+
+        rados = pool_get_rados_ptr(env, obj);
+        if (!rados)
+            return NULL;
+
+        pool_ptr = pool_get_instance_ptr(env, obj);
+        if (!pool_ptr)
+            return NULL;
+
+        ctx = new librados::Rados::ListCtx();
+        ret = rados->list_objects_open(pool_ptr, ctx);
+
+        if (ret < 0)
+        {
+            delete ctx;
+            return NULL;
+        }
+        else
+        {
+            jobject obj = list_ctx_new_instance(env);
+            if (!obj)
+                return NULL;
+            list_ctx_set_instance_ptr(env, obj, ctx);
+            list_ctx_set_rados_ptr(env, obj, rados);
+            return obj;
+        }
+    }
+}

=== added file 'clc/modules/storage-rados/native/com_dokukino_rados4j_Rados.cpp'
--- clc/modules/storage-rados/native/com_dokukino_rados4j_Rados.cpp	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-rados/native/com_dokukino_rados4j_Rados.cpp	2010-11-15 08:38:14 +0000
@@ -0,0 +1,245 @@
+#include "com_dokukino_rados4j_Rados.h"
+#include <rados/librados.hpp>
+#include <iostream>
+
+static jfieldID rados_instance_ptr = NULL;
+
+extern jclass pool_class;
+extern jfieldID pool_instance_ptr, pool_rados_ptr;
+extern jmethodID pool_constructor;
+
+extern int pool_field_initialize(JNIEnv *);
+extern int stat_field_initialize(JNIEnv *);
+extern int list_ctx_field_initialize(JNIEnv *);
+
+static int
+rados_field_initialize(JNIEnv *env)
+{
+    jclass clsj = env->FindClass("Lcom/dokukino/rados4j/Rados;");
+    if (!clsj)
+    {
+        printf("findclass failed\n");
+        return -1;
+    }
+    rados_instance_ptr = env->GetFieldID(clsj, "instancePtr", "J");
+    if (!rados_instance_ptr)
+    {
+        printf("getfieldid failed\n");
+        return -1;
+    }
+    return 0;
+}
+
+static inline void
+rados_set_instance_ptr(JNIEnv *env, jobject obj, librados::Rados *rados)
+{
+    env->SetLongField(obj, rados_instance_ptr, reinterpret_cast<jlong>(rados));
+}
+
+static inline librados::Rados *
+rados_get_instance_ptr(JNIEnv *env, jobject obj)
+{
+    jlong ptr = env->GetLongField(obj, rados_instance_ptr);
+    return reinterpret_cast<librados::Rados *>(ptr);
+}
+
+static inline jobject
+pool_new_instance(JNIEnv *env)
+{
+    return env->NewObject(pool_class, pool_constructor);
+}
+
+static inline void
+pool_set_instance_ptr(JNIEnv *env, jobject obj, librados::pool_t pool)
+{
+    env->SetLongField(obj, pool_instance_ptr, reinterpret_cast<jlong>(pool));
+}
+
+static inline void
+pool_set_rados_ptr(JNIEnv *env, jobject obj, librados::Rados *rados)
+{
+    env->SetLongField(obj, pool_rados_ptr, reinterpret_cast<jlong>(rados));
+}
+
+extern "C"
+{
+    /*
+     * Class:     com_dokukino_rados4j_Rados
+     * Method:    initialize
+     * Signature: ([Ljava/lang/String;)I
+     */
+    JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Rados_initialize
+    (JNIEnv *env, jobject obj, jobjectArray args)
+    {
+        jint ret;
+        librados::Rados *rados;
+        ret = rados_field_initialize(env);
+        if (ret)
+            return -1;
+
+        ret = pool_field_initialize(env);
+        if (ret)
+            return -1;
+
+        ret = stat_field_initialize(env);
+        if (ret)
+            return -1;
+
+        ret = list_ctx_field_initialize(env);
+        if (ret)
+            return -1;
+
+        rados = new librados::Rados();
+        if (!rados)
+            return -1;
+
+        ret = rados->initialize(0, NULL);
+        rados_set_instance_ptr(env, obj, rados);
+        return ret;
+    }
+
+    /*
+     * Class:     com_dokukino_rados4j_Rados
+     * Method:    shutdown
+     * Signature: ()V
+     */
+    JNIEXPORT void JNICALL Java_com_dokukino_rados4j_Rados_shutdown
+    (JNIEnv *env, jobject obj)
+    {
+        librados::Rados *rados;
+
+        rados = rados_get_instance_ptr(env, obj);
+        if (!rados)
+            return;
+        rados->shutdown();
+        delete rados;
+	rados_set_instance_ptr(env, obj, NULL);
+    }
+
+    /*
+     * Class:     com_dokukino_rados4j_Rados
+     * Method:    openPool
+     * Signature: (Ljava/lang/String;Lcom/dokukino/rados4j/Pool;)I
+     */
+    JNIEXPORT jobject JNICALL Java_com_dokukino_rados4j_Rados_openPool
+    (JNIEnv *env, jobject obj, jstring name)
+    {
+        librados::Rados *rados;
+        const char *name_char;
+        librados::pool_t pool;
+        jint ret;
+
+        if (!name)
+            return NULL;
+        rados = rados_get_instance_ptr(env, obj);
+        if (!rados)
+            return NULL;
+        name_char = env->GetStringUTFChars(name, NULL);
+        if (!name_char)
+            return NULL;
+        ret = rados->open_pool(name_char, &pool);
+
+        env->ReleaseStringUTFChars(name, name_char);
+        if (ret < 0)
+            return NULL;
+        else
+        {
+            jobject obj = pool_new_instance(env);
+            if (!obj)
+            {
+                rados->close_pool(pool);
+                return NULL;
+            }
+            pool_set_instance_ptr(env, obj, pool);
+            pool_set_rados_ptr(env, obj, rados);
+            return obj;
+        }
+    }
+
+    /*
+     * Class:     com_dokukino_rados4j_Rados
+     * Method:    lookupPool
+     * Signature: (Ljava/lang/String;)Z
+     */
+    JNIEXPORT jboolean JNICALL Java_com_dokukino_rados4j_Rados_lookupPool
+    (JNIEnv *env, jobject obj, jstring name)
+    {
+        librados::Rados *rados;
+        const char *name_char;
+        int ret;
+
+        if (!name)
+            return -1;
+
+        rados = rados_get_instance_ptr(env, obj);
+        if (!rados)
+            return -1;
+
+        name_char = env->GetStringUTFChars(name, NULL);
+        if (!name_char)
+            return -1;
+
+        ret = rados->lookup_pool(name_char);
+        env->ReleaseStringUTFChars(name, name_char);
+
+        return (ret > 0);
+    }
+
+    /*
+     * Class:     com_dokukino_rados4j_Rados
+     * Method:    listPools
+     * Signature: ([Ljava/lang/String;)I
+     */
+    JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Rados_listPools
+    (JNIEnv *env, jobject obj, jobjectArray entries)
+    {
+        librados::Rados *rados;
+        std::list<std::string> entries_list;
+        int r;
+
+        if (!entries)
+            return -1;
+
+        rados = rados_get_instance_ptr(env, obj);
+        if (!rados)
+            return -1;
+
+        r = rados->list_pools(entries_list);
+        if (r < 0)
+            return r;
+
+        int i = 0;
+        const int len = env->GetArrayLength(entries);
+        for (std::list<std::string>::iterator iter = entries_list.begin();
+                i < len && iter != entries_list.end(); ++iter, ++i)
+        {
+            jstring entry = env->NewStringUTF((*iter).c_str());
+            env->SetObjectArrayElement(entries, i, entry);
+        }
+
+        return r;
+    }
+
+    /*
+     * Class:     com_dokukino_rados4j_Rados
+     * Method:    createPool
+     * Signature: (Ljava/lang/String;J)I
+     */
+    JNIEXPORT jint JNICALL Java_com_dokukino_rados4j_Rados_createPool
+    (JNIEnv *env, jobject obj, jstring name, jlong auid)
+    {
+        librados::Rados *rados;
+        const char *name_char;
+
+        if (!name)
+            return -1;
+        rados = rados_get_instance_ptr(env, obj);
+        if (!rados)
+            return -1;
+        name_char = env->GetStringUTFChars(name, NULL);
+        if (!name_char)
+            return -1;
+        return rados->create_pool(name_char, auid);
+    }
+
+}

=== added directory 'clc/modules/storage-rados/src'
=== added directory 'clc/modules/storage-rados/src/main'
=== added directory 'clc/modules/storage-rados/src/main/java'
=== added directory 'clc/modules/storage-rados/src/main/java/com'
=== added directory 'clc/modules/storage-rados/src/main/java/com/dokukino'
=== added directory 'clc/modules/storage-rados/src/main/java/com/dokukino/rados4j'
=== added file 'clc/modules/storage-rados/src/main/java/com/dokukino/rados4j/ListCtx.java'
--- clc/modules/storage-rados/src/main/java/com/dokukino/rados4j/ListCtx.java	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-rados/src/main/java/com/dokukino/rados4j/ListCtx.java	2010-11-15 08:38:14 +0000
@@ -0,0 +1,68 @@
+/*******************************************************************************
+*Copyright (c) 2010  Takuya ASADA
+* 
+*  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, only version 3 of the License.
+* 
+* 
+*  This file 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/>.
+* 
+*  Please contact Eucalyptus Systems, Inc., 130 Castilian
+*  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
+*  if you need additional information or have any questions.
+* 
+*  This file may incorporate work covered under the following copyright and
+*  permission notice:
+* 
+*    Software License Agreement (BSD License)
+* 
+*    Copyright (c) 2008, Regents of the University of California
+*    All rights reserved.
+* 
+*    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 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. USERS OF
+*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
+*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
+*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
+*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
+*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
+*    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
+*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
+*    ANY SUCH LICENSES OR RIGHTS.
+*******************************************************************************/
+package com.dokukino.rados4j;
+
+public class ListCtx {
+	private long radosPtr, instancePtr;
+	
+	public native int more(int max, String[] entries);
+	public native void close();
+}

=== added file 'clc/modules/storage-rados/src/main/java/com/dokukino/rados4j/Pool.java'
--- clc/modules/storage-rados/src/main/java/com/dokukino/rados4j/Pool.java	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-rados/src/main/java/com/dokukino/rados4j/Pool.java	2010-11-15 08:38:14 +0000
@@ -0,0 +1,76 @@
+/*******************************************************************************
+*Copyright (c) 2010  Takuya ASADA
+* 
+*  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, only version 3 of the License.
+* 
+* 
+*  This file 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/>.
+* 
+*  Please contact Eucalyptus Systems, Inc., 130 Castilian
+*  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
+*  if you need additional information or have any questions.
+* 
+*  This file may incorporate work covered under the following copyright and
+*  permission notice:
+* 
+*    Software License Agreement (BSD License)
+* 
+*    Copyright (c) 2008, Regents of the University of California
+*    All rights reserved.
+* 
+*    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 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. USERS OF
+*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
+*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
+*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
+*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
+*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
+*    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
+*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
+*    ANY SUCH LICENSES OR RIGHTS.
+*******************************************************************************/
+package com.dokukino.rados4j;
+
+public class Pool {
+	private long radosPtr, instancePtr;
+
+	public native int delete();
+	public native void close();
+	public native int createObj(String oid, boolean exclusive);
+	public native int writeObj(String oid, long off, byte[] buf, long len);
+	public native int readObj(String oid, long off, byte[] buf, long len);
+	public native int renameObj(String oldOid, String newOid);
+	public native int copyObj(String srcOid, Pool destPool, String destOid);
+	public native int removeObj(String oid);
+	public native Stat statObj(String oid);
+	public native ListCtx openList();
+}

=== added file 'clc/modules/storage-rados/src/main/java/com/dokukino/rados4j/Rados.java'
--- clc/modules/storage-rados/src/main/java/com/dokukino/rados4j/Rados.java	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-rados/src/main/java/com/dokukino/rados4j/Rados.java	2010-11-15 08:38:14 +0000
@@ -0,0 +1,77 @@
+/*******************************************************************************
+*Copyright (c) 2010  Takuya ASADA
+* 
+*  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, only version 3 of the License.
+* 
+* 
+*  This file 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/>.
+* 
+*  Please contact Eucalyptus Systems, Inc., 130 Castilian
+*  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
+*  if you need additional information or have any questions.
+* 
+*  This file may incorporate work covered under the following copyright and
+*  permission notice:
+* 
+*    Software License Agreement (BSD License)
+* 
+*    Copyright (c) 2008, Regents of the University of California
+*    All rights reserved.
+* 
+*    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 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. USERS OF
+*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
+*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
+*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
+*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
+*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
+*    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
+*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
+*    ANY SUCH LICENSES OR RIGHTS.
+*******************************************************************************/
+package com.dokukino.rados4j;
+
+public class Rados {
+    private long instancePtr;
+
+    static {
+	System.loadLibrary("rados4j");
+    }
+
+    public native int initialize(String[] args);
+    public native void shutdown();
+    public native Pool openPool(String name);
+    public native boolean lookupPool(String name);
+    public native int listPools(String[] v);	
+    public native int createPool(String name, long auid);
+    public int createPool(String name) { return createPool(name, 0); }
+}

=== added file 'clc/modules/storage-rados/src/main/java/com/dokukino/rados4j/Stat.java'
--- clc/modules/storage-rados/src/main/java/com/dokukino/rados4j/Stat.java	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-rados/src/main/java/com/dokukino/rados4j/Stat.java	2010-11-15 08:38:14 +0000
@@ -0,0 +1,76 @@
+/*******************************************************************************
+*Copyright (c) 2010  Takuya ASADA
+* 
+*  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, only version 3 of the License.
+* 
+* 
+*  This file 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/>.
+* 
+*  Please contact Eucalyptus Systems, Inc., 130 Castilian
+*  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
+*  if you need additional information or have any questions.
+* 
+*  This file may incorporate work covered under the following copyright and
+*  permission notice:
+* 
+*    Software License Agreement (BSD License)
+* 
+*    Copyright (c) 2008, Regents of the University of California
+*    All rights reserved.
+* 
+*    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 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. USERS OF
+*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
+*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
+*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
+*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
+*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
+*    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
+*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
+*    ANY SUCH LICENSES OR RIGHTS.
+*******************************************************************************/
+package com.dokukino.rados4j;
+
+import java.util.Date;
+
+public class Stat {
+    private long psize;
+    private long pmtime;
+	
+    public long getSize() {
+	return psize;
+    }
+
+    public long getMtime() {
+	return pmtime;
+    }
+}

=== added directory 'clc/modules/storage-rados/src/main/java/edu'
=== added directory 'clc/modules/storage-rados/src/main/java/edu/ucsb'
=== added directory 'clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus'
=== added directory 'clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus/cloud'
=== added directory 'clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus/cloud/ws'
=== added file 'clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus/cloud/ws/ChunkedRadosObject.java'
--- clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus/cloud/ws/ChunkedRadosObject.java	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus/cloud/ws/ChunkedRadosObject.java	2010-11-15 08:38:14 +0000
@@ -0,0 +1,125 @@
+/*******************************************************************************
+*Copyright (c) 2009  Eucalyptus Systems, Inc.
+* 
+*  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, only version 3 of the License.
+* 
+* 
+*  This file 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/>.
+* 
+*  Please contact Eucalyptus Systems, Inc., 130 Castilian
+*  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
+*  if you need additional information or have any questions.
+* 
+*  This file may incorporate work covered under the following copyright and
+*  permission notice:
+* 
+*    Software License Agreement (BSD License)
+* 
+*    Copyright (c) 2008, Regents of the University of California
+*    All rights reserved.
+* 
+*    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 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. USERS OF
+*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
+*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
+*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
+*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
+*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
+*    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
+*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
+*    ANY SUCH LICENSES OR RIGHTS.
+*******************************************************************************/
+package edu.ucsb.eucalyptus.cloud.ws;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.apache.log4j.Logger;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.handler.stream.ChunkedInput;
+
+import edu.ucsb.eucalyptus.constants.IsData;
+
+import com.dokukino.rados4j.*;
+
+public class ChunkedRadosObject implements ChunkedInput, IsData {
+	private Logger LOG = Logger.getLogger( ChunkedRadosObject.class );
+	private Pool pool;
+	private String object;
+	private long offset;
+	private int CHUNK_SIZE = 8192;
+	private long length;
+
+	public ChunkedRadosObject(Pool pool, String object, long length) {
+		this.pool = pool;
+		this.object = object;
+		this.offset = 0;
+		this.length = length;
+	}
+
+	public ChunkedRadosObject(Pool pool, String object, long start, long end, int chunkSize) {
+		this.pool = pool;
+		this.object = object;
+		this.offset = start;
+		this.length = end;
+		CHUNK_SIZE = chunkSize;
+	}
+	
+	@Override
+	public void close() throws Exception {
+		pool.close();
+	}
+
+	@Override
+	public boolean hasNextChunk() throws Exception {
+		return offset < length;
+	}
+
+	@Override
+	public Object nextChunk() throws Exception {
+		long offset = this.offset;
+		if (offset >= length) {
+			return null;
+		}
+		int chunkSize = (int) Math.min(CHUNK_SIZE, length - offset);
+		byte[] chunk = new byte[chunkSize];
+		int ret = pool.readObj(object, offset, chunk, chunkSize);
+		if (ret < 0)
+			throw new IOException("Unable to read object: " + object);
+		this.offset = offset + chunkSize;
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
+		out.write(chunk);
+		out.close();
+		return ChannelBuffers.wrappedBuffer(out.toByteArray());
+	}	
+}
+

=== added file 'clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus/cloud/ws/CompressedChunkedRadosObject.java'
--- clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus/cloud/ws/CompressedChunkedRadosObject.java	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus/cloud/ws/CompressedChunkedRadosObject.java	2010-11-15 08:38:14 +0000
@@ -0,0 +1,127 @@
+/*******************************************************************************
+*Copyright (c) 2009  Eucalyptus Systems, Inc.
+* 
+*  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, only version 3 of the License.
+* 
+* 
+*  This file 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/>.
+* 
+*  Please contact Eucalyptus Systems, Inc., 130 Castilian
+*  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
+*  if you need additional information or have any questions.
+* 
+*  This file may incorporate work covered under the following copyright and
+*  permission notice:
+* 
+*    Software License Agreement (BSD License)
+* 
+*    Copyright (c) 2008, Regents of the University of California
+*    All rights reserved.
+* 
+*    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 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. USERS OF
+*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
+*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
+*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
+*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
+*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
+*    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
+*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
+*    ANY SUCH LICENSES OR RIGHTS.
+*******************************************************************************/
+package edu.ucsb.eucalyptus.cloud.ws;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.zip.GZIPOutputStream;
+
+import org.apache.log4j.Logger;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.handler.stream.ChunkedInput;
+
+import edu.ucsb.eucalyptus.constants.IsData;
+
+import com.dokukino.rados4j.*;
+
+public class CompressedChunkedRadosObject implements ChunkedInput, IsData {
+	private Logger LOG = Logger.getLogger( CompressedChunkedRadosObject.class );
+	private Pool pool;
+	private String object;
+	private long offset;
+	private int CHUNK_SIZE = 8192;
+	private long length;
+
+	public CompressedChunkedRadosObject(Pool pool, String object, long length) {
+		this.pool = pool;
+		this.object = object;
+		this.offset = 0;
+		this.length = length;
+	}
+
+	public CompressedChunkedRadosObject(Pool pool, String object, long start, long end, int chunkSize) {
+		this.pool = pool;
+		this.object = object;
+		this.offset = start;
+		this.length = end;
+		CHUNK_SIZE = chunkSize;
+	}
+	
+	@Override
+	public void close() throws Exception {
+		pool.close();
+	}
+
+	@Override
+	public boolean hasNextChunk() throws Exception {
+		return offset < length;
+	}
+	
+	@Override
+	public Object nextChunk() throws Exception {
+		long offset = this.offset;
+		if (offset >= length) {
+			return null;
+		}
+		int chunkSize = (int) Math.min(CHUNK_SIZE, length - offset);
+		byte[] chunk = new byte[chunkSize];
+		int ret = pool.readObj(object, offset, chunk, chunkSize);
+		if (ret < 0)
+			throw new IOException("Unable to read object: " + object);
+		this.offset = offset + chunkSize;
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
+		GZIPOutputStream zip = new GZIPOutputStream(out);
+		zip.write(chunk);
+		zip.close();
+		return ChannelBuffers.wrappedBuffer(out.toByteArray());
+	}	
+}
+

=== added directory 'clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus/storage'
=== added file 'clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus/storage/StorageManagerFactory.java'
--- clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus/storage/StorageManagerFactory.java	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus/storage/StorageManagerFactory.java	2010-11-15 08:38:14 +0000
@@ -0,0 +1,71 @@
+/*******************************************************************************
+*Copyright (c) 2010 Takuya ASADA
+* 
+*  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, only version 3 of the License.
+* 
+* 
+*  This file 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/>.
+* 
+*  Please contact Eucalyptus Systems, Inc., 130 Castilian
+*  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
+*  if you need additional information or have any questions.
+* 
+*  This file may incorporate work covered under the following copyright and
+*  permission notice:
+* 
+*    Software License Agreement (BSD License)
+* 
+*    Copyright (c) 2008, Regents of the University of California
+*    All rights reserved.
+* 
+*    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 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. USERS OF
+*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
+*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
+*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
+*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
+*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
+*    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
+*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
+*    ANY SUCH LICENSES OR RIGHTS.
+*******************************************************************************/
+
+package edu.ucsb.eucalyptus.storage;
+
+import edu.ucsb.eucalyptus.cloud.entities.WalrusInfo;
+import edu.ucsb.eucalyptus.storage.rados.RadosStorageManager;
+
+public class StorageManagerFactory {
+    public static StorageManager getStorageManager(WalrusInfo walrusInfo) {
+	return new RadosStorageManager(walrusInfo);
+    }
+}

=== added directory 'clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus/storage/rados'
=== added file 'clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus/storage/rados/RadosReader.java'
--- clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus/storage/rados/RadosReader.java	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus/storage/rados/RadosReader.java	2010-11-15 08:38:14 +0000
@@ -0,0 +1,118 @@
+/*******************************************************************************
+*Copyright (c) 2009  Eucalyptus Systems, Inc.
+* 
+*  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, only version 3 of the License.
+* 
+* 
+*  This file 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/>.
+* 
+*  Please contact Eucalyptus Systems, Inc., 130 Castilian
+*  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
+*  if you need additional information or have any questions.
+* 
+*  This file may incorporate work covered under the following copyright and
+*  permission notice:
+* 
+*    Software License Agreement (BSD License)
+* 
+*    Copyright (c) 2008, Regents of the University of California
+*    All rights reserved.
+* 
+*    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 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. USERS OF
+*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
+*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
+*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
+*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
+*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
+*    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
+*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
+*    ANY SUCH LICENSES OR RIGHTS.
+*******************************************************************************/
+
+package edu.ucsb.eucalyptus.storage.rados;
+
+import edu.ucsb.eucalyptus.storage.StorageIO;
+
+import org.apache.log4j.Logger;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+import com.dokukino.rados4j.*;
+
+public  class RadosReader extends StorageIO {
+
+    private static Logger LOG = Logger.getLogger(RadosReader.class);
+    private ByteBuffer buffer;
+    private Pool pool;
+    private String object;
+    private long size;
+
+    public RadosReader(Pool pool, String object) throws Exception {
+	Stat stat;
+
+	this.pool = pool;
+	this.object = object;
+	buffer = ByteBuffer.allocate(102400/*TODO: NEIL WalrusQueryDispatcher.DATA_MESSAGE_SIZE */);
+	stat = pool.statObj(object);
+	if (stat == null) {
+	    IOException ex = new IOException("Unable to stat object:" + object);
+	    LOG.error(ex);
+	    throw ex;
+	}
+	size = stat.getSize();
+    }
+
+    public  int read(long offset) throws IOException {
+	byte[] buf;
+
+	buf = new byte[(int)(size - offset)];
+	buffer.clear();
+	int bytesRead = pool.readObj(object, offset, buf, buf.length);
+	buffer.put(buf, 0, bytesRead);
+	buffer.flip();
+	return bytesRead;
+    }
+
+    public  void write(byte[] bytes) throws IOException {}
+
+    public ByteBuffer getBuffer() {
+	return buffer;
+    }
+
+    public void finish() {
+	pool.close();
+    }
+}
+

=== added file 'clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus/storage/rados/RadosStorageManager.java'
--- clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus/storage/rados/RadosStorageManager.java	1970-01-01 00:00:00 +0000
+++ clc/modules/storage-rados/src/main/java/edu/ucsb/eucalyptus/storage/rados/RadosStorageManager.java	2010-11-15 08:38:14 +0000
@@ -0,0 +1,497 @@
+/*******************************************************************************
+ *Copyright (c) 2009  Eucalyptus Systems, Inc.
+ * 
+ *  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, only version 3 of the License.
+ * 
+ * 
+ *  This file 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/>.
+ * 
+ *  Please contact Eucalyptus Systems, Inc., 130 Castilian
+ *  Dr., Goleta, CA 93101 USA or visit <http://www.eucalyptus.com/licenses/>
+ *  if you need additional information or have any questions.
+ * 
+ *  This file may incorporate work covered under the following copyright and
+ *  permission notice:
+ * 
+ *    Software License Agreement (BSD License)
+ * 
+ *    Copyright (c) 2008, Regents of the University of California
+ *    All rights reserved.
+ * 
+ *    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 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. USERS OF
+ *    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
+ *    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
+ *    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
+ *    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
+ *    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
+ *    THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+ *    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
+ *    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
+ *    ANY SUCH LICENSES OR RIGHTS.
+ *******************************************************************************/
+
+package edu.ucsb.eucalyptus.storage.rados;
+
+import com.eucalyptus.auth.util.Hashes;
+import com.eucalyptus.context.Contexts;
+import com.eucalyptus.http.MappingHttpResponse;
+import com.eucalyptus.util.EucalyptusCloudException;
+import com.eucalyptus.util.ExecutionException;
+import com.eucalyptus.util.WalrusProperties;
+import com.eucalyptus.ws.util.ChannelUtil;
+import com.eucalyptus.ws.util.WalrusBucketLogger;
+
+import edu.ucsb.eucalyptus.cloud.BucketLogData;
+import edu.ucsb.eucalyptus.cloud.ws.CompressedChunkedRadosObject;
+import edu.ucsb.eucalyptus.cloud.ws.ChunkedRadosObject;
+import edu.ucsb.eucalyptus.msgs.WalrusDataGetRequestType;
+import edu.ucsb.eucalyptus.storage.StorageManager;
+import edu.ucsb.eucalyptus.storage.StorageIO;
+import edu.ucsb.eucalyptus.util.StreamConsumer;
+import edu.ucsb.eucalyptus.util.SystemUtil;
+
+import edu.ucsb.eucalyptus.cloud.entities.WalrusInfo;
+
+import org.apache.log4j.Logger;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelFutureListener;
+import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
+import org.jboss.netty.handler.codec.http.HttpHeaders;
+import org.jboss.netty.handler.stream.ChunkedInput;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.dokukino.rados4j.*;
+
+public class RadosStorageManager implements StorageManager {
+
+	public static final String lvmRootDirectory = "/dev";
+	private static boolean initialized = false;
+	private static String eucaHome = "/opt/eucalyptus";
+	public static final String EUCA_ROOT_WRAPPER = "/usr/lib/eucalyptus/euca_rootwrap";
+	public static final int MAX_LOOP_DEVICES = 256;
+	private static Logger LOG = Logger.getLogger(RadosStorageManager.class);
+	private Rados rados = new Rados();
+
+	public RadosStorageManager(WalrusInfo walrusInfo) {
+		rados.initialize(new String[0]);
+	}
+
+	public void setRootDirectory(String directory) {
+	}
+	
+	public void checkPreconditions() throws EucalyptusCloudException {
+		try {
+			String eucaHomeDir = System.getProperty("euca.home");
+			if(eucaHomeDir == null) {
+				throw new EucalyptusCloudException("euca.home not set");
+			}
+			eucaHome = eucaHomeDir;
+			if(!new File(eucaHome + EUCA_ROOT_WRAPPER).exists()) {
+				throw new EucalyptusCloudException("root wrapper (euca_rootwrap) does not exist");
+			}
+			String returnValue = getLvmVersion();
+			if(returnValue.length() == 0) {
+				throw new EucalyptusCloudException("Is lvm installed?");
+			} else {
+				LOG.info(returnValue);
+			}
+		} catch(ExecutionException ex) {
+			String error = "Unable to run command: " + ex.getMessage();
+			LOG.error(error);
+			throw new EucalyptusCloudException(error);
+		}
+	}
+
+	public boolean bucketExists(String bucket) {
+		return rados.lookupPool(bucket);
+	}
+
+	public boolean objectExists(String bucket, String object) {
+		Pool pool = rados.openPool(bucket);
+		if (pool == null)
+			return false;
+		Stat stat = pool.statObj(object);
+		pool.close();
+		return (stat != null);
+	}
+
+	public void createBucket(String bucket) throws IOException {
+		int res = rados.createPool(bucket);
+		if (res != 0)
+			throw new IOException("Unable to create bucket: " + bucket);
+	}
+
+	public long getSize(String bucket, String object) {
+		Pool pool = rados.openPool(bucket);
+		if (pool == null)
+			return -1;
+		Stat stat = pool.statObj(object);
+		pool.close();
+		if (stat == null)
+			return -1;
+		return stat.getSize();
+	}
+
+	public void deleteBucket(String bucket) throws IOException {
+		Pool pool = rados.openPool(bucket);
+		if (pool == null)
+			throw new IOException("Unable to delete bucket: " + bucket);
+		int ret = pool.delete();
+		pool.close();
+		if (ret != 0)
+			throw new IOException("Unable to delete bucket: " + bucket);
+	}
+
+	public void createObject(String bucket, String object) throws IOException {
+		Pool pool = rados.openPool(bucket);
+		if (pool == null)
+			throw new IOException("Unable to open bucket: " + bucket);
+		int ret = pool.createObj(object, true);
+		pool.close();
+		if (ret != 0)
+			throw new IOException("Unable to create object: " + object);
+	}
+
+	public StorageIO prepareForRead(String bucket, String object) throws Exception {
+		Pool pool = rados.openPool(bucket);
+		if (pool == null)
+			throw new IOException("Unable to open bucket: " + bucket);
+		return new RadosReader(pool, object);
+	}
+
+	public StorageIO prepareForWrite(String bucket, String object) throws Exception {
+		Pool pool = rados.openPool(bucket);
+		if (pool == null)
+			throw new IOException("Unable to open bucket: " + bucket);
+		return new RadosWriter(pool, object);
+	}
+
+	public int readObject(String bucket, String object, byte[] bytes, long offset) throws IOException {
+		Pool pool = rados.openPool(bucket);
+		if (pool == null)
+			throw new IOException("Unable to open bucket: " + bucket);
+		int ret = pool.readObj(object, offset, bytes, 0);
+		pool.close();
+		return ret;
+	}
+
+	public int readObject(String path, byte[] bytes, long offset) throws IOException {
+		throw new IOException("Cannot use path on this implementation\n");
+	}
+
+	public void deleteObject(String bucket, String object) throws IOException {
+		Pool pool = rados.openPool(bucket);
+		if (pool == null)
+			throw new IOException("Unable to open bucket: " + bucket);
+	    int ret = pool.removeObj(object);
+		pool.close();
+		if (ret < 0)
+			throw new IOException("Unable to delete object: " + object);
+	}
+
+	public void deleteAbsoluteObject(String object) throws IOException {
+		throw new IOException("Cannot use path on this implementation\n");
+	}
+
+	public void putObject(String bucket, String object, byte[] base64Data, boolean append) throws IOException {
+		Pool pool = rados.openPool(bucket);
+		if (pool == null)
+			throw new IOException("Unable to open bucket: " + bucket);
+		int ret;
+		if (!append)
+			ret = pool.writeObj(object, 0, base64Data, base64Data.length);
+		else {
+			Stat stat = pool.statObj(object);
+			if (stat == null) {
+				pool.close();
+				throw new IOException("Unable to stat object:" + bucket + "/" + object);
+			}
+			ret = pool.writeObj(object, stat.getSize(), base64Data, base64Data.length);
+		}
+		pool.close();
+		if (ret < 0)
+			throw new IOException("Unable to put object: " + bucket + "/" + object);
+	}
+
+	public void renameObject(String bucket, String oldName, String newName) throws IOException {
+		Pool pool;
+		int ret;
+
+		pool = rados.openPool(bucket);
+		if (pool == null)
+			throw new IOException("Unable to open bucket: " + bucket);
+		ret = pool.renameObj(oldName, newName);
+		if (ret < 0) {
+			pool.close();
+			throw new IOException("Unable to rename object: " + oldName);
+		}
+		pool.close();
+	}
+
+	public void copyObject(String sourceBucket, String sourceObject, String destinationBucket, String destinationObject) throws IOException {
+		Pool sourcePool, destinationPool;
+		int ret;
+
+		sourcePool = rados.openPool(sourceBucket);
+		if (sourcePool == null)
+			throw new IOException("Unable to open bucket: " + sourceBucket);
+		destinationPool = rados.openPool(destinationBucket);
+		if (destinationPool == null) {
+			sourcePool.close();
+			throw new IOException("Unable to open bucket: " + destinationBucket);
+		}
+		ret = sourcePool.copyObj(sourceObject, destinationPool, destinationObject);
+		if (ret < 0) {
+			sourcePool.close();
+			destinationPool.close();
+			throw new IOException("Unable to copy object: " + sourceObject);
+		}
+		sourcePool.close();
+		destinationPool.close();
+	}
+
+	public String getObjectPath(String bucket, String object) {
+		return null;
+	}
+
+	public long getObjectSize(String bucket, String object) {
+		Pool pool;
+		Stat stat;
+		long size;
+
+		pool = rados.openPool(bucket);
+		if (pool == null)
+			return -1;
+		stat = pool.statObj(object);
+		if (stat == null) {
+			pool.close();
+			return -1;
+		}
+		size = stat.getSize();
+		return size;
+	}
+
+	public void sendObject(final WalrusDataGetRequestType request, DefaultHttpResponse httpResponse, String bucketName, String objectName, long size, String etag, String lastModified, String contentType, String contentDisposition, Boolean isCompressed, String versionId, final BucketLogData logData) {
+		try {
+			Channel channel = request.getChannel();
+			Pool pool = rados.openPool(bucketName);
+			httpResponse.addHeader( HttpHeaders.Names.CONTENT_TYPE, contentType != null ? contentType : "binary/octet-stream" );
+			if(etag != null)
+				httpResponse.addHeader(HttpHeaders.Names.ETAG, etag);
+			httpResponse.addHeader(HttpHeaders.Names.LAST_MODIFIED, lastModified);
+			if(contentDisposition != null)
+				httpResponse.addHeader("Content-Disposition", contentDisposition);
+			final ChunkedInput file;
+			isCompressed = isCompressed == null ? false : isCompressed;
+			if(isCompressed) {
+				file = new CompressedChunkedRadosObject(pool, objectName, size);
+			} else {
+				file = new ChunkedRadosObject(pool, objectName, 0, size, 5120000);
+				httpResponse.addHeader( HttpHeaders.Names.CONTENT_LENGTH, String.valueOf(size));
+			}
+			if(logData != null) {
+				logData.setTurnAroundTime(System.currentTimeMillis() - logData.getTurnAroundTime());
+				logData.setBytesSent(size);
+			}
+			if(versionId != null) {
+				httpResponse.addHeader(WalrusProperties.X_AMZ_VERSION_ID, versionId);
+			}
+			channel.write(httpResponse);
+			channel.write(file).addListener(new ChannelFutureListener( ) {
+				@Override public void operationComplete( ChannelFuture future ) throws Exception {
+				    Contexts.clear(request.getCorrelationId());
+				    file.close();
+				    if(logData != null) {
+					logData.setTotalTime(System.currentTimeMillis() - logData.getTotalTime());
+					WalrusBucketLogger.getInstance().addLogEntry(logData);
+				    }
+				}
+			});
+		} catch(Exception ex) {
+			LOG.error(ex, ex);
+		}	
+	}
+
+	public void sendObject(final WalrusDataGetRequestType request, DefaultHttpResponse httpResponse, String bucketName, String objectName, long start, long end, long size, String etag, String lastModified, String contentType, String contentDisposition, Boolean isCompressed, String versionId, final BucketLogData logData) {
+		try {
+			Channel channel = request.getChannel();
+			Pool pool = rados.openPool(bucketName);
+			httpResponse.addHeader( HttpHeaders.Names.CONTENT_TYPE, contentType != null ? contentType : "binary/octet-stream" );
+			if(etag != null)
+				httpResponse.addHeader(HttpHeaders.Names.ETAG, etag);
+			httpResponse.addHeader(HttpHeaders.Names.LAST_MODIFIED, lastModified);
+			if(contentDisposition != null)
+				httpResponse.addHeader("Content-Disposition", contentDisposition);
+			final ChunkedInput file;
+			isCompressed = isCompressed == null ? false : isCompressed;
+			if(isCompressed) {
+				file = new CompressedChunkedRadosObject(pool, objectName, start, end, (int)Math.min((end - start), 8192));
+			} else {
+				file = new ChunkedRadosObject(pool, objectName, start, end, (int)Math.min((end - start), 8192));
+				httpResponse.addHeader( HttpHeaders.Names.CONTENT_LENGTH, String.valueOf((end - start)));
+			}
+			httpResponse.addHeader("Content-Range", start + "-" + end + "/" + size);
+			if(logData != null) {
+				logData.setTurnAroundTime(System.currentTimeMillis() - logData.getTurnAroundTime());
+				logData.setBytesSent(size);
+			}
+			if(versionId != null) {
+				httpResponse.addHeader(WalrusProperties.X_AMZ_VERSION_ID, versionId);
+			}
+			channel.write(httpResponse);
+			channel.write(file).addListener(new ChannelFutureListener( ) {
+				@Override public void operationComplete( ChannelFuture future ) throws Exception {
+				    Contexts.clear(request.getCorrelationId());
+				    file.close();
+				    if(logData != null) {
+					logData.setTotalTime(System.currentTimeMillis() - logData.getTotalTime());
+					WalrusBucketLogger.getInstance().addLogEntry(logData);
+				    }
+				}
+			});
+		} catch(Exception ex) {
+			LOG.error(ex, ex);
+		}	
+	}
+
+
+	public void sendHeaders(final WalrusDataGetRequestType request, DefaultHttpResponse httpResponse, Long size, String etag,
+			String lastModified, String contentType, String contentDisposition, String versionId, final BucketLogData logData) {
+		Channel channel = request.getChannel();
+		httpResponse.addHeader( HttpHeaders.Names.CONTENT_LENGTH, String.valueOf(size));
+		httpResponse.addHeader( HttpHeaders.Names.CONTENT_TYPE, contentType != null ? contentType : "binary/octet-stream" );
+		if(etag != null)
+			httpResponse.addHeader(HttpHeaders.Names.ETAG, etag);
+		httpResponse.addHeader(HttpHeaders.Names.LAST_MODIFIED, lastModified);
+		if(contentDisposition != null)
+			httpResponse.addHeader("Content-Disposition", contentDisposition);
+		if(versionId != null) {
+			httpResponse.addHeader(WalrusProperties.X_AMZ_VERSION_ID, versionId);
+		}
+		if(logData != null) {
+			logData.setTurnAroundTime(System.currentTimeMillis() - logData.getTurnAroundTime());
+		}
+		channel.write(httpResponse).addListener(new ChannelFutureListener( ) {
+			@Override public void operationComplete( ChannelFuture future ) throws Exception {
+				logData.setTotalTime(System.currentTimeMillis() - logData.getTotalTime());
+				WalrusBucketLogger.getInstance().addLogEntry(logData);					
+			}
+		});
+	}
+
+	private String removeLoopback(String loDevName) throws ExecutionException {
+		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "losetup", "-d", loDevName});
+	}
+
+	private int losetup(String absoluteFileName, String loDevName) {
+		try
+		{
+			Runtime rt = Runtime.getRuntime();
+			Process proc = rt.exec(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "losetup", loDevName, absoluteFileName});
+			StreamConsumer error = new StreamConsumer(proc.getErrorStream());
+			StreamConsumer output = new StreamConsumer(proc.getInputStream());
+			error.start();
+			output.start();
+			int errorCode = proc.waitFor();
+			output.join();
+			LOG.info("losetup " + loDevName + " " + absoluteFileName);
+			LOG.info(output.getReturnValue());
+			LOG.info(error.getReturnValue());
+			return errorCode;
+		} catch (Throwable t) {
+			LOG.error(t);
+		}
+		return -1;
+	}
+
+	private String findFreeLoopback() throws ExecutionException {
+		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "losetup", "-f"}).replaceAll("\n", "");
+	}
+
+	private String removeLogicalVolume(String lvName) throws ExecutionException {
+		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "lvremove", "-f", lvName});
+	}
+
+	private String reduceVolumeGroup(String vgName, String pvName) throws ExecutionException {
+		return SystemUtil.run(new String[]{eucaHome + EUCA_ROOT_WRAPPER, "vgreduce", vgName, pvName});
+	}
+