Merge lp:~kirkland/eucalyptus/label-metadata into lp:eucalyptus/1.6.2

[Dustin Kirkland ]

See commit message

Unmerged revisions

1232. By Dustin Kirkland  on 2010-08-17

cluster/handlers.c, net/vnetwork.c: label the 169.254.169.254 link
local address with :metadata, the public vm ip addresses with :pub,
and the private vm ip addresses with :priv, to separate it appropriately
(LP: #451607, #452754)

1231. By decker <decker@hawaii> on 2010-08-14

merge bugs fixes related to LP: #566792 #606243 #563175 #613832

1230. By decker <decker@personal-army> on 2010-08-13

fix url construction for components with absent configuration files (LP: #613033) and restore ssl support (LP: #584497)

1229. By decker <decker@personal-army> on 2010-08-13

merge missing fix to addressing

1228. By decker <decker@personal-army> on 2010-08-13

merge fixes to addressing, volume attach, remote components, and upgrade. see merge log for details

1227. By Neil <neil@pall> on 2010-08-13

fixes LP: #611769

1226. By Neil <neil@pall> on 2010-08-12

fixes LP: #617032

1225. By decker <decker@personal-army> on 2010-08-11

fix to remote sc/walrus bootstrap

1224. By decker <decker@hawaii> on 2010-08-11

fix to remote sc/walrus bootstrap

1223. By Dmitrii Zagorodnov <email address hidden> on 2010-08-11

changed sudo to euca_rootwrap in ISCSIManager; small change in spec file

=== modified file 'Makefile'
--- Makefile	2010-01-28 04:04:22 +0000
+++ Makefile	2010-08-17 20:32:41 +0000
@@ -57,7 +57,7 @@
 		(cd $$subdir && $(MAKE) $@) || exit $$? ; done
 
 uninstall:
-	@$(RM) -f $(etcdir)/eucalyptus/eucalyptus-version
+	@$(RM) -f $(DESTDIR)$(etcdir)/eucalyptus/eucalyptus-version
 	@for subdir in $(SUBDIRS); do \
 		(cd $$subdir && $(MAKE) $@) || exit $$? ; done
 

=== modified file 'VERSION'
--- VERSION	2010-01-07 03:08:33 +0000
+++ VERSION	2010-08-17 20:32:41 +0000
@@ -1,1 +1,1 @@
-1.6.2
+2.0.0

=== modified file 'clc/.classpath'
--- clc/.classpath	2010-06-29 10:50:36 +0000
+++ clc/.classpath	2010-08-17 20:32:41 +0000
@@ -15,15 +15,15 @@
 	<classpathentry kind="src" output="modules/authentication/build" path="modules/authentication/src/main/java"/>
 	<classpathentry kind="src" output="modules/www/build" path="modules/www/src/main/java"/>
 	<classpathentry kind="src" output="modules/cloud/build" path="modules/cloud/src/main/java"/>
+	<classpathentry kind="src" output="modules/component/build" path="modules/component/src/main/java"/>
 	<classpathentry kind="src" output="modules/configuration/build" path="modules/configuration/src/main/java"/>
 	<classpathentry kind="src" output="modules/walrus/build" path="modules/walrus/src/main/java"/>
 	<classpathentry kind="src" output="modules/storage-common/build" path="modules/storage-common/src/main/java"/>
 	<classpathentry kind="src" path="modules/configuration/conf/scripts"/>
 	<classpathentry kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/activation-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/ant-1.7.jar"/>
-	<classpathentry kind="lib" path="lib/antlr3-3.0.1+dfsg.jar"/>
+	<classpathentry kind="lib" path="lib/antlr-3.0.1.jar"/>
 	<classpathentry kind="lib" path="lib/antlrall.jar"/>
 	<classpathentry kind="lib" path="lib/asm2-2.2.3.jar"/>
 	<classpathentry kind="lib" path="lib/avalon-framework-4.2.0.jar"/>
@@ -34,6 +34,7 @@
 	<classpathentry kind="lib" path="lib/bcel-5.2.jar"/>
 	<classpathentry kind="lib" path="lib/bcprov.jar"/>
 	<classpathentry kind="lib" path="lib/bsf-2.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/cglib-2.1.3.jar"/>
 	<classpathentry kind="lib" path="lib/commons-beanutils-1.8.0-BETA.jar"/>
 	<classpathentry kind="lib" path="lib/commons-cli-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
@@ -51,28 +52,30 @@
 	<classpathentry kind="lib" path="lib/dnsjava-2.0.6.jar"/>
 	<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
 	<classpathentry kind="lib" path="lib/ecj.jar"/>
+	<classpathentry kind="lib" path="lib/ehcache-core-1.7.2.jar"/>
 	<classpathentry kind="lib" path="lib/el-api-2.1.jar"/>
-	<classpathentry kind="lib" path="lib/eucalyptus-commons-ext-0.4.jar"/>
 	<classpathentry kind="lib" path="lib/excalibur-logkit.jar"/>
 	<classpathentry kind="lib" path="lib/ezmorph-1.0.5.jar"/>
 	<classpathentry kind="lib" path="lib/geronimo-activation-1.1-spec-1.0.1.jar"/>
 	<classpathentry kind="lib" path="lib/geronimo-ejb-3.0-spec-1.0.1.jar"/>
 	<classpathentry kind="lib" path="lib/geronimo-j2ee-connector-1.5-spec-1.1.jar"/>
+	<classpathentry kind="lib" path="lib/geronimo-javamail_1.4_provider-1.6.jar"/>
+	<classpathentry kind="lib" path="lib/geronimo-javamail_1.4_spec-1.6.jar"/>
 	<classpathentry kind="lib" path="lib/geronimo-jms-1.1-spec-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/geronimo-jpa-3.0-spec-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/geronimo-jta-1.0.1b-spec-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/geronimo-stax-1.0-spec-1.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/gnumail-providers.jar"/>
-	<classpathentry kind="lib" path="lib/gnumail.jar"/>
 	<classpathentry kind="lib" path="lib/google-collect-20080808.jar"/>
 	<classpathentry kind="lib" path="lib/groovy-1.6.3.jar"/>
 	<classpathentry kind="lib" path="lib/gwt-dev-linux-1.6.4.jar"/>
 	<classpathentry kind="lib" path="lib/gwt-servlet-1.6.4.jar"/>
 	<classpathentry kind="lib" path="lib/gwt-user-1.6.4.jar"/>
-	<classpathentry kind="lib" path="lib/hibernate-proxool-3.3.2.GA.jar"/>
+	<classpathentry kind="lib" path="lib/hibernate-3.3.2.GA.jar"/>
+	<classpathentry kind="lib" path="lib/hibernate-annotations-3.4.0.GA.jar"/>
+	<classpathentry kind="lib" path="lib/hibernate-commons-annotations-3.4.0.GA.jar"/>
+	<classpathentry kind="lib" path="lib/hibernate-entitymanager-3.4.0.GA.jar"/>
 	<classpathentry kind="lib" path="lib/hsqldb-1.8.0.10.jar"/>
 	<classpathentry kind="lib" path="lib/hsqldbutil-1.8.0.10.jar"/>
-	<classpathentry kind="lib" path="lib/inetlib-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/janino-2.5.15-1.jar"/>
 	<classpathentry kind="lib" path="lib/javassist-3.8.1.jar"/>
 	<classpathentry kind="lib" path="lib/jaxen-1.1.1.jar"/>
@@ -97,13 +100,17 @@
 	<classpathentry kind="lib" path="lib/jul-to-slf4j-1.5.2.jar"/>
 	<classpathentry kind="lib" path="lib/junit-3.8.2.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
-	<classpathentry kind="lib" path="lib/netty-3.1.0.CR1.jar"/>
-	<classpathentry kind="lib" path="lib/openjdk-crypto.jar"/>
+	<classpathentry kind="lib" path="lib/netty-3.1.0.CR1.jar" sourcepath="/bzr/third-party/netty-3.1.5.GA/src/main/java"/>
 	<classpathentry kind="lib" path="lib/regexp-1.4.jar"/>
 	<classpathentry kind="lib" path="lib/serializer.jar"/>
 	<classpathentry kind="lib" path="lib/servlet-api-2.5.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-api-1.5.2.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-log4j12-1.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/spring-beans-2.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/spring-context-2.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/spring-context-support-2.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/spring-core-2.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/spring-web-2.5.1.jar"/>
 	<classpathentry kind="lib" path="lib/stax2-api-3.0.1.jar"/>
 	<classpathentry kind="lib" path="lib/woodstox-core-asl-4.0.6.jar"/>
 	<classpathentry kind="lib" path="lib/wsdl4j-1.6.2.jar"/>
@@ -113,7 +120,14 @@
 	<classpathentry kind="lib" path="lib/xml-security-1.4.2.jar"/>
 	<classpathentry kind="lib" path="lib/xom-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/xpp3-1.1.3.4.O.jar"/>
-	<classpathentry kind="lib" path="lib/cglib-2.1.3.jar"/>
+	<classpathentry kind="lib" path="lib/openjdk-crypto.jar"/>
 	<classpathentry kind="lib" path="lib/proxool-0.9.1.jar"/>
+	<classpathentry kind="lib" path="lib/proxool-cglib.jar"/>
+	<classpathentry kind="lib" path="lib/mule-core-2.0.1.jar" sourcepath="/bzr/third-party/mule-2.0.1.orig/core/src/main/java"/>
+	<classpathentry kind="lib" path="lib/mule-module-builders-2.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/mule-module-client-2.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/mule-module-spring-config-2.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/mule-module-xml-2.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/mule-transport-vm-2.0.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

=== modified file 'clc/.project'
--- clc/.project	2010-01-29 08:04:23 +0000
+++ clc/.project	2010-08-17 20:32:41 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>1.6.2</name>
+	<name>main</name>
 	<comment></comment>
 	<projects>
 	</projects>

=== modified file 'clc/Makefile'
--- clc/Makefile	2010-01-24 23:57:58 +0000
+++ clc/Makefile	2010-08-17 20:32:41 +0000
@@ -8,10 +8,10 @@
 
 .PHONY: all build update_properties update_theme deps extras install
 
-all: build
+all: deps build
 
 deps:
-	$(ANT) deps
+	@$(ANT) deps
 
 update_properties: ${web_prop_dir}/eucalyptus-web.properties
 
@@ -41,19 +41,16 @@
 		fi \
 	fi
 
-build: extras
+build: deps extras
 	@# we need JAVA_HOME
 	@if test -z "${JAVA_HOME}" ; then \
 		echo "You need to define JAVA_HOME!"; exit 1; fi
 # this causes problems for pbuilder, should be handled by configure and build.xml already 
 #	@if test ! -e deps/cloud-lib.tar.gz; then \
 #		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
-	make -C modules/bootstrap
-
-run: install 
-	$(ANT) run
+	@ANT_OPTS="-Xmx512m" $(ANT) build
+	@make -C modules/storage-controller/native
+	@make -C modules/bootstrap
 
 clean:
 	$(ANT) clean
@@ -66,16 +63,15 @@
 	make -C modules/storage-controller/native distclean
 
 install: build
-	$(ANT) install
-#	@$(INSTALL) -m 644 cloud.xml $(etcdir)/eucalyptus
-	make -C modules/storage-controller/native install
-	make -C modules/bootstrap install
+	@$(ANT) install
+	@make -C modules/storage-controller/native install
+	@make -C modules/bootstrap install
 
 deploy: install
 
 uninstall:
 	make -C modules/storage-controller/native uninstall
 	make -C modules/bootstrap uninstall
-	$(RM) -rf $(etcdir)/eucalyptus/cloud.d
-	$(RM) -rf $(datarootdir)/eucalyptus/*jar
-	$(RM) -rf $(vardir)/eucalyptus/webapps
+	$(RM) -rf $(DESTDIR)$(etcdir)/eucalyptus/cloud.d
+	$(RM) -rf $(DESTDIR)$(datarootdir)/eucalyptus/*jar
+	$(RM) -rf $(DESTDIR)$(vardir)/eucalyptus/webapps

=== modified file 'clc/build.xml'
--- clc/build.xml	2010-01-22 20:57:37 +0000
+++ clc/build.xml	2010-08-17 20:32:41 +0000
@@ -62,193 +62,227 @@
   -->
 
 <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="deps.lib" value="cloud-lib"/>
-  <!--================================== build targets ==================================-->
-  <target name="build-msgs">
-    <ant dir="modules/msgs" inheritall="false" target="builder"/>
-    <ant dir="modules/database" 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"/>
-  </target>
-  <target name="build-core" depends="build-msgs">
-    <ant dir="modules/core" inheritall="false" target="builder"/>
-    <ant dir="modules/wsstack" inheritall="false" target="builder"/>
-  </target>
-   <target name="build-storage-common" depends="build-core">
-    <ant dir="modules/storage-common" inheritall="false" target="builder"/>
-  </target>
-  <target name="build-eucalyptus" depends="build-core">
-    <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"/>
-  </target>
-  <target name="build-walrus" depends="build-storage-common">
-    <ant dir="modules/walrus" inheritall="false" target="builder"/>
-  </target>
-  <target name="build-ebs" depends="build-storage-common">
-    <ant dir="modules/storage-controller" inheritall="false" target="builder"/>
-  </target>
-  <target name="build-dns" depends="build-core">
-    <ant dir="modules/dns" inheritall="false" target="builder"/>
-  </target>
-  <target name="build-www">
-    <ant dir="modules/www" inheritall="false" target="builder"/>
-  </target>
-  <target name="build-nogwt" depends="build-eucalyptus,build-walrus,build-ebs,build-dns"/>
-  <target name="build" depends="deps,build-nogwt,build-www"/>
-  <!--================================== clean targets ==================================-->
-  <target name="clean-msgs">
-    <ant dir="modules/msgs" inheritall="false" target="clean"/>
-    <ant dir="modules/database" 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"/>
-  </target>
-  <target name="clean-core" depends="clean-msgs">
-    <ant dir="modules/core" inheritall="false" target="clean"/>
-    <ant dir="modules/wsstack" inheritall="false" target="clean"/>
-  </target>
-  <target name="clean-storage-common" depends="clean-core">
-    <ant dir="modules/storage-common" inheritall="false" target="clean"/>
-  </target>
-  <target name="clean-eucalyptus" depends="clean-core">
-    <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"/>
-  </target>
-  <target name="clean-walrus" depends="clean-storage-common">
-    <ant dir="modules/walrus" inheritall="false" target="clean"/>
-  </target>
-  <target name="clean-ebs" depends="clean-storage-common">
-    <ant dir="modules/storage-controller" inheritall="false" target="clean"/>
-  </target>
-  <target name="clean-dns" depends="clean-core">
-    <ant dir="modules/dns" inheritall="false" target="clean"/>
-  </target>
-  <target name="clean-www">
-    <ant dir="modules/www" inheritall="false" target="clean" />
-  </target>
-  <target name="clean-nogwt" depends="clean-eucalyptus,clean-walrus,clean-ebs,clean-dns"/>
-  <target name="clean" depends="clean-nogwt,clean-www">
-    <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.log.dir" value="${euca.home}/var/log/eucalyptus"/>
-  <target name="install">
-    <!-- copy libraries over -->
-    <mkdir dir="${DESTDIR}${euca.lib.dir}"/>
-    <copy todir="${DESTDIR}${euca.lib.dir}">
-      <fileset dir="${basedir}/target">
-        <include name="**/*.jar"/>
-      </fileset>
-    </copy>
-    <copy todir="${DESTDIR}${euca.lib.dir}">
-      <fileset dir="${deps.lib.dir}">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-    <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"/>
-    <!--	<chmod dir="${euca.var.dir}/db" perm="0700"/> 
-	<chmod dir="${euca.var.dir}/keys" perm="0700"/> -->
-    <mkdir dir="${DESTDIR}${euca.log.dir}"/>
-    <mkdir dir="${DESTDIR}${euca.var.dir}/webapps"/>
-    <mkdir dir="${DESTDIR}${euca.var.dir}/modules"/>
-    <ant dir="modules/msgs" inheritall="false" target="install"/>
-    <ant dir="modules/database" 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/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/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}"/>
-    <delete file="${deps.lib.dir}/openjdk-crypto.jar"/> 	
-  	<jar destfile="${deps.lib.dir}/openjdk-crypto.jar">
-  	    <zipfileset src="${deps.lib.dir}/eucalyptus-commons-ext-0.4.jar" includes="javax/crypto/**"/>
-	</jar>
-  </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>
+	<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/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/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/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/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 directory 'clc/modules/authentication/conf/upgrade'
=== added file 'clc/modules/authentication/conf/upgrade/upgrade_auth.groovy'
--- clc/modules/authentication/conf/upgrade/upgrade_auth.groovy	1970-01-01 00:00:00 +0000
+++ clc/modules/authentication/conf/upgrade/upgrade_auth.groovy	2010-08-17 20:32:41 +0000
@@ -0,0 +1,173 @@
+import com.eucalyptus.auth.Authentication;
+import com.eucalyptus.auth.ClusterCredentials;
+import com.eucalyptus.auth.Groups;
+import com.eucalyptus.auth.NoSuchUserException;
+import com.eucalyptus.auth.principal.AvailabilityZonePermission;
+import com.eucalyptus.auth.principal.User;
+import com.eucalyptus.auth.UserEntity;
+import com.eucalyptus.auth.UserExistsException;
+import com.eucalyptus.auth.UserInfo;
+import com.eucalyptus.auth.UserInfoStore;
+import com.eucalyptus.auth.Users;
+import com.eucalyptus.auth.util.AuthBootstrapHelper;
+import com.eucalyptus.auth.X509Cert;
+import com.eucalyptus.config.ClusterConfiguration;
+import com.eucalyptus.config.Configuration;
+import com.eucalyptus.entities.EntityWrapper;
+import com.eucalyptus.upgrade.AbstractUpgradeScript;
+import com.eucalyptus.upgrade.StandalonePersistence;
+import com.eucalyptus.entities.PersistenceContexts;
+import com.eucalyptus.util.EucalyptusCloudException;
+import com.eucalyptus.util.Tx;
+
+import groovy.sql.Sql;
+
+class UpgradeAuth extends AbstractUpgradeScript {
+	
+  public UpgradeAuth() {
+	  super(3);
+  }
+  
+  public Boolean accepts( String from, String to ) {
+    return true;
+  }
+  
+  public void upgrade( File oldEucaHome, File newEucaHome ) {
+    def userName;
+    def userIdToUserName = [:];
+    def certIdToUserName = [:];
+    def ccCertIdToCluster = [:];
+    def ncCertIdToCluster = [:];
+    
+    AuthBootstrapHelper.ensureStandardGroupsExists( );
+
+    //println "----- eucalyptus_auth.AUTH_CLUSTERS -----";
+    StandalonePersistence.getConnection("eucalyptus_auth").rows('SELECT * FROM AUTH_CLUSTERS').each{
+      //println "ROW: ${it}";
+      EntityWrapper<ClusterCredentials> db = Authentication.getEntityWrapper( );
+      try {
+        db.add( new ClusterCredentials( it.AUTH_CLUSTER_NAME ) );
+        db.commit( );
+        ccCertIdToCluster[it.AUTH_CLUSTER_X509_CERTIFICATE] = it.AUTH_CLUSTER_NAME;
+        ncCertIdToCluster[it.AUTH_CLUSTER_NODE_X509_CERTIFICATE] = it.AUTH_CLUSTER_NAME;
+      } catch ( EucalyptusCloudException e ) {
+        db.rollback( );
+        println "Failed to add credentials for cluster ${it.AUTH_CLUSTER_NAME}";
+        e.printStackTrace( );
+      }
+    }       
+    //println "----- eucalyptus_auth.AUTH_USERS -----";
+    StandalonePersistence.getConnection("eucalyptus_auth").rows('SELECT * FROM AUTH_USERS').each{
+      //println "ROW: ${it}";
+      try {
+        Users.addUser( it.AUTH_USER_NAME, it.AUTH_USER_IS_ADMIN, it.AUTH_USER_IS_ENABLED );
+      } catch ( UserExistsException e ) {
+        println "Failed to add user. User ${it.AUTH_USER_NAME} exists";
+        e.printStackTrace( );
+        return;
+      }
+      try {
+        Users.updateUser( it.AUTH_USER_NAME, new Tx<User>( ) {
+          public void fire( User user ) throws Throwable {
+            user.setQueryId( it.AUTH_USER_QUERY_ID );
+            user.setSecretKey( it.AUTH_USER_SECRETKEY );
+          }
+        });
+      } catch ( NoSuchUserException e ) {
+        println "Can not find user ${it.AUTH_USER_NAME}";
+        e.printStackTrace( );
+        return;
+      }
+      userIdToUserName[it.ID] = it.AUTH_USER_NAME;
+    }
+    //println "----- eucalyptus_auth.AUTH_USER_HAS_X509 -----"
+    StandalonePersistence.getConnection("eucalyptus_auth").rows('SELECT * FROM AUTH_USER_HAS_X509').each{
+      //println "ROW: ${it}";
+      userName = userIdToUserName[it.AUTH_USER_ID];
+      if ( userName != null ) {
+        certIdToUserName[it.AUTH_X509_ID] = userName;
+      }
+    }
+    //println "----- eucalyptus_auth.AUTH_X509 -----"
+    StandalonePersistence.getConnection("eucalyptus_auth").rows('SELECT * FROM AUTH_X509').each{
+      //println "ROW: ${it}";
+      def cert = new X509Cert( );
+      cert.setAlias( it.AUTH_X509_ALIAS );
+      cert.setPemCertificate( it.AUTH_X509_PEM_CERTIFICATE );
+      if ( certIdToUserName[it.ID] != null ) {
+        println "Update certificate for ${userName}";
+        Users.updateUser( certIdToUserName[it.ID], new Tx<User>( ) {
+          public void fire( User user ) throws Throwable {
+            ( ( UserEntity ) user ).getCertificates( ).add( cert );
+          }
+        });
+      } else if ( ncCertIdToCluster[it.ID] != null ) {
+        println "Update node certificate for ${ncCertIdToCluster[it.ID]}";
+        EntityWrapper<ClusterCredentials> db = Authentication.getEntityWrapper( );
+        try {
+          ClusterCredentials creds = db.getUnique( new ClusterCredentials( ncCertIdToCluster[it.ID] ) );
+          creds.setNodeCertificate( cert );
+          db.commit( );
+        } catch ( EucalyptusCloudException e ) {
+          db.rollback( );
+          println "Failed to load node credential for cluster ${ncCertIdToCluster[it.ID]}";
+          e.printStackTrace( );
+        }
+      } else if ( ccCertIdToCluster[it.ID] != null ) {
+        println "Update cluster certificate for ${ccCertIdToCluster[it.ID]}";
+        EntityWrapper<ClusterCredentials> db = Authentication.getEntityWrapper( );
+        try {
+          ClusterCredentials creds = db.getUnique( new ClusterCredentials( ccCertIdToCluster[it.ID] ) );
+          creds.setClusterCertificate( cert );
+          db.commit( );
+        } catch ( EucalyptusCloudException e ) {
+          db.rollback( );
+          println "Failed to load cluster credential for cluster ${ccCertIdToCluster[it.ID]}";
+          e.printStackTrace( );
+        }
+      }
+    }
+    //println "----- eucalyptus_general.USERS -----"
+    StandalonePersistence.getConnection("eucalyptus_general").rows('SELECT * FROM USERS').each{
+      //println "ROW: ${it}";
+      try {
+        Users.updateUser( it.USER_NAME , new Tx<User>( ) {
+          public void fire( User user ) throws Throwable {
+            user.setPassword( it.USER_B_CRYPTED_PASSWORD );
+            user.setEnabled( it.USER_IS_ENABLED );
+            ( ( UserEntity ) user ).setToken( it.USER_CERTIFICATE_CODE );
+          }
+        });
+        UserInfoStore.updateUserInfo( it.USER_NAME, new Tx<UserInfo>( ) {
+          public void fire( UserInfo userInfo ) throws Throwable {
+            userInfo.setConfirmationCode( it. USER_CONFIRMATION_CODE );
+            userInfo.setAffiliation( ifEmptyReplaceByBogus(it.USER_AFFILIATION ) );
+            userInfo.setEmail( ifEmptyReplaceByBogus(it.USER_EMAIL ) );
+            userInfo.setApproved( it.USER_IS_APPROVED );
+            userInfo.setConfirmed( it.USER_IS_CONFIRMED );
+            userInfo.setPasswordExpires( it.PASSWORD_EXPIRES );
+            userInfo.setProjectDescription( ifEmptyReplaceByBogus(it.USER_PROJECT_DESCRIPTION ) );
+            userInfo.setProjectPIName( ifEmptyReplaceByBogus(it.USER_PROJECT_PI_NAME ) );
+            userInfo.setRealName( ifEmptyReplaceByBogus(it.USER_REAL_NAME ) );
+            userInfo.setTelephoneNumber( ifEmptyReplaceByBogus(it.USER_TELEPHONE_NUMBER ) );
+          }
+        });
+      } catch ( NoSuchUserException e ) {
+        println "Failed to find user ${it.USER_NAME}";
+        e.printStackTrace( );
+      }
+    }
+    println "Making sure default group has all the availability zones"
+    for ( ClusterConfiguration cluster : Configuration.getClusterConfigurations( ) ) {
+      Groups.DEFAULT.addAuthorization( new AvailabilityZonePermission( cluster.getName( ) ) );
+    }
+  }
+  
+  private String ifEmptyReplaceByBogus( String value ) {
+    if ( value == null || "".equals( value ) ) {
+      return UserInfo.BOGUS_ENTRY;
+    } else {
+      return value;
+    }
+  }
+}
\ No newline at end of file

=== added file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/AllGroup.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/AllGroup.java	1970-01-01 00:00:00 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/AllGroup.java	2010-08-17 20:32:41 +0000
@@ -0,0 +1,44 @@
+package com.eucalyptus.auth;
+
+import java.security.Principal;
+import java.util.Enumeration;
+import com.eucalyptus.auth.principal.Group;
+import com.eucalyptus.auth.principal.User;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterators;
+
+public class AllGroup extends DatabaseWrappedGroup {
+  
+  public AllGroup( Group g ) {
+    super( g );
+    if( !"all".equals( g.getName( ) ) ) {
+      throw new RuntimeException( "EID: This is exclusively for the 'all' group and can't be used for: " + g.getName( ) );
+    }
+  }
+
+  @Override
+  public ImmutableList<User> getMembers( ) {
+    return ImmutableList.copyOf( Users.listAllUsers( ) );
+  }
+
+  @Override
+  public boolean addMember( Principal principal ) {
+    return true;
+  }
+
+  @Override
+  public boolean isMember( Principal member ) {
+    return true;
+  }
+
+  @Override
+  public Enumeration<? extends Principal> members( ) {
+    return Iterators.asEnumeration( Users.listAllUsers( ).iterator( ) );
+  }
+
+  @Override
+  public boolean removeMember( Principal user ) {
+    return true;
+  }
+
+}

=== modified file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/CredentialEntities.groovy'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/CredentialEntities.groovy	2010-02-05 11:49:57 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/CredentialEntities.groovy	2010-08-17 20:32:41 +0000
@@ -57,8 +57,7 @@
  *    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]>
  */
 package com.eucalyptus.auth
@@ -66,10 +65,13 @@
 import java.io.Serializable;
 import java.security.cert.X509Certificate;
 import java.util.Date;
+import java.util.List;
+import java.util.ArrayList;
 
 import org.bouncycastle.util.encoders.UrlBase64;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Transient;
 import org.hibernate.annotations.Cache
 import org.hibernate.annotations.CacheConcurrencyStrategy
 import org.hibernate.annotations.GenericGenerator
@@ -92,56 +94,149 @@
 import javax.persistence.PersistenceContext;
 
 import org.hibernate.sql.Alias
+import org.apache.log4j.Logger
 
-import com.eucalyptus.auth.util.Hashes;
+import com.google.common.collect.Lists;
+import com.eucalyptus.auth.principal.User;
+import com.eucalyptus.auth.util.B64;
+import com.eucalyptus.auth.util.PEMFiles;
 import com.eucalyptus.entities.AbstractPersistent;
 
 @Entity
 @PersistenceContext(name="eucalyptus_auth")
 @Table( name = "auth_users" )
 @Cache( usage = CacheConcurrencyStrategy.READ_WRITE )
-public class User extends AbstractPersistent implements Serializable {
+public class UserEntity extends AbstractPersistent implements Serializable, User {
+  @Transient
+  private static Logger LOG = Logger.getLogger( UserEntity.class );
+  
   @Column( name = "auth_user_name", unique=true )
-  String userName
+  String name;
+  
   @Column( name = "auth_user_query_id" )
-  String queryId
+  String queryId;
+  
   @Column( name = "auth_user_secretkey" )
-  String secretKey
+  String secretKey;
+  
+  @Column( name = "auth_user_password" )
+  String password;
+  
   @Column( name = "auth_user_is_admin" )
-  Boolean isAdministrator
+  Boolean administrator;
+  
   @Column( name = "auth_user_is_enabled" )
-  Boolean isEnabled;
+  Boolean enabled;
+  
+  @Column( name = "auth_user_token" )
+  String  token;
+  
   @OneToMany( cascade=[CascadeType.ALL], fetch=FetchType.EAGER )
   @JoinTable(name = "auth_user_has_x509", joinColumns = [ @JoinColumn( name = "auth_user_id" ) ],inverseJoinColumns = [ @JoinColumn( name = "auth_x509_id" ) ])
   @Cache( usage = CacheConcurrencyStrategy.READ_WRITE )
-  List<X509Cert> certificates = []
-  public User(){
-  }
-  public User( String userName ){
-    this.userName = userName
-  }
-  public User( String userName, Boolean isEnabled ){
+  List<X509Cert> certificates = [];
+  
+  @Transient
+  List<String> eucaGroupIds = [];
+  
+  public UserEntity(){
+  }
+  
+  public User getDelegate( ) {
+    return this;
+  }
+  
+  public UserEntity( String userName ){
+    this.name = userName
+  }
+  
+  public UserEntity( String userName, Boolean enabled ){
     this(userName);
-    this.isEnabled = isEnabled
+    this.setEnabled( enabled );
+  }
+
+  public void revokeX509Certificate() {
+    for( X509Cert cert : this.getCertificates() ) {
+      cert.setRevoked(true);
+    }
+    LOG.debug("Current certificate for ${this.getName()}: ${this.getX509Certificate()?.getSerialNumber()}");
+  }
+  
+  public void revokeSecretKey() {
+    this.setSecretKey( null );
+  }
+  
+  public List<X509Certificate> getAllX509Certificates() {
+    List<X509Certificate> certs = Lists.newArrayList( );
+    for( X509Cert c : this.getCertificates() ) {
+      certs.add( X509Cert.toCertificate( c ) );
+    }
+    return certs;
+  }
+  
+  public X509Certificate getX509Certificate() {
+    for( X509Cert cert : this.getCertificates() ) {
+      if( !cert.getRevoked( ) ) {
+        return X509Cert.toCertificate( cert );
+      }
+    }
+    return null;
+  }
+  
+  public boolean checkToken( String token ) {
+    return this.getToken( ).equals( token )
+  }
+  
+  public void setX509Certificate( X509Certificate x509 ) {
+    LOG.debug( "Setting new user certificate: " + x509.getSubjectX500Principal( ) + " " + x509.getSerialNumber( ) );
+    this.getCertificates( ).add( X509Cert.fromCertificate( x509 ) );
+  }
+  public Boolean isEnabled() {
+    return enabled;
+  }
+  public Boolean isAdministrator() {
+    return administrator;
+  }
+  public BigInteger getNumber() {
+    return new BigInteger( this.getId(), 16 );
   }
   @Override
   public int hashCode( ) {
     final int prime = 31;
-    int result = super.hashCode( );
-    result = prime * result + ( ( userName == null ) ? 0 : userName.hashCode( ) );
+    int result = 1;
+    result = prime * result + ( ( name == null ) ? 0 : name.hashCode( ) );
     return result;
   }
   @Override
   public boolean equals( Object obj ) {
     if ( this.is( obj ) ) return true;
-    if ( !super.equals( obj ) ) return false;
     if ( getClass( ).is( obj.getClass( ) ) ) return false;
     User other = ( User ) obj;
-    if ( userName == null ) {
-      if ( other.userName != null ) return false;
-    } else if ( !userName.equals( other.userName ) ) return false;
+    if ( name == null ) {
+      if ( other.name != null ) return false;
+    } else if ( !name.equals( other.name ) ) return false;
     return true;
-  }  
+  }
+  public String toString( ) {
+    StringBuilder sb = new StringBuilder( );
+    sb.append( "UserEntity [ ");
+    sb.append( "administrator = ").append( administrator == null ? "null" : administrator ).append( ", " );
+    sb.append( "enabled = ").append( enabled == null ? "null" : enabled ).append( ", " );
+    sb.append( "name = ").append( name == null ? "null" : name ).append( ", " );
+    sb.append( "password = ").append( password == null ? "null" : password ).append( ", " );
+    sb.append( "queryId = ").append( queryId == null ? "null" : queryId ).append( ", " );
+    sb.append( "secretKey = ").append( secretKey == null ? "null" : secretKey ).append( ", " );
+    sb.append( "token = ").append( token == null ? "null" : token ).append( ", " );
+    sb.append( "certificates = ");
+    for ( X509Cert certificate : getCertificates( ) ) {
+      sb.append( certificate.toString( ) ).append( ", " );
+    }
+    sb.append( "eucaGroupIds = " );
+    for ( String id : eucaGroupIds ) {
+      sb.append( id ).append( ", ");
+    }
+    sb.append( "]");
+  }
 }
 
 @Entity
@@ -151,6 +246,8 @@
 public class X509Cert extends AbstractPersistent implements Serializable {
   @Column( name = "auth_x509_alias", unique=true )
   String alias
+  @Column( name = "auth_x509_revoked" )
+  Boolean revoked
   @Lob
   @Column( name = "auth_x509_pem_certificate" )
   String pemCertificate
@@ -159,27 +256,29 @@
   public X509Cert( String alias ) {
     this.alias = alias
   }
-  public static X509Cert fromCertificate(String alias, X509Certificate x509) {
+  public Boolean isRevoked( ) {
+    return this.revoked;
+  }
+  public static X509Cert fromCertificate(X509Certificate x509) {
     X509Cert x = new X509Cert( );
-    x.setAlias(alias);
-    x.setPemCertificate( new String( UrlBase64.encode( Hashes.getPemBytes( x509 ) ) ) );
+    x.setAlias(x509.getSerialNumber( ).toString());
+    x.setPemCertificate( B64.url.encString( PEMFiles.getBytes( x509 ) ) );
     return x;
   }  
   public static X509Certificate toCertificate(X509Cert x509) {
-    return Hashes.getPemCert( UrlBase64.decode( x509.getPemCertificate( ).getBytes( ) ) );
+    return PEMFiles.getCert( B64.url.dec( x509.getPemCertificate( ) ) );
   }  
   
   @Override
   public int hashCode( ) {
     final int prime = 31;
-    int result = super.hashCode( );
+    int result = 1;
     result = prime * result + ( ( alias == null ) ? 0 : alias.hashCode( ) );
     return result;
   }
   @Override
   public boolean equals( Object obj ) {
     if ( this.is( obj ) ) return true;
-    if ( !super.equals( obj ) ) return false;
     if ( !getClass( ).equals( obj.getClass( ) ) ) return false;
     X509Cert other = ( X509Cert ) obj;
     if ( alias == null ) {
@@ -187,6 +286,12 @@
     } else if ( !alias.equals( other.alias ) ) return false;
     return true;
   }
+  public String toString( ) {
+    return ( new StringBuilder( ) ).append( alias == null ? "null" : alias ).append( " " )
+                                   .append( revoked == null ? "null" : revoked ).append( " " )
+                                   .append( pemCertificate == null ? "null" : pemCertificate )
+                                   .toString( );
+  }
 }
 
 @Entity
@@ -196,11 +301,11 @@
 public class ClusterCredentials extends AbstractPersistent implements Serializable {
   @Column( name = "auth_cluster_name", unique=true )
   String clusterName
-  @OneToOne(cascade = CascadeType.ALL)
+  @OneToOne( cascade=[CascadeType.ALL], fetch=FetchType.EAGER )
   @JoinColumn(name="auth_cluster_x509_certificate")
   @Cache( usage = CacheConcurrencyStrategy.READ_WRITE )
   X509Cert clusterCertificate
-  @OneToOne(cascade = CascadeType.ALL)
+  @OneToOne( cascade=[CascadeType.ALL], fetch=FetchType.EAGER )
   @JoinColumn(name="auth_cluster_node_x509_certificate")
   @Cache( usage = CacheConcurrencyStrategy.READ_WRITE )
   X509Cert nodeCertificate  
@@ -213,14 +318,14 @@
   @Override
   public int hashCode( ) {
     final int prime = 31;
-    int result = super.hashCode( );
+    int result = 1;
     result = prime * result + ( ( clusterName == null ) ? 0 : clusterName.hashCode( ) );
     return result;
   }
+
   @Override
   public boolean equals( Object obj ) {
     if ( this.is( obj ) ) return true;
-    if ( !super.equals( obj ) ) return false;
     if ( !getClass( ).equals( obj.getClass( ) ) ) return false;
     ClusterCredentials other = ( ClusterCredentials ) obj;
     if ( clusterName == null ) {
@@ -229,3 +334,4 @@
     return true;
   }  
 }
+

=== removed file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/CredentialProvider.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/CredentialProvider.java	2010-02-05 11:57:00 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/CredentialProvider.java	1970-01-01 00:00:00 +0000
@@ -1,347 +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: chris grzegorczyk <[e-mail]>
- */
-package com.eucalyptus.auth;
-
-import java.security.GeneralSecurityException;
-import java.security.cert.X509Certificate;
-import java.util.List;
-import java.util.zip.Adler32;
-import org.bouncycastle.util.encoders.UrlBase64;
-import org.hibernate.Session;
-import org.hibernate.criterion.Example;
-import org.hibernate.criterion.MatchMode;
-import com.eucalyptus.auth.util.Hashes;
-import com.eucalyptus.bootstrap.Bootstrapper;
-import com.eucalyptus.bootstrap.Depends;
-import com.eucalyptus.bootstrap.Provides;
-import com.eucalyptus.bootstrap.Resource;
-import com.eucalyptus.util.DatabaseUtil;
-import com.eucalyptus.util.EntityWrapper;
-import com.eucalyptus.util.EucalyptusCloudException;
-import com.google.common.collect.Lists;
-
-@Provides( resource = Resource.UserCredentials )
-@Depends( resources = { Resource.Database } )
-public class CredentialProvider extends Bootstrapper {
-  public static boolean hasCertificate( final String alias ) {
-    X509Cert certInfo = null;
-    EntityWrapper<X509Cert> db = Credentials.getEntityWrapper( );
-    try {
-      certInfo = db.getUnique( new X509Cert( alias ) );
-      db.commit( );
-    } catch ( EucalyptusCloudException e ) {
-      db.rollback( );
-    }
-    return certInfo != null;
-  }
-  
-  public static X509Certificate getCertificate( final String alias ) throws GeneralSecurityException {
-    EntityWrapper<X509Cert> db = Credentials.getEntityWrapper( );
-    try {
-      X509Cert certInfo = db.getUnique( new X509Cert( alias ) );
-      String certString = certInfo.getPemCertificate();
-      if(certString != null) {
-          byte[] certBytes = UrlBase64.decode(certString.getBytes( ) );
-          X509Certificate x509 = Hashes.getPemCert( certBytes );
-          db.commit( );
-          return x509;
-      }
-      return null;
-    } catch ( EucalyptusCloudException e ) {
-      db.rollback( );
-      throw new GeneralSecurityException( e );
-    }
-  }
-  
-  public static String getCertificateAlias( final String certPem ) throws GeneralSecurityException {
-    String certAlias = null;
-    EntityWrapper<X509Cert> db = Credentials.getEntityWrapper( );
-    X509Cert certInfo = new X509Cert( );
-    certInfo.setPemCertificate( new String( UrlBase64.encode( certPem.getBytes( ) ) ) );
-    try {
-      certAlias = db.getUnique( certInfo ).getAlias( );
-      db.commit( );
-    } catch ( Throwable e ) {
-      db.rollback( );
-      throw new GeneralSecurityException( e );
-    }
-    return certAlias;
-  }
-  
-  public static String getQueryId( String userName ) throws GeneralSecurityException {
-    String queryId = null;
-    EntityWrapper<User> db = Credentials.getEntityWrapper( );
-    User searchUser = new User( userName, true );
-    try {
-      User user = db.getUnique( searchUser );
-      queryId = user.getQueryId( );
-      db.commit( );
-    } catch ( Throwable e ) {
-      db.rollback( );
-      throw new GeneralSecurityException( e );
-    }
-    return queryId;
-  }
-  
-  public static String getSecretKey( String queryId ) throws GeneralSecurityException {
-    String secretKey = null;
-    EntityWrapper<User> db = Credentials.getEntityWrapper( );
-    User searchUser = new User( );
-    searchUser.setQueryId( queryId );
-    searchUser.setIsEnabled( true );
-    try {
-      User user = db.getUnique( searchUser );
-      secretKey = user.getSecretKey( );
-      db.commit( );
-    } catch ( Throwable e ) {
-      db.rollback( );
-      throw new GeneralSecurityException( e );
-    }
-    return secretKey;
-  }
-  
-  public static String getUserName( String queryId ) throws GeneralSecurityException {
-    String userName = null;
-    EntityWrapper<User> db = Credentials.getEntityWrapper( );
-    User searchUser = new User( );
-    searchUser.setQueryId( queryId );
-    try {
-      User user = db.getUnique( searchUser );
-      userName = user.getUserName( );
-      db.commit( );
-    } catch ( Throwable e ) {
-      db.rollback( );
-      throw new GeneralSecurityException( e );
-    }
-    return userName;
-  }
-  
-  public static String getUserName( X509Certificate cert ) throws GeneralSecurityException {
-    return getUser( cert ).getUserName( );
-  }
-
-  @SuppressWarnings( "unchecked" )
-  public static User getUser( X509Certificate cert ) throws GeneralSecurityException {
-    String certPem = new String( UrlBase64.encode( Hashes.getPemBytes( cert ) ) );
-    User searchUser = new User( );
-    X509Cert searchCert = new X509Cert( );
-    searchCert.setPemCertificate( certPem );
-    searchUser.setIsEnabled( true );
-    Session session = DatabaseUtil.getEntityManagerFactory( Credentials.DB_NAME ).getSessionFactory( ).openSession( );
-    try {
-      Example qbeUser = Example.create( searchUser ).enableLike( MatchMode.EXACT );
-      Example qbeCert = Example.create( searchCert ).enableLike( MatchMode.EXACT );
-      List<User> users = ( List<User> ) session.createCriteria( User.class ).setCacheable( true ).add( qbeUser )
-                                               .createCriteria( "certificates" ).setCacheable( true ).add( qbeCert )
-                                               .list( );
-      User ret = users.size()==1?users.get(0):null;
-      int size = users.size();
-      if( ret != null ) {
-        return ret;
-      } else {
-        throw new GeneralSecurityException( (size == 0)?"No user with the specified certificate.":"Multiple users with the same certificate." );
-      }
-    } catch ( Throwable t ) {
-      throw new GeneralSecurityException( t );
-    } finally {
-      try {
-        session.close( );
-      } catch ( Throwable t ) {
-      }
-    }
-  }
-  
-  public static String getCertificateAlias( final X509Certificate cert ) throws GeneralSecurityException {
-    return getCertificateAlias( new String( Hashes.getPemBytes( cert ) ) );
-  }
-  
-  public static void addCertificate( final String userName, final String alias, final X509Certificate cert ) throws GeneralSecurityException {
-    String certPem = new String( UrlBase64.encode( Hashes.getPemBytes( cert ) ) );
-    EntityWrapper<User> db = Credentials.getEntityWrapper( );
-    User u = null;
-    try {
-      u = db.getUnique( new User( userName ) );
-      X509Cert x509cert = new X509Cert( alias );
-      x509cert.setPemCertificate( certPem );
-      u.getCertificates( ).add( x509cert );
-      db.commit( );
-    } catch ( EucalyptusCloudException e ) {
-      Credentials.LOG.error( e, e );
-      Credentials.LOG.error( "username=" + userName + " \nalias=" + alias + " \ncert=" + cert );
-      db.rollback( );
-      throw new GeneralSecurityException( e );
-    }
-  }
-  
-  public static List<String> getAliases( ) {
-    EntityWrapper<X509Cert> db = Credentials.getEntityWrapper( );
-    List<String> certAliases = Lists.newArrayList( );
-    try {
-      List<X509Cert> certList = db.query( new X509Cert( ) );
-      for ( X509Cert cert : certList ) {
-        certAliases.add( cert.getAlias( ) );
-      }
-      db.commit( );
-    } catch ( Throwable e ) {
-      db.rollback( );
-    }
-    return certAliases;
-  }
-  
-  @Override
-  public boolean load( Resource current ) throws Exception {
-    return true;
-  }
-  
-  @Override
-  public boolean start( ) throws Exception {
-    return Credentials.checkAdmin( );
-  }
-  
-  public static String getUserNumber( final String userName ) {
-    Adler32 hash = new Adler32( );
-    hash.reset( );
-    hash.update( userName.getBytes( ) );
-    String userNumber = String.format( "%012d", hash.getValue( ) );
-    return userNumber;
-  }
-  
-  public static User getUser( String userName ) throws NoSuchUserException {
-    User user = null;
-    EntityWrapper<User> db = Credentials.getEntityWrapper( );
-    User searchUser = new User( userName, true );
-    try {
-      user = db.getUnique( searchUser );
-      db.commit( );
-    } catch ( EucalyptusCloudException e ) {
-      db.rollback( );
-      throw new NoSuchUserException( e );
-    }
-    return user;
-  }
-  
-  public static List<User> getAllUsers( ) {
-    EntityWrapper<User> db = Credentials.getEntityWrapper( );
-    try {
-      return db.query( new User( null, true ) );
-    } finally {
-      db.commit( );
-    }
-  }
-  
-  public static User addUser( String userName, Boolean isAdmin, String queryId, String secretKey ) throws UserExistsException {
-    User newUser = new User( userName, true );
-    newUser.setQueryId( queryId );
-    newUser.setSecretKey( secretKey );
-    newUser.setIsAdministrator( isAdmin );
-    EntityWrapper<User> db = Credentials.getEntityWrapper( );
-    try {
-      db.add( newUser );
-      db.commit( );
-    } catch ( Exception e ) {
-      db.rollback( );
-      throw new UserExistsException( e );
-    }
-    return newUser;
-  }
-  
-  public static User addUser( String userName, Boolean isAdmin ) throws UserExistsException {
-    String queryId = Hashes.getDigestBase64( userName, Hashes.Digest.SHA224, false ).replaceAll( "\\p{Punct}", "" );
-    String secretKey = Hashes.getDigestBase64( userName, Hashes.Digest.SHA224, true ).replaceAll( "\\p{Punct}", "" );
-    return CredentialProvider.addUser( userName, isAdmin, queryId, secretKey );
-  }
-  
-  public static User addUser( String userName ) throws UserExistsException {
-    return CredentialProvider.addUser( userName, false );
-  }
-  
-  public static void deleteUser( String userName ) throws NoSuchUserException {
-    User user = new User( userName );
-    EntityWrapper<User> db = Credentials.getEntityWrapper( );
-    try {
-      User foundUser = db.getUnique( user );
-      db.delete( foundUser );
-      db.commit( );
-    } catch ( Exception e ) {
-      db.rollback( );
-      throw new NoSuchUserException( e );
-    }
-  }
-  
-  public static void updateUser( String userName, Boolean isEnabled ) throws NoSuchUserException {
-    User user = new User( userName );
-    EntityWrapper<User> db = Credentials.getEntityWrapper( );
-    try {
-      User foundUser = db.getUnique( user );
-      foundUser.setIsEnabled( isEnabled );
-      db.commit( );
-    } catch ( Exception e ) {
-      db.rollback( );
-      throw new NoSuchUserException( e );
-    }
-  }
-}

=== removed file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/Credentials.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/Credentials.java	2010-02-05 11:57:00 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/Credentials.java	1970-01-01 00:00:00 +0000
@@ -1,107 +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: chris grzegorczyk <[e-mail]>
- */
-package com.eucalyptus.auth;
-
-import java.security.Security;
-
-import org.apache.log4j.Logger;
-import org.apache.ws.security.WSSConfig;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-import com.eucalyptus.util.EntityWrapper;
-
-public class Credentials {
-  static Logger LOG            = Logger.getLogger( Credentials.class );
-  private static String FORMAT         = "pkcs12";
-  private static String KEY_STORE_PASS = "eucalyptus";                         
-  private static String FILENAME       = "euca.p12";
-  static String  DB_NAME        = "eucalyptus_auth";
-
-  public static void init( ) {
-    Security.addProvider( new BouncyCastleProvider( ) );
-    org.apache.xml.security.Init.init( );
-    WSSConfig.getDefaultWSConfig( ).addJceProvider( "BC", BouncyCastleProvider.class.getCanonicalName( ) );
-    WSSConfig.getDefaultWSConfig( ).setTimeStampStrict( true );
-    WSSConfig.getDefaultWSConfig( ).setEnableSignatureConfirmation( true );
-  }
-
-  public static boolean checkAdmin( ) {
-    try {
-      CredentialProvider.getUser( "admin" );
-    } catch ( NoSuchUserException e ) {
-      try {
-        CredentialProvider.addUser( "admin", Boolean.TRUE );
-      } catch ( UserExistsException e1 ) {
-        LOG.fatal( e1, e1 );
-        return false;
-      }
-    }
-    return true;
-  }
-
-  public static <T> EntityWrapper<T> getEntityWrapper( ) {
-    return new EntityWrapper<T>( Credentials.DB_NAME );
-  }
-
-}

=== added file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseAuthBootstrapper.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseAuthBootstrapper.java	1970-01-01 00:00:00 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseAuthBootstrapper.java	2010-08-17 20:32:41 +0000
@@ -0,0 +1,72 @@
+package com.eucalyptus.auth;
+
+import org.apache.log4j.Logger;
+import com.eucalyptus.auth.util.AuthBootstrapHelper;
+import com.eucalyptus.bootstrap.Bootstrap;
+import com.eucalyptus.bootstrap.Bootstrapper;
+import com.eucalyptus.bootstrap.Component;
+import com.eucalyptus.bootstrap.DependsLocal;
+import com.eucalyptus.bootstrap.Provides;
+import com.eucalyptus.bootstrap.RunDuring;
+import com.eucalyptus.bootstrap.Bootstrap.Stage;
+import com.eucalyptus.entities.Counters;
+import com.eucalyptus.entities.EntityWrapper;
+import com.eucalyptus.entities.VmType;
+
+@Provides( Component.bootstrap )
+@RunDuring( Bootstrap.Stage.UserCredentialsInit )
+public class DatabaseAuthBootstrapper extends Bootstrapper {
+  private static Logger LOG = Logger.getLogger( DatabaseAuthBootstrapper.class );
+  
+  public static boolean ENABLE = true;
+  
+  public boolean load( Stage current ) throws Exception {
+    if (ENABLE) {
+      DatabaseAuthProvider dbAuth = new DatabaseAuthProvider( );
+      Users.setUserProvider( dbAuth );
+      Groups.setGroupProvider( dbAuth );
+      UserInfoStore.setUserInfoProvider( dbAuth );
+    }
+    return true;
+  }
+  
+  public boolean start( ) throws Exception {
+    if (ENABLE) {
+      this.checkUserEnabled( );
+      AuthBootstrapHelper.ensureStandardGroupsExists( );
+      AuthBootstrapHelper.ensureAdminExists( );
+    }
+    this.ensureCountersExist( );
+    this.ensureVmTypesExist( );
+    return true;
+  }
+  
+  private void checkUserEnabled( ) {
+    EntityWrapper<UserEntity> db = Authentication.getEntityWrapper( );
+    for ( UserEntity u : db.query( new UserEntity( ) ) ) {
+      if ( u.isEnabled( ) != Boolean.FALSE ) {
+        u.setEnabled( Boolean.TRUE );
+      }
+    }
+  }
+  
+  private void ensureVmTypesExist( ) {
+    EntityWrapper<VmType> db = new EntityWrapper<VmType>( "eucalyptus_general" );
+    try {
+      if ( db.query( new VmType( ) ).size( ) == 0 ) { //TODO: make defaults configurable?
+        db.add( new VmType( "m1.small", 1, 2, 128 ) );
+        db.add( new VmType( "c1.medium", 1, 5, 256 ) );
+        db.add( new VmType( "m1.large", 2, 10, 512 ) );
+        db.add( new VmType( "m1.xlarge", 2, 20, 1024 ) );
+        db.add( new VmType( "c1.xlarge", 4, 20, 2048 ) );
+      }
+      db.commit( );
+    } catch ( Exception e ) {
+      db.rollback( );
+    }
+  }
+
+  private void ensureCountersExist( ) {
+    Counters.getNextId( );
+  }
+}

=== added file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseAuthProvider.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseAuthProvider.java	1970-01-01 00:00:00 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseAuthProvider.java	2010-08-17 20:32:41 +0000
@@ -0,0 +1,423 @@
+/*******************************************************************************
+ *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]>
+ */
+package com.eucalyptus.auth;
+
+import java.security.GeneralSecurityException;
+import java.security.cert.X509Certificate;
+import java.util.List;
+import org.apache.log4j.Logger;
+import org.hibernate.Session;
+import org.hibernate.criterion.Example;
+import org.hibernate.criterion.MatchMode;
+import com.eucalyptus.auth.api.GroupProvider;
+import com.eucalyptus.auth.api.NoSuchCertificateException;
+import com.eucalyptus.auth.api.UserInfoProvider;
+import com.eucalyptus.auth.api.UserProvider;
+import com.eucalyptus.auth.crypto.Crypto;
+import com.eucalyptus.auth.crypto.Hmacs;
+import com.eucalyptus.auth.principal.Group;
+import com.eucalyptus.auth.principal.User;
+import com.eucalyptus.auth.util.B64;
+import com.eucalyptus.auth.util.PEMFiles;
+import com.eucalyptus.entities.EntityWrapper;
+import com.eucalyptus.util.EucalyptusCloudException;
+import com.eucalyptus.util.Tx;
+import com.google.common.collect.Lists;
+
+public class DatabaseAuthProvider implements UserProvider, GroupProvider, UserInfoProvider {
+  private static Logger LOG = Logger.getLogger( DatabaseAuthProvider.class );
+  
+  public DatabaseAuthProvider( ) {}
+  
+  @Override
+  public User addUser( String userName, Boolean isAdmin, Boolean isEnabled ) throws UserExistsException {
+    UserEntity newUser = new UserEntity( userName );
+    newUser.setQueryId( Hmacs.generateQueryId( userName ) );
+    newUser.setSecretKey( Hmacs.generateSecretKey( userName ) );
+    newUser.setAdministrator( isAdmin );
+    newUser.setEnabled( isEnabled );
+    newUser.setPassword( Crypto.generateHashedPassword( userName ) );
+    newUser.setToken( Crypto.generateSessionToken( userName ) );
+    EntityWrapper<UserEntity> db = Authentication.getEntityWrapper( );
+    try {
+      db.add( newUser );
+      db.commit( );
+    } catch ( Throwable t ) {
+      db.rollback( );
+      throw new UserExistsException( t );
+    }
+    EntityWrapper<UserInfo> dbU = EntityWrapper.get( UserInfo.class );
+    try {
+      String confirmCode = Crypto.generateSessionToken( userName );
+      UserInfo newUserInfo = new UserInfo( userName, confirmCode );
+      dbU.add( newUserInfo );
+      dbU.commit( );
+    } catch ( Exception e ) {
+      LOG.debug( e, e );
+      dbU.rollback( );
+    }    
+    User proxy = new DatabaseWrappedUser( newUser );
+    Groups.DEFAULT.addMember( proxy );
+    return proxy;
+  }
+  
+  @Override
+  public void deleteUser( String userName ) throws NoSuchUserException {
+    UserEntity user = new UserEntity( userName );
+    EntityWrapper<UserInfo> dbU = EntityWrapper.get( UserInfo.class );
+    try {
+      UserInfo newUserInfo = dbU.getUnique( new UserInfo( userName ) );
+      dbU.delete( newUserInfo );
+      dbU.commit( );
+    } catch ( Exception e ) {
+      LOG.debug( e, e );
+      dbU.rollback( );
+    }    
+    EntityWrapper<User> db = Authentication.getEntityWrapper( );
+    try {
+      User foundUser = db.getUnique( user );
+      for( Group g : Groups.lookupUserGroups( foundUser ) ) {
+        g.removeMember( foundUser );
+      }
+      db.delete( foundUser );
+      db.commit( );
+    } catch ( Exception e ) {
+      db.rollback( );
+      throw new NoSuchUserException( e );
+    }
+  }
+  
+  @Override
+  public List<Group> lookupUserGroups( User user ) {
+    List<Group> userGroups = Lists.newArrayList( );
+    EntityWrapper<GroupEntity> db = Authentication.getEntityWrapper( );
+    try {
+      UserEntity userInfo = db.recast( UserEntity.class ).getUnique( new UserEntity( user.getName( ) ) );
+      for ( GroupEntity g : db.query( new GroupEntity( ) ) ) {
+        if ( g.isMember( userInfo ) ) {
+          userGroups.add( DatabaseWrappedGroup.newInstance( g ) );
+        }
+      }
+      db.commit( );
+    } catch ( EucalyptusCloudException e ) {
+      LOG.debug( e, e );
+      db.rollback( );
+    }
+    return userGroups;
+  }
+  
+  @Override
+  public Group lookupGroup( String groupName ) throws NoSuchGroupException {
+    EntityWrapper<GroupEntity> db = Authentication.getEntityWrapper( );
+    try {
+      GroupEntity group = db.getUnique( new GroupEntity( groupName ) );
+      db.commit( );
+      return DatabaseWrappedGroup.newInstance( group );
+    } catch ( EucalyptusCloudException e ) {
+      db.rollback( );
+      throw new NoSuchGroupException( e );
+    }
+  }
+  
+  @Override
+  public List<User> listAllUsers( ) {
+    List<User> users = Lists.newArrayList( );
+    EntityWrapper<UserEntity> db = Authentication.getEntityWrapper( );
+    UserEntity searchUser = new UserEntity( );
+    UserEntity user = null;
+    try {
+      for( UserEntity u : db.query( searchUser ) ) {
+        users.add( new DatabaseWrappedUser( u ) );
+      }
+      db.commit( );
+    } catch ( Throwable e ) {
+      db.rollback( );
+    }
+    return users;
+  }
+  
+  @Override
+  public List<User> listEnabledUsers( ) {
+    List<User> users = Lists.newArrayList( );
+    EntityWrapper<UserEntity> db = Authentication.getEntityWrapper( );
+    UserEntity searchUser = new UserEntity( );
+    searchUser.setEnabled( true );
+    UserEntity user = null;
+    try {
+      for( UserEntity u : db.query( searchUser ) ) {
+        users.add( new DatabaseWrappedUser( u ) );
+      }
+      db.commit( );
+    } catch ( Throwable e ) {
+      db.rollback( );
+    }
+    return users;
+  }
+  
+  @Override
+  public User lookupCertificate( X509Certificate cert ) throws NoSuchUserException {
+    String certPem = B64.url.encString( PEMFiles.getBytes( cert ) );
+    UserEntity searchUser = new UserEntity( );
+    searchUser.setEnabled( true );
+    X509Cert searchCert = new X509Cert( );
+    searchCert.setPemCertificate( certPem );
+    searchCert.setRevoked( null );
+    EntityWrapper<UserEntity> db = EntityWrapper.get( searchUser );
+    Session session = db.getSession( );
+    try {
+      Example qbeUser = Example.create( searchUser ).enableLike( MatchMode.EXACT );
+      Example qbeCert = Example.create( searchCert ).enableLike( MatchMode.EXACT );
+      List<UserEntity> users = ( List<UserEntity> ) session.createCriteria( UserEntity.class ).setCacheable( true ).add( qbeUser ).createCriteria( "certificates" )
+                                               .setCacheable( true ).add( qbeCert ).list( );
+      UserEntity ret = users.size( ) == 1 ? users.get( 0 ) : null;
+      int size = users.size( );
+      if ( ret != null ) {
+        return new DatabaseWrappedUser( ret );
+      } else {
+        throw new GeneralSecurityException( ( size == 0 ) ? "No user with the specified certificate." : "Multiple users with the same certificate." );
+      }
+    } catch ( Throwable t ) {
+      throw new NoSuchUserException( t );
+    } finally {
+      db.rollback( );
+    }
+  }
+  
+  @Override
+  public boolean checkRevokedCertificate( X509Certificate cert ) throws NoSuchCertificateException {
+    String certPem = B64.url.encString( PEMFiles.getBytes( cert ) );
+    UserEntity searchUser = new UserEntity( );
+    searchUser.setEnabled( true );
+    X509Cert searchCert = new X509Cert( );
+    searchCert.setPemCertificate( certPem );
+    searchCert.setRevoked( true );
+    EntityWrapper<UserEntity> db = EntityWrapper.get( searchUser );
+    Session session = db.getSession( );
+    try {
+      Example qbeUser = Example.create( searchUser ).enableLike( MatchMode.EXACT );
+      Example qbeCert = Example.create( searchCert ).enableLike( MatchMode.EXACT );
+      List<User> users = ( List<User> ) session.createCriteria( User.class ).setCacheable( true ).add( qbeUser ).createCriteria( "certificates" )
+                                               .setCacheable( true ).add( qbeCert ).list( );
+      if( users.isEmpty( ) || users.size( ) > 1 ) {
+        throw new NoSuchCertificateException( "Failed to identify user (found " + users.size() + ") from certificate information: " + cert.getSubjectX500Principal( ).toString( ) );
+      } else {
+        return true;
+      }
+    } finally {
+      db.rollback( );
+    }
+  }
+  
+  
+  @Override
+  public User lookupQueryId( String queryId ) throws NoSuchUserException {
+    String userName = null;
+    EntityWrapper<UserEntity> db = Authentication.getEntityWrapper( );
+    UserEntity searchUser = new UserEntity( );
+    searchUser.setQueryId( queryId );
+    UserEntity user = null;
+    try {
+      user = db.getUnique( searchUser );
+      db.commit( );
+    } catch ( Throwable e ) {
+      db.rollback( );
+      throw new NoSuchUserException( e );
+    }
+    return new DatabaseWrappedUser( user );
+  }
+  
+  @Override
+  public User lookupUser( String userName ) throws NoSuchUserException {
+    EntityWrapper<UserEntity> db = Authentication.getEntityWrapper( );
+    UserEntity searchUser = new UserEntity( userName );
+    UserEntity user = null;
+    try {
+      user = db.getUnique( searchUser );
+      db.commit( );
+    } catch ( Throwable e ) {
+      db.rollback( );
+      throw new NoSuchUserException( e );
+    }
+    return new DatabaseWrappedUser( user );
+  }
+  
+  @Override
+  public Group addGroup( String groupName ) throws GroupExistsException {
+    EntityWrapper<GroupEntity> db = Authentication.getEntityWrapper( );
+    GroupEntity newGroup = new GroupEntity( groupName );
+    try {
+      db.add( newGroup );
+      db.commit( );
+    } catch ( Throwable t ) {
+      db.rollback( );
+      throw new GroupExistsException( t );
+    }
+    return DatabaseWrappedGroup.newInstance( newGroup );
+  }
+  
+  @Override
+  public List<Group> listAllGroups( ) {
+    List<Group> ret = Lists.newArrayList( );
+    GroupEntity search = new GroupEntity( );
+    EntityWrapper<GroupEntity> db = EntityWrapper.get( search );
+    try {
+      List<GroupEntity> groupList = db.query( search );
+      for ( GroupEntity g : groupList ) {
+        ret.add( DatabaseWrappedGroup.newInstance( g ) );
+      }
+    } finally {
+      db.commit( );
+    }
+    return ret;
+  }
+  @Override
+  public void deleteGroup( String groupName ) throws NoSuchGroupException {
+    Groups.checkNotRestricted( groupName );
+    EntityWrapper<GroupEntity> db = Authentication.getEntityWrapper( );
+    GroupEntity delGroup = new GroupEntity( groupName );
+    try {
+      GroupEntity g = db.getUnique( delGroup );
+      db.delete( g );
+      db.commit( );
+    } catch ( Throwable t ) {
+      db.rollback( );
+      throw new NoSuchGroupException( t );
+    }    
+  }
+
+  @Override
+  public void updateUser( String name, Tx<User> userTx ) throws NoSuchUserException {
+    UserEntity search = new UserEntity(name);
+    EntityWrapper<UserEntity> db = EntityWrapper.get( search );
+    try {
+      UserEntity entity = db.getUnique( search );
+      userTx.fire( entity );
+      db.commit( );
+    } catch ( EucalyptusCloudException e ) {
+      db.rollback( );
+      throw new NoSuchUserException( e.getMessage( ), e );
+    } catch ( Throwable e ) {
+      db.rollback( );
+      LOG.error( e, e );
+      throw new NoSuchUserException( e.getMessage( ), e );
+    }    
+  }
+
+  @Override
+  public void addUserInfo( UserInfo user ) throws UserExistsException {
+    EntityWrapper<UserInfo> dbWrapper = EntityWrapper.get( UserInfo.class );
+    try {
+      dbWrapper.add( user );
+      dbWrapper.commit();
+    } catch ( Exception e1 ) {
+      dbWrapper.rollback();
+      LOG.error( e1, e1 );
+      throw new UserExistsException( "User info exists", e1 );
+    }    
+  }
+
+  @Override
+  public void deleteUserInfo( String userName ) throws NoSuchUserException {
+    EntityWrapper<UserInfo> dbWrapper = new EntityWrapper<UserInfo>( );
+    try {
+      UserInfo userInfo = dbWrapper.getUnique( new UserInfo(userName) );
+      dbWrapper.delete( userInfo );
+      dbWrapper.commit( );
+    } catch ( EucalyptusCloudException e1 ) {
+      dbWrapper.rollback( );
+      LOG.error( e1, e1 );
+      throw new NoSuchUserException( "User info does not exist", e1 );  
+    }    
+  }
+
+  @Override
+  public UserInfo getUserInfo( UserInfo search ) throws NoSuchUserException {
+    EntityWrapper<UserInfo> dbWrapper = new EntityWrapper<UserInfo>( );
+    try {
+      UserInfo userInfo = dbWrapper.getUnique( search );
+      dbWrapper.commit( );
+      return userInfo;
+    } catch ( EucalyptusCloudException e ) {
+      dbWrapper.rollback( );
+      throw new NoSuchUserException( "User info does not exist", e );
+    }
+  }
+
+  @Override
+  public void updateUserInfo( String name, Tx<UserInfo> infoTx ) throws NoSuchUserException {
+    EntityWrapper<UserInfo> dbWrapper = new EntityWrapper<UserInfo>( );
+    try {
+      UserInfo userInfo = dbWrapper.getUnique( new UserInfo(name) );
+      infoTx.fire( userInfo );
+      dbWrapper.commit( );
+    } catch ( EucalyptusCloudException e ) {
+      dbWrapper.rollback( );
+      LOG.error( e, e );
+      throw new NoSuchUserException( "User info does not exist", e );
+    } catch ( Throwable t ) {
+      dbWrapper.rollback( );
+      LOG.error( t, t );
+      throw new NoSuchUserException( "Error in updating user info", t );
+    }
+  }
+}

=== added file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseWrappedGroup.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseWrappedGroup.java	1970-01-01 00:00:00 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseWrappedGroup.java	2010-08-17 20:32:41 +0000
@@ -0,0 +1,218 @@
+package com.eucalyptus.auth;
+
+import java.security.Principal;
+import java.util.Enumeration;
+import java.util.List;
+import org.apache.log4j.Logger;
+import com.eucalyptus.auth.principal.Authorization;
+import com.eucalyptus.auth.principal.BaseAuthorization;
+import com.eucalyptus.auth.principal.Group;
+import com.eucalyptus.auth.principal.User;
+import com.eucalyptus.entities.EntityWrapper;
+import com.eucalyptus.records.EventClass;
+import com.eucalyptus.records.EventRecord;
+import com.eucalyptus.records.EventType;
+import com.eucalyptus.util.EucalyptusCloudException;
+import com.eucalyptus.util.FinalReturn;
+import com.eucalyptus.util.TransactionException;
+import com.eucalyptus.util.Transactions;
+import com.eucalyptus.util.Tx;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
+
+public class DatabaseWrappedGroup implements Group {
+  private static Logger LOG = Logger.getLogger( DatabaseWrappedGroup.class );
+
+  public static Group newInstance( Group g ) {
+    if( Groups.NAME_ALL.equals( g.getName( ) ) ) {
+      return new AllGroup( g );
+    } else {
+      return new DatabaseWrappedGroup( g );
+    }
+  }
+
+  private GroupEntity   searchGroup;
+  private Group group;
+  
+  protected DatabaseWrappedGroup( Group group ) {
+    this.searchGroup = new GroupEntity( group.getName( ) );
+    this.group = group;
+  }
+  
+  @Override
+  public boolean addMember( Principal principal ) {
+    EntityWrapper<UserEntity> db = Authentication.getEntityWrapper( );
+    try {
+      UserEntity user = db.getUnique( new UserEntity( principal.getName( ) ) );
+      GroupEntity g = db.recast( GroupEntity.class ).getUnique( this.searchGroup );
+      if ( !g.isMember( user ) ) {
+        g.addMember( user );
+        db.commit( );
+        EventRecord.here( Groups.class, EventClass.GROUP, EventType.GROUP_MEMBER_ADDED, this.getName( ), user.getName( ) ).info();
+        return true;
+      } else {
+        db.rollback( );
+        return false;
+      }
+    } catch ( EucalyptusCloudException e ) {
+      LOG.debug( e, e );
+      db.rollback( );
+      return false;
+    }
+  }
+  
+  @Override
+  public boolean isMember( Principal member ) {
+    EntityWrapper<UserEntity> db = Authentication.getEntityWrapper( );
+    try {
+      boolean ret = this.group.isMember( db.getUnique( new UserEntity( member.getName( ) ) ) );
+      db.commit( );
+      return ret;
+    } catch ( EucalyptusCloudException e ) {
+      LOG.debug( e, e );
+      db.rollback( );
+      return false;
+    }
+  }
+  
+  @Override
+  public Enumeration<? extends Principal> members( ) {
+    final List<User> userList = Lists.newArrayList( );
+    try {
+      Transactions.one( this.searchGroup, new Tx<GroupEntity>( ) {
+        @Override
+        public void fire( GroupEntity t ) throws Throwable {
+          for( User user : t.getMembers( ) ) {
+            try {
+              userList.add( Users.lookupUser( user.getName( ) ) );
+            } catch ( NoSuchUserException e ) {
+              LOG.debug( e, e );
+            }
+          }
+        }
+      } );
+    } catch ( TransactionException e1 ) {
+      LOG.debug( e1, e1 );
+    }
+    return Iterators.asEnumeration( userList.iterator( ) );
+  }
+  
+  @Override
+  public boolean removeMember( Principal user ) {
+    EntityWrapper<UserEntity> db = Authentication.getEntityWrapper( );
+    try {
+      UserEntity userInfo = db.getUnique( new UserEntity( user.getName( ) ) );
+      GroupEntity g = db.recast( GroupEntity.class ).getUnique( this.searchGroup );
+      if ( g.isMember( userInfo ) ) {
+        g.removeMember( userInfo );
+        db.commit( );
+        EventRecord.here( Groups.class, EventClass.GROUP, EventType.GROUP_MEMBER_REMOVED, this.getName( ), userInfo.getName( ) ).info();
+        return true;
+      } else {
+        db.rollback( );
+        return false;
+      }
+    } catch ( EucalyptusCloudException e ) {
+      LOG.debug( e, e );
+      db.rollback( );
+      return false;
+    }
+  }
+  
+  @Override
+  public String getName( ) {
+    return this.group.getName( );
+  }
+  
+  @Override
+  public boolean equals( Object o ) {
+    if ( this == o ) return true;
+    if ( o instanceof GroupEntity ) {
+      GroupEntity that = ( GroupEntity ) o;
+      return this.group.equals( that );
+    } else if ( o instanceof DatabaseWrappedGroup ) {
+      DatabaseWrappedGroup that = ( DatabaseWrappedGroup ) o;
+      return this.group.equals( that.group );
+    } else {
+      return false;
+    }
+  }
+  
+  @Override
+  public boolean addAuthorization( final Authorization authorization ) {
+    if ( authorization instanceof BaseAuthorization ) {
+      BaseAuthorization auth = ( BaseAuthorization ) authorization;
+      EntityWrapper<BaseAuthorization> db = EntityWrapper.get( BaseAuthorization.class );
+      boolean ret = false;
+      try {
+        db.add( auth );
+        GroupEntity g = db.recast( GroupEntity.class ).getUnique( searchGroup );
+        ret = g.addAuthorization( auth );
+        db.recast( GroupEntity.class ).merge( g );
+        this.group = g;
+        db.commit( );
+        EventRecord.here( Groups.class, EventClass.GROUP, EventType.GROUP_AUTH_GRANTED, this.getName( ), auth.getDisplayName( ), auth.getValue( ) ).info();
+      } catch ( Throwable e ) {
+        ret = false;
+        LOG.debug( e, e );
+        db.rollback( );
+      } 
+      return ret;
+    } else {
+      throw new RuntimeException( "Authorizations must extend from BaseAuthorization, passed: " + authorization.getClass( ).getCanonicalName( ) );
+    }
+  }
+  
+  @Override
+  public ImmutableList<Authorization> getAuthorizations( ) {
+    final List<Authorization> auths = Lists.newArrayList( );
+    try {
+      Transactions.one( this.searchGroup, new Tx<GroupEntity>( ) {
+        @Override
+        public void fire( GroupEntity t ) throws Throwable {
+          for( Authorization a : t.getAuthorizations( ) ) {
+            auths.add( a );
+          }
+        }
+      } );
+    } catch ( TransactionException e ) {
+      LOG.debug( e, e );
+    }
+    return ImmutableList.copyOf( auths );
+  }
+  
+  @Override
+  public ImmutableList<User> getMembers( ) {
+    final List<User> users = Lists.newArrayList( );
+    try {
+      Transactions.one( this.searchGroup, new Tx<GroupEntity>( ) {
+        @Override
+        public void fire( GroupEntity t ) throws Throwable {
+          users.addAll( t.getMembers( ) );
+        }
+      } );
+    } catch ( TransactionException e ) {
+      LOG.debug( e, e );
+    }
+    return ImmutableList.copyOf( users );
+  }
+  
+  @Override
+  public boolean removeAuthorization( final Authorization auth ) {
+    final FinalReturn<Boolean> ret = FinalReturn.newInstance( );  
+    try {
+      Transactions.one( this.searchGroup, new Tx<GroupEntity>( ) {
+        @Override
+        public void fire( GroupEntity t ) throws Throwable {
+           ret.set( t.removeAuthorization( auth ) );
+           EventRecord.here( Groups.class, EventClass.GROUP, EventType.GROUP_AUTH_REVOKED, t.getName( ), auth.getDisplayName( ), auth.getValue( ) ).info();
+        }
+      } );
+    } catch ( TransactionException e ) {
+      LOG.debug( e, e );
+    }
+    return ret.get( );
+  }
+  
+}

=== added file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseWrappedUser.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseWrappedUser.java	1970-01-01 00:00:00 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/DatabaseWrappedUser.java	2010-08-17 20:32:41 +0000
@@ -0,0 +1,299 @@
+package com.eucalyptus.auth;
+
+import java.math.BigInteger;
+import java.security.cert.X509Certificate;
+import java.util.List;
+import org.apache.log4j.Logger;
+import com.eucalyptus.auth.crypto.Crypto;
+import com.eucalyptus.auth.principal.Group;
+import com.eucalyptus.auth.principal.User;
+import com.eucalyptus.util.TransactionException;
+import com.eucalyptus.util.Transactions;
+import com.eucalyptus.util.Tx;
+import com.google.common.base.Function;
+
+public class DatabaseWrappedUser implements User, WrappedUser {
+  
+  public static Function<UserEntity, DatabaseWrappedUser> proxyFunction = new Function<UserEntity, DatabaseWrappedUser>( ) {
+                                                                          public DatabaseWrappedUser apply( UserEntity arg0 ) {
+                                                                            return new DatabaseWrappedUser( arg0 );
+                                                                          }
+                                                                        };
+  
+  private static Logger                                   LOG           = Logger.getLogger( DatabaseWrappedUser.class );
+  private final UserEntity                                searchUser;
+  private UserEntity                                      user;
+  
+  public DatabaseWrappedUser( UserEntity user ) {
+    this.searchUser = new UserEntity( user.getName( ) );
+    this.user = user;
+  }
+  
+  @Override
+  public void setQueryId( final String queryId ) {
+    try {
+      Transactions.one( this.searchUser, new Tx<User>( ) {
+        public void fire( User t ) throws Throwable {
+          t.setQueryId( queryId );
+        }
+      } );
+    } catch ( TransactionException e1 ) {
+      LOG.debug( e1, e1 );
+    }
+  }
+  
+  @Override
+  public void setSecretKey( final String secretKey ) {
+    try {
+      Transactions.one( this.searchUser, new Tx<User>( ) {
+        public void fire( User t ) throws Throwable {
+          t.setSecretKey( secretKey );
+        }
+      } );
+    } catch ( TransactionException e1 ) {
+      LOG.debug( e1, e1 );
+    }
+  }
+  
+  @Override
+  public void revokeSecretKey( ) {
+    try {
+      Transactions.one( this.searchUser, new Tx<User>( ) {
+        public void fire( User t ) throws Throwable {
+          t.revokeSecretKey( );
+        }
+      } );
+    } catch ( TransactionException e1 ) {
+      LOG.debug( e1, e1 );
+    }
+  }
+  
+  @Override
+  public void revokeX509Certificate( ) {
+    try {
+      Transactions.one( this.searchUser, new Tx<User>( ) {
+        public void fire( User t ) throws Throwable {
+          t.revokeX509Certificate( );
+        }
+      } );
+    } catch ( TransactionException e1 ) {
+      LOG.debug( e1, e1 );
+    }
+  }
+  
+  /**
+   * @see com.eucalyptus.auth.principal.User#setAdministrator(java.lang.Boolean)
+   * @param admin
+   */
+  @Override
+  public void setAdministrator( final Boolean admin ) {
+    try {
+      Transactions.one( this.searchUser, new Tx<User>( ) {
+        public void fire( User t ) throws Throwable {
+          t.setAdministrator( admin );
+        }
+      } );
+    } catch ( TransactionException e1 ) {
+      LOG.debug( e1, e1 );
+    }
+  }
+  
+  /**
+   * @see com.eucalyptus.auth.principal.User#setEnabled(java.lang.Boolean)
+   * @param enabled
+   */
+  @Override
+  public void setEnabled( final Boolean enabled ) {
+    try {
+      Transactions.one( this.searchUser, new Tx<User>( ) {
+        public void fire( User t ) throws Throwable {
+          t.setEnabled( enabled );
+        }
+      } );
+    } catch ( TransactionException e1 ) {
+      LOG.debug( e1, e1 );
+    }
+  }
+  
+  /**
+   * @see com.eucalyptus.auth.principal.User#setX509Certificate(java.security.cert.X509Certificate)
+   * @param cert
+   */
+  @Override
+  public void setX509Certificate( final X509Certificate cert ) {
+    try {
+      Transactions.one( this.searchUser, new Tx<User>( ) {
+        public void fire( User t ) throws Throwable {
+          t.setX509Certificate( cert );
+        }
+      } );
+    } catch ( TransactionException e1 ) {
+      LOG.debug( e1, e1 );
+    }
+  }
+  
+  /**
+   * @see com.eucalyptus.auth.principal.User#getIsAdministrator()
+   * @return
+   */
+  @Override
+  public Boolean isAdministrator( ) {
+    return this.user.isAdministrator( );
+  }
+  
+  /**
+   * Just to make CompositeHelper.goovy happy.
+   * 
+   * @return
+   */
+  public Boolean getAdministrator( ) {
+    return this.user.isAdministrator( );
+  }
+  
+  /**
+   * @see com.eucalyptus.auth.principal.User#getIsEnabled()
+   * @return
+   */
+  @Override
+  public Boolean isEnabled( ) {
+    return this.user.isEnabled( );
+  }
+  
+  /**
+   * Just to make CompositeHelper.goovy happy.
+   * 
+   * @return
+   */
+  public Boolean getEnabled( ) {
+    return this.user.isEnabled( );
+  }
+  
+  /**
+   * @see com.eucalyptus.auth.principal.User#getName()
+   * @return
+   */
+  @Override
+  public String getName( ) {
+    return this.user.getName( );
+  }
+  
+  /**
+   * @see com.eucalyptus.auth.principal.User#getQueryId()
+   * @return
+   */
+  @Override
+  public String getQueryId( ) {
+    return this.user.getQueryId( );
+  }
+  
+  /**
+   * @see com.eucalyptus.auth.principal.User#getSecretKey()
+   * @return
+   */
+  @Override
+  public String getSecretKey( ) {
+    return this.user.getSecretKey( );
+  }
+  
+  /**
+   * @see com.eucalyptus.auth.principal.User#getX509Certificate()
+   * @return
+   */
+  @Override
+  public X509Certificate getX509Certificate( ) {
+    return this.user.getX509Certificate( );
+  }
+  
+  /**
+   * @see com.eucalyptus.auth.principal.credential.CredentialPrincipal#getNumber()
+   * @return
+   */
+  @Override
+  public BigInteger getNumber( ) {
+    return this.user.getNumber( );
+  }
+  
+  /**
+   * @see com.eucalyptus.auth.principal.User#getToken()
+   * @return
+   */
+  @Override
+  public String getToken( ) {
+    return this.user.getToken( );
+  }
+  
+  /**
+   * @see com.eucalyptus.auth.principal.credential.X509Principal#getAllX509Certificates()
+   * @return
+   */
+  @Override
+  public List<X509Certificate> getAllX509Certificates( ) {
+    return this.user.getAllX509Certificates( );
+  }
+  
+  @Override
+  public User getDelegate( ) {
+    return this.user;
+  }
+  
+  @Override
+  public boolean checkToken( String testToken ) {
+    String token = this.user.getToken( );
+    boolean ret = false;
+    if ( token != null ) {
+      ret = token.equals( testToken );
+    }
+    try {
+      Transactions.one( this.searchUser, new Tx<UserEntity>( ) {
+        public void fire( UserEntity t ) throws Throwable {
+          t.setToken( Crypto.generateSessionToken( t.getName( ) ) );
+        }
+      } );
+    } catch ( TransactionException e1 ) {
+      LOG.debug( e1, e1 );
+    }
+    return ret;
+  }
+  
+  @Override
+  public String getPassword( ) {
+    return this.user.getPassword( );
+  }
+  
+  @Override
+  public void setPassword( final String password ) {
+    try {
+      Transactions.one( this.searchUser, new Tx<User>( ) {
+        public void fire( User t ) throws Throwable {
+          t.setPassword( password );
+        }
+      } );
+    } catch ( TransactionException e1 ) {
+      LOG.debug( e1, e1 );
+    }
+  }
+  
+  public void setToken( final String token ) {
+    try {
+      Transactions.one( this.searchUser, new Tx<UserEntity>( ) {
+        public void fire( UserEntity t ) throws Throwable {
+          t.setToken( token );
+        }
+      } );
+    } catch ( TransactionException e1 ) {
+      LOG.debug( e1, e1 );
+    }
+  }
+  
+  public UserInfo getUserInfo( ) throws NoSuchUserException {
+    return UserInfoStore.getUserInfo( new UserInfo( this.user.getName( ) ) );
+  }
+  
+  public String toString( ) {
+    StringBuilder sb = new StringBuilder( );
+    sb.append( "DatabaseWrappedUser [ " );
+    sb.append( "user = " ).append( user ).append( ", " );
+    sb.append( "]" );
+    return sb.toString( );
+  }
+}

=== added file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/Debugging.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/Debugging.java	1970-01-01 00:00:00 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/Debugging.java	2010-08-17 20:32:41 +0000
@@ -0,0 +1,45 @@
+package com.eucalyptus.auth;
+
+import java.util.List;
+import org.apache.log4j.Logger;
+
+public class Debugging {
+  
+  public static final boolean DEBUG = true;
+  
+  public static String getListString( List list ) {
+    StringBuilder sb = new StringBuilder( );
+    for ( Object o : list ) {
+      sb.append( o ).append( " " );
+    }
+    return sb.toString( );
+  }
+  
+  public static String getEucaStackTraceString( int start ) {
+    StringBuilder sb = ( new StringBuilder( ) ).append( " STACK || ");
+    StackTraceElement[] stes = ( new Throwable( ) ).getStackTrace( );
+    for ( int i = start; i < stes.length; i++ ) {
+      String steStr = stes[i].toString( );
+      if ( steStr.contains( "eucalyptus" ) ) {
+        sb.append( steStr ).append( " || " );
+      }
+    }
+    return sb.toString( );
+  }
+  
+  /**
+   * Log with trace stack.
+   * 
+   * @param logger
+   */
+  public static void logWT( Logger logger, Object... objs ) {
+    if ( !DEBUG ) return;
+    StringBuilder sb = new StringBuilder( );
+    for ( Object obj : objs ) {
+      if ( obj != null ) {
+        sb.append( obj.toString( ) ).append( " " );
+      }
+    }
+    logger.debug( sb.toString( ) + " @ " +  getEucaStackTraceString( 2 ) );
+  }
+}

=== added file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/GroupEntity.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/GroupEntity.java	1970-01-01 00:00:00 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/GroupEntity.java	2010-08-17 20:32:41 +0000
@@ -0,0 +1,254 @@
+/*******************************************************************************
+ *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. userList 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]>
+ */
+package com.eucalyptus.auth;
+
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import org.apache.log4j.Logger;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import com.eucalyptus.auth.principal.Authorization;
+import com.eucalyptus.auth.principal.BaseAuthorization;
+import com.eucalyptus.auth.principal.Group;
+import com.eucalyptus.auth.principal.User;
+import com.eucalyptus.entities.AbstractPersistent;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterators;
+import edu.emory.mathcs.backport.java.util.Collections;
+
+@Entity
+@PersistenceContext( name = "eucalyptus_auth" )
+@Table( name = "auth_groups" )
+@Cache( usage = CacheConcurrencyStrategy.READ_WRITE )
+public class GroupEntity extends AbstractPersistent implements Group {
+  @Transient
+  private static Logger   LOG      = Logger.getLogger( GroupEntity.class );
+  @Column( name = "auth_group_name", unique = true )
+  String                  name;
+  
+  @ManyToMany( cascade = CascadeType.PERSIST )
+  @JoinTable( name = "auth_group_has_userList", joinColumns = { @JoinColumn( name = "auth_group_id" ) }, inverseJoinColumns = @JoinColumn( name = "auth_user_id" ) )
+  @Cache( usage = CacheConcurrencyStrategy.READ_WRITE )
+  List<UserEntity>        userList = new ArrayList<UserEntity>( );
+  
+  @OneToMany( cascade = CascadeType.ALL )
+  @JoinTable( name = "auth_group_has_authorization", joinColumns = { @JoinColumn( name = "auth_group_id" ) }, inverseJoinColumns = @JoinColumn( name = "auth_authorization_id" ) )
+  @Cache( usage = CacheConcurrencyStrategy.READ_WRITE )
+  List<BaseAuthorization> authList = new ArrayList<BaseAuthorization>( );
+  
+  @Transient
+  String                  timestamp;
+  
+  public GroupEntity( ) {}
+  
+  public GroupEntity( final String name ) {
+    this.name = name;
+  }
+  
+  public GroupEntity( final String name, final String timestamp ) {
+    this.name = name;
+    this.timestamp = timestamp;
+  }
+  
+  public String getName( ) {
+    return name;
+  }
+  
+  public void setName( final String name ) {
+    this.name = name;
+  }
+  
+  public List<BaseAuthorization> getAuthList( ) {
+    return this.authList;
+  }
+  
+  public void setAuthList( List<BaseAuthorization> authorizations ) {
+    this.authList = authorizations;
+  }
+  
+  public List<UserEntity> getUserList( ) {
+    return userList;
+  }
+  
+  public void setUserList( final List<UserEntity> userList ) {
+    this.userList = userList;
+  }
+  
+  public String getTimestamp( ) {
+    return timestamp;
+  }
+  
+  public void setTimestamp( String timestamp ) {
+    this.timestamp = timestamp;
+  }
+  
+  @Override
+  public boolean equals( final Object o ) {
+    if ( this == o ) return true;
+    if ( o == null || getClass( ) != o.getClass( ) ) return false;
+    
+    GroupEntity that = ( GroupEntity ) o;
+    
+    if ( !name.equals( that.name ) ) return false;
+    
+    return true;
+  }
+  
+  @Override
+  public int hashCode( ) {
+    return name.hashCode( );
+  }
+  
+  @Override
+  public boolean addAuthorization( Authorization auth ) {
+    if ( auth instanceof BaseAuthorization ) {
+      return this.authList.add( ( BaseAuthorization ) auth );
+    } else {
+      throw new RuntimeException( "EID: Authorizations must extend BaseAuthorization." );
+    }
+  }
+  
+  @Override
+  public boolean removeAuthorization( Authorization auth ) {
+    if ( auth instanceof BaseAuthorization ) {
+      return this.authList.remove( ( BaseAuthorization ) auth );
+    } else {
+      throw new RuntimeException( "EID: Authorizations must extend BaseAuthorization." );
+    }
+  }
+  
+  @Override
+  public boolean addMember( Principal user ) {
+    if ( user instanceof UserEntity ) {
+      return this.userList.add( ( UserEntity ) user );
+    } else {
+      LOG.debug( "EID: GroupEntity only supports users of type UserEntity" );
+      return false;
+    }
+  }
+  
+  @Override
+  public boolean isMember( Principal member ) {
+    if ( member instanceof UserEntity ) {
+      return this.userList.contains( ( UserEntity ) member );
+    } else {
+      LOG.debug( "EID: GroupEntity only supports users of type UserEntity" );
+      return false;
+    }
+  }
+  
+  @Override
+  public Enumeration<? extends Principal> members( ) {
+    return Iterators.asEnumeration( this.userList.iterator( ) );
+  }
+  
+  @Override
+  public boolean removeMember( Principal user ) {
+    if ( user instanceof UserEntity ) {
+      return this.userList.remove( ( UserEntity ) user );
+    } else {
+      LOG.debug( "EID: GroupEntity only supports users of type UserEntity" );
+      return false;
+    }
+  }
+  
+  @Override
+  public ImmutableList<Authorization> getAuthorizations( ) {
+    return ImmutableList.copyOf( ( List ) this.authList );
+  }
+  
+  @Override
+  public ImmutableList<User> getMembers( ) {
+    return ImmutableList.copyOf( ( List ) this.userList );
+  }
+  
+  public String toString( ) {
+    StringBuilder sb = new StringBuilder( );
+    sb.append( "GroupEntity [ " );
+    sb.append( "name = " ).append( name == null ? "null" : name ).append( ", " );
+    sb.append( "userList = " );
+    for ( UserEntity u : userList ) {
+      sb.append( u.getName( ) ).append( ", " );
+    }
+    sb.append( "authList = " );
+    for ( BaseAuthorization auth : authList ) {
+      sb.append( auth.getValue( ) ).append( ", " );
+    }
+    sb.append( "]" );
+    return sb.toString( );
+  }
+}

=== added file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/RemoteComponentCredentialBootstrapper.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/RemoteComponentCredentialBootstrapper.java	1970-01-01 00:00:00 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/RemoteComponentCredentialBootstrapper.java	2010-08-17 20:32:41 +0000
@@ -0,0 +1,119 @@
+/*******************************************************************************
+*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]>
+ */
+package com.eucalyptus.auth;
+
+import org.apache.log4j.Logger;
+import com.eucalyptus.auth.crypto.Hmacs;
+import com.eucalyptus.auth.util.EucaKeyStore;
+import com.eucalyptus.bootstrap.Bootstrap;
+import com.eucalyptus.bootstrap.Bootstrapper;
+import com.eucalyptus.bootstrap.Component;
+import com.eucalyptus.bootstrap.DependsRemote;
+import com.eucalyptus.bootstrap.Provides;
+import com.eucalyptus.bootstrap.RunDuring;
+import com.eucalyptus.bootstrap.Bootstrap.Stage;
+
+@Provides(Component.bootstrap)
+@RunDuring(Bootstrap.Stage.SystemCredentialsInit)
+@DependsRemote(Component.eucalyptus)
+public class RemoteComponentCredentialBootstrapper extends Bootstrapper {
+  private static Logger LOG = Logger.getLogger( RemoteComponentCredentialBootstrapper.class );
+
+  @Override
+  public boolean load( Stage current ) throws Exception {
+    while ( !this.checkAllKeys( ) ) {
+      LOG.fatal( "Waiting for system credentials before proceeding with startup..." );
+      try {
+        Thread.sleep( 2000 );
+      } catch ( Exception e ) {
+      }
+    }
+    for ( Component c : Component.values( ) ) {
+      LOG.info( "Initializing system credentials for " + c.name( ) );
+      SystemCredentialProvider.init( c );
+    }
+    return true;
+  }
+
+  private boolean checkAllKeys( ) {
+    for ( Component c : Component.values( ) ) {
+      if ( !Component.any.equals( c ) && c.isEnabled( ) ) {
+        try {
+          if( !EucaKeyStore.getCleanInstance( ).containsEntry( c.name( ) ) ) {
+            return false;
+          }
+        } catch ( Exception e ) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+
+  @Override
+  public boolean start( ) throws Exception {
+    return true;
+  }
+
+}

=== removed file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/RemoteComponentCredentialBootstrapper.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/RemoteComponentCredentialBootstrapper.java	2009-08-31 21:53:11 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/RemoteComponentCredentialBootstrapper.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.
-*******************************************************************************/
-/*
- * Author: chris grzegorczyk <[e-mail]>
- */
-package com.eucalyptus.auth;
-
-import org.apache.log4j.Logger;
-
-import com.eucalyptus.auth.util.EucaKeyStore;
-import com.eucalyptus.auth.util.Hashes;
-import com.eucalyptus.bootstrap.Bootstrapper;
-import com.eucalyptus.bootstrap.Component;
-import com.eucalyptus.bootstrap.Depends;
-import com.eucalyptus.bootstrap.Provides;
-import com.eucalyptus.bootstrap.Resource;
-
-@Provides( resource = Resource.SystemCredentials )
-@Depends( remote = Component.eucalyptus )
-public class RemoteComponentCredentialBootstrapper extends Bootstrapper {
-  private static Logger LOG = Logger.getLogger( RemoteComponentCredentialBootstrapper.class );
-
-  @Override
-  public boolean load( Resource current ) throws Exception {
-    Credentials.init( );
-    while ( !this.checkAllKeys( ) ) {
-      LOG.fatal( "Waiting for system credentials before proceeding with startup..." );
-      try {
-        Thread.sleep( 2000 );
-      } catch ( Exception e ) {
-      }
-    }
-    for ( Component c : Component.values( ) ) {
-      LOG.info( "Initializing system credentials for " + c.name( ) );
-      SystemCredentialProvider.init( c );
-      c.markHasKeys( );
-    }
-    System.setProperty( "euca.db.password", Hashes.getHexSignature( ) );
-    return true;
-  }
-
-  private boolean checkAllKeys( ) {
-    for ( Component c : Component.values( ) ) {
-      if ( c.isEnabled( ) ) {
-        try {
-          if( !EucaKeyStore.getCleanInstance( ).containsEntry( c.name( ) ) ) {
-            return false;
-          }
-        } catch ( Exception e ) {
-          return false;
-        }
-      }
-    }
-    return true;
-  }
-
-  @Override
-  public boolean start( ) throws Exception {
-    return true;
-  }
-
-}

=== modified file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/SystemCredentialProvider.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/SystemCredentialProvider.java	2009-10-13 09:22:27 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/SystemCredentialProvider.java	2010-08-17 20:32:41 +0000
@@ -68,20 +68,22 @@
 import java.security.cert.X509Certificate;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-
 import org.apache.log4j.Logger;
-
+import com.eucalyptus.auth.crypto.Certs;
 import com.eucalyptus.auth.util.EucaKeyStore;
-import com.eucalyptus.auth.util.KeyTool;
+import com.eucalyptus.auth.util.PEMFiles;
+import com.eucalyptus.bootstrap.Bootstrap;
 import com.eucalyptus.bootstrap.Bootstrapper;
 import com.eucalyptus.bootstrap.Component;
-import com.eucalyptus.bootstrap.Depends;
+import com.eucalyptus.bootstrap.DependsLocal;
 import com.eucalyptus.bootstrap.Provides;
-import com.eucalyptus.bootstrap.Resource;
-import com.eucalyptus.util.EucalyptusProperties;
+import com.eucalyptus.bootstrap.RunDuring;
+import com.eucalyptus.bootstrap.Bootstrap.Stage;
+import com.eucalyptus.system.SubDirectory;
 
-@Provides( resource = Resource.SystemCredentials )
-@Depends( local = Component.eucalyptus )
+@Provides( Component.any )
+@RunDuring( Bootstrap.Stage.SystemCredentialsInit )
+@DependsLocal( Component.eucalyptus )
 public class SystemCredentialProvider extends Bootstrapper {
   private static Logger                                    LOG      = Logger.getLogger( SystemCredentialProvider.class );
   private static ConcurrentMap<Component, X509Certificate> certs    = new ConcurrentHashMap<Component, X509Certificate>( );
@@ -153,10 +155,13 @@
   }
 
   private void createSystemCredentialProviderKey( Component name ) throws Exception {
-    KeyTool keyTool = new KeyTool( );
     try {
-      KeyPair sysKp = keyTool.getKeyPair( );
-      X509Certificate sysX509 = keyTool.getCertificate( sysKp, EucalyptusProperties.getDName( name.name( ) ) );
+      KeyPair sysKp = Certs.generateKeyPair( );
+      X509Certificate sysX509 = Certs.generateServiceCertificate( sysKp, name.name( ) );
+      if( Component.eucalyptus.equals( name ) ) {
+        PEMFiles.write( SubDirectory.KEYS.toString( ) + "/cloud-cert.pem", sysX509 );
+        PEMFiles.write( SubDirectory.KEYS.toString( ) + "/cloud-pk.pem", sysKp.getPrivate( ) );
+      }
       SystemCredentialProvider.certs.put( name, sysX509 );
       SystemCredentialProvider.keypairs.put( name, sysKp );
       // TODO: might need separate keystore for euca/hsqldb/ssl/jetty/etc.
@@ -171,19 +176,24 @@
   }
 
   @Override
-  public boolean load( Resource current ) throws Exception {
+  public boolean load( Stage current ) throws Exception {
     try {
-      Credentials.init( );
+      if ( !SystemCredentialProvider.check( Component.eucalyptus ) ) {
+        SystemCredentialProvider.init( Component.eucalyptus );
+      }
       for ( Component c : Component.values( ) ) {
         try {
-          if ( !SystemCredentialProvider.check( c ) ) SystemCredentialProvider.init( c );
+          if ( !SystemCredentialProvider.check( c ) ) {
+            SystemCredentialProvider.init( c );
+          }
         } catch ( Exception e ) {
-          LOG.error( e );
+          LOG.error( e, e );
           return false;
         }
       }
     } catch ( Exception e ) {
       LOG.error( e, e );
+      return false;
     }
     return true;
   }

=== removed file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/UserExistsException.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/UserExistsException.java	2009-08-27 18:38:18 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/UserExistsException.java	1970-01-01 00:00:00 +0000
@@ -1,84 +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: chris grzegorczyk <[e-mail]>
- */
-package com.eucalyptus.auth;
-
-public class UserExistsException extends Exception {
-
-  public UserExistsException( ) {
-    super( );
-  }
-
-  public UserExistsException( String arg0, Throwable arg1 ) {
-    super( arg0, arg1 );
-  }
-
-  public UserExistsException( String arg0 ) {
-    super( arg0 );
-  }
-
-  public UserExistsException( Throwable arg0 ) {
-    super( arg0 );
-  }
-
-}

=== added file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/WrappedUser.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/WrappedUser.java	1970-01-01 00:00:00 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/WrappedUser.java	2010-08-17 20:32:41 +0000
@@ -0,0 +1,8 @@
+package com.eucalyptus.auth;
+
+import java.util.List;
+import com.eucalyptus.auth.principal.Group;
+
+public interface WrappedUser {
+  public UserInfo getUserInfo( ) throws NoSuchUserException;
+}
\ No newline at end of file

=== added directory 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/crypto'
=== added file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/crypto/DefaultCryptoProvider.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/crypto/DefaultCryptoProvider.java	1970-01-01 00:00:00 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/crypto/DefaultCryptoProvider.java	2010-08-17 20:32:41 +0000
@@ -0,0 +1,215 @@
+package com.eucalyptus.auth.crypto;
+
+import java.math.BigInteger;
+import java.security.Key;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.MessageDigest;
+import java.security.PrivateKey;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
+import java.util.Calendar;
+import java.util.zip.Adler32;
+import javax.security.auth.x500.X500Principal;
+import org.apache.log4j.Logger;
+import org.bouncycastle.asn1.x509.BasicConstraints;
+import org.bouncycastle.asn1.x509.X509Extensions;
+import org.bouncycastle.util.encoders.UrlBase64;
+import org.bouncycastle.x509.X509V3CertificateGenerator;
+import com.eucalyptus.auth.SystemCredentialProvider;
+import com.eucalyptus.auth.api.CertificateProvider;
+import com.eucalyptus.auth.api.CryptoProvider;
+import com.eucalyptus.auth.api.HmacProvider;
+import com.eucalyptus.bootstrap.Component;
+import com.eucalyptus.records.EventType;
+import com.eucalyptus.records.EventRecord;
+
+public class DefaultCryptoProvider implements CryptoProvider, CertificateProvider, HmacProvider {
+  public static String  KEY_ALGORITHM         = "RSA";
+  public static String  KEY_SIGNING_ALGORITHM = "SHA512WithRSA";
+  public static int     KEY_SIZE              = 2048;
+  public static String  PROVIDER              = "BC";
+  private static Logger LOG                   = Logger.getLogger( DefaultCryptoProvider.class );
+  
+  public DefaultCryptoProvider( ) {}
+  
+  /**
+   * @see com.eucalyptus.auth.api.CryptoProvider#generateHashedPassword(java.lang.String)
+   */
+  @Override
+  public String generateHashedPassword( String password ) {
+    byte[] data = Digest.MD5.get( ).digest( password.getBytes( ) );
+    StringBuffer buf = new StringBuffer( );
+    for ( int i = 0; i < data.length; i++ ) {
+      int halfbyte = ( data[i] >>> 4 ) & 0x0F;
+      int two_halfs = 0;
+      do {
+        if ( ( 0 <= halfbyte ) && ( halfbyte <= 9 ) )
+          buf.append( ( char ) ( '0' + halfbyte ) );
+        else buf.append( ( char ) ( 'a' + ( halfbyte - 10 ) ) );
+        halfbyte = data[i] & 0x0F;
+      } while ( two_halfs++ < 1 );
+    }
+    return buf.toString( ).toLowerCase( );
+  }
+  
+  /**
+   * @see com.eucalyptus.auth.api.CryptoProvider#generateQueryId(java.lang.String)
+   */
+  @Override
+  public String generateQueryId( String userName ) {
+    return this.getDigestBase64( userName, Digest.SHA224, false ).replaceAll( "\\p{Punct}", "" );
+  }
+  
+  /**
+   * @see com.eucalyptus.auth.api.CryptoProvider#generateSecretKey(java.lang.String)
+   */
+  @Override
+  public String generateSecretKey( String userName ) {
+    return this.getDigestBase64( userName, Digest.SHA224, true ).replaceAll( "\\p{Punct}", "" );
+  }
+  
+  /**
+   * @see com.eucalyptus.auth.api.CryptoProvider#generateCertificateCode(java.lang.String)
+   */
+  @Override
+  public String generateCertificateCode( String userName ) {
+    return this.getDigestBase64( userName, Digest.SHA512, true ).replaceAll( "\\p{Punct}", "" );
+  }
+  
+  /**
+   * @see com.eucalyptus.auth.api.CryptoProvider#generateConfirmationCode(java.lang.String)
+   */
+  @Override
+  public String generateConfirmationCode( String userName ) {
+    return this.getDigestBase64( userName, Digest.SHA512, true ).replaceAll( "\\p{Punct}", "" );
+  }
+  
+  /**
+   * @see com.eucalyptus.auth.api.CryptoProvider#generateSessionToken(java.lang.String)
+   */
+  @Override
+  public String generateSessionToken( String userName ) {
+    return this.getDigestBase64( userName, Digest.SHA512, true ).replaceAll( "\\p{Punct}", "" );
+  }
+
+  /**
+   * @see com.eucalyptus.auth.api.CryptoProvider#getDigestBase64(java.lang.String, com.eucalyptus.auth.crypto.Digest, boolean)
+   */
+  @Override
+  public String getDigestBase64( String input, Digest hash, boolean randomize ) {
+    byte[] inputBytes = input.getBytes( );
+    byte[] digestBytes = null;
+    MessageDigest digest = hash.get( );
+    digest.update( inputBytes );
+    if ( randomize ) {
+      SecureRandom random = new SecureRandom( );
+//TODO: RELEASE:      random.setSeed( System.currentTimeMillis( ) );
+      byte[] randomBytes = random.generateSeed( inputBytes.length );
+      digest.update( randomBytes );
+    }
+    digestBytes = digest.digest( );
+    return new String( UrlBase64.encode( digestBytes ) );
+  }
+  
+  public X509Certificate generateServiceCertificate( KeyPair keys, String serviceName ) {
+    X500Principal x500 = new X500Principal( String.format( "CN=%s, OU=Eucalyptus, O=Cloud, C=US", serviceName ) );
+    SystemCredentialProvider sys = SystemCredentialProvider.getCredentialProvider( Component.eucalyptus );
+//    if( sys.getCertificate( ) != null ) {
+//      return generateCertificate( keys, x500, sys.getCertificate( ).getSubjectX500Principal( ), sys.getPrivateKey( ) );
+//    } else {
+      return generateCertificate( keys, x500, x500, null );
+//    }
+  }
+  
+  public X509Certificate generateCertificate( KeyPair keys, String userName ) {
+    return generateCertificate( keys, new X500Principal( String.format( "CN=%s, OU=Eucalyptus, O=User, C=US", userName ) ) );
+  }
+  
+  public X509Certificate generateCertificate( KeyPair keys, X500Principal dn ) {
+    return generateCertificate( keys, dn, dn, null );
+  }
+  
+  @Override
+  public X509Certificate generateCertificate( KeyPair keys, X500Principal subjectDn, X500Principal signer, PrivateKey signingKey ) {
+    signer = ( signingKey == null ? signer : subjectDn );
+    signingKey = ( signingKey == null ? keys.getPrivate( ) : signingKey );
+    EventRecord.caller( DefaultCryptoProvider.class, EventType.GENERATE_CERTIFICATE, signer.toString( ), subjectDn.toString( ) ).info();
+    X509V3CertificateGenerator certGen = new X509V3CertificateGenerator( );
+    certGen.setSerialNumber( BigInteger.valueOf( System.nanoTime( ) ).shiftLeft( 4 ).add( BigInteger.valueOf( ( long ) Math.rint( Math.random( ) * 1000 ) ) ) );
+    certGen.setIssuerDN( signer );
+    certGen.addExtension( X509Extensions.BasicConstraints, true, new BasicConstraints( true ) );
+    Calendar cal = Calendar.getInstance( );
+    certGen.setNotBefore( cal.getTime( ) );
+    cal.add( Calendar.YEAR, 5 );
+    certGen.setNotAfter( cal.getTime( ) );
+    certGen.setSubjectDN( subjectDn );
+    certGen.setPublicKey( keys.getPublic( ) );
+    certGen.setSignatureAlgorithm( KEY_SIGNING_ALGORITHM );
+    try {
+      X509Certificate cert = certGen.generate( signingKey, PROVIDER );
+      cert.checkValidity( );
+      return cert;
+    } catch ( Exception e ) {
+      LOG.fatal( e, e );
+      System.exit( -3 );
+      return null;
+    }
+  }
+  
+  /**
+   * @see com.eucalyptus.auth.api.CryptoProvider#generateKeyPair()
+   */
+  @Override
+  public KeyPair generateKeyPair( ) {
+    KeyPairGenerator keyGen = null;
+    try {
+      EventRecord.caller( DefaultCryptoProvider.class, EventType.GENERATE_KEYPAIR );
+      keyGen = KeyPairGenerator.getInstance( KEY_ALGORITHM, "BC" );
+      SecureRandom random = new SecureRandom( );
+      random.setSeed( System.currentTimeMillis( ) );
+      keyGen.initialize( KEY_SIZE, random );
+      KeyPair keyPair = keyGen.generateKeyPair( );
+      return keyPair;
+    } catch ( Exception e ) {
+      LOG.fatal( e, e );
+      System.exit( -3 );
+      return null;
+    }
+  }
+
+  @Override
+  public String generateSystemSignature( ) {
+    return this.generateSystemToken( Component.eucalyptus.name( ).getBytes( ) );
+  }
+
+  @Override
+  public String generateSystemToken( byte[] data ) {
+    PrivateKey pk = SystemCredentialProvider.getCredentialProvider( Component.eucalyptus ).getPrivateKey( );
+    return Signatures.SHA256withRSA.trySign( pk, data );    
+  }
+
+  @Override
+  public String generateId( final String userId, final String prefix ) {
+    Adler32 hash = new Adler32( );
+    String key = userId + (System.currentTimeMillis( ) * Math.random( ));
+    hash.update( key.getBytes( ) );
+    String imageId = String.format( "%s-%08X", prefix, hash.getValue( ) );
+    return imageId;
+  }
+
+  @Override
+  public String getFingerPrint( Key privKey ) {
+    try {
+      byte[] fp = Digest.SHA1.get( ).digest( privKey.getEncoded( ) );
+      StringBuffer sb = new StringBuffer( );
+      for ( byte b : fp )
+        sb.append( String.format( "%02X:", b ) );
+      return sb.substring( 0, sb.length( ) - 1 ).toLowerCase( );
+    } catch ( Exception e ) {
+      LOG.error( e, e );
+      return null;
+    }
+  }
+
+}

=== added file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/AuthBootstrapHelper.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/AuthBootstrapHelper.java	1970-01-01 00:00:00 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/AuthBootstrapHelper.java	2010-08-17 20:32:41 +0000
@@ -0,0 +1,49 @@
+package com.eucalyptus.auth.util;
+
+import org.apache.log4j.Logger;
+import com.eucalyptus.auth.GroupExistsException;
+import com.eucalyptus.auth.Groups;
+import com.eucalyptus.auth.NoSuchGroupException;
+import com.eucalyptus.auth.NoSuchUserException;
+import com.eucalyptus.auth.UserExistsException;
+import com.eucalyptus.auth.Users;
+
+public class AuthBootstrapHelper {
+  private static Logger LOG = Logger.getLogger( AuthBootstrapHelper.class );
+
+  public static void ensureStandardGroupsExists( ) {
+    try {
+      Groups.ALL = Groups.lookupGroup( Groups.NAME_ALL );
+    } catch ( NoSuchGroupException e ) {
+      try {
+        Groups.ALL = Groups.addGroup( Groups.NAME_ALL );
+      } catch ( GroupExistsException e1 ) {
+        LOG.error( e1, e1 );
+        LOG.error( "Failed to add the 'all' group.  The system may not be able to store group information." );
+      }
+    }
+    Groups.RESTRICTED_GROUPS.add( Groups.ALL );
+    
+    try {
+      Groups.DEFAULT = Groups.lookupGroup( Groups.NAME_DEFAULT );
+    } catch ( NoSuchGroupException e ) {
+      try {
+        Groups.DEFAULT = Groups.addGroup( Groups.NAME_DEFAULT );
+      } catch ( GroupExistsException e1 ) {
+        LOG.error( e1, e1 );
+        LOG.error( "Failed to add the 'default' group.  The system may not be able to store group information." );
+      }
+    }
+    Groups.RESTRICTED_GROUPS.add( Groups.DEFAULT );
+  }
+  
+  public static void ensureAdminExists( ) {
+    try {
+      Users.lookupUser( "admin" );
+    } catch ( NoSuchUserException e ) {
+      try {
+        Users.addUser( "admin", true, true );
+      } catch ( UserExistsException e1 ) {} catch ( UnsupportedOperationException e1 ) {}
+    }
+  }
+}

=== modified file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/EucaKeyStore.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/EucaKeyStore.java	2009-08-27 18:38:18 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/EucaKeyStore.java	2010-08-17 20:32:41 +0000
@@ -66,14 +66,9 @@
 import java.io.File;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
-import java.security.KeyPair;
-import java.security.cert.X509Certificate;
-
 import org.apache.log4j.Logger;
-
 import com.eucalyptus.bootstrap.Component;
-import com.eucalyptus.util.EucalyptusProperties;
-import com.eucalyptus.util.SubDirectory;
+import com.eucalyptus.system.SubDirectory;
 
 public class EucaKeyStore extends AbstractKeyStore {
   public static String            FORMAT         = "pkcs12";

=== modified file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/Hashes.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/Hashes.java	2009-12-29 22:31:46 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/Hashes.java	2010-08-17 20:32:41 +0000
@@ -63,40 +63,30 @@
  */
 package com.eucalyptus.auth.util;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
 import org.apache.log4j.Logger;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.openssl.PEMWriter;
 import org.bouncycastle.openssl.PEMReader;
 import org.bouncycastle.util.encoders.UrlBase64;
 
-import com.eucalyptus.auth.SystemCredentialProvider;
-import com.eucalyptus.bootstrap.Component;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.ByteArrayInputStream;
-import java.io.InputStreamReader;
-import java.security.*;
-import java.security.cert.X509Certificate;
-import java.util.zip.Adler32;
-
+/**
+ * This class is headed for the dead pool.
+ * @author decker
+ */
+@Deprecated
 public class Hashes {
-  private static Logger LOG = Logger.getLogger( Hashes.class );
-
-  public static byte[] getPemBytes( final Object o ) {
-    PEMWriter pemOut;
-    ByteArrayOutputStream pemByteOut = new ByteArrayOutputStream( );
-    try {
-      pemOut = new PEMWriter( new OutputStreamWriter( pemByteOut ) );
-      pemOut.writeObject( o );
-      pemOut.close( );
-    } catch ( IOException e ) {
-      LOG.error( e, e );//this can never happen
-    }
-    return pemByteOut.toByteArray( );
-  }
-
+  public static Logger LOG = Logger.getLogger( Hashes.class );
+
+
+  /**
+   * TODO: Move this up in the dependency tree.
+   * @param o
+   * @return
+   */
+  @Deprecated
   public static X509Certificate getPemCert( final byte[] o ) {
     X509Certificate x509 = null;
     PEMReader in = null;
@@ -110,84 +100,32 @@
     return x509;
   }
 
-  static {
-    Security.addProvider( new BouncyCastleProvider( ) );
-  }
-
-  public enum Digest {
-    GOST3411,
-    Tiger,
-    Whirlpool,
-    MD2,
-    MD4,
-    MD5,
-    RipeMD128,
-    RipeMD160,
-    RipeMD256,
-    RipeMD320,
-    SHA1,
-    SHA224,
-    SHA256,
-    SHA384,
-    SHA512;
-
-    public MessageDigest get( ) {
-      try {
-        return MessageDigest.getInstance( this.name( ) );
-      } catch ( Exception e ) {
-        LOG.error( e, e );
-        System.exit( -4 );
-        return null;
-      }
-    }
-  }
-
-  public enum Mac {
-    HmacSHA1,
-    HmacSHA256
-  }
-
-  public static String hashPassword( String password ) throws NoSuchAlgorithmException {
-    byte[] fp = Digest.MD5.get( ).digest( password.getBytes( ) );
-    return getHexString( fp );
-  }
-
-  public static String getDigestBase64( String input, Digest hash, boolean randomize ) {
-    byte[] inputBytes = input.getBytes( );
-    byte[] digestBytes = null;
-    MessageDigest digest = hash.get( );
-    digest.update( inputBytes );
-    if ( randomize ) {
-      SecureRandom random = new SecureRandom( );
-      random.setSeed( System.currentTimeMillis( ) );
-      byte[] randomBytes = random.generateSeed( inputBytes.length );
-      digest.update( randomBytes );
-    }
-    digestBytes = digest.digest( );
-    return new String( UrlBase64.encode( digestBytes ) );
-  }
-
+  /**
+   * TODO: Move this up in the dependency tree.
+   * @param o
+   * @return
+   */
+  @Deprecated
   public static String base64encode( String input ) {
     return new String( UrlBase64.encode( input.getBytes( ) ) );
   }
 
+  /**
+   * TODO: Move this up in the dependency tree.
+   * @param o
+   * @return
+   */
+  @Deprecated
   public static String base64decode( String input ) {
     return new String( UrlBase64.decode( input.getBytes( ) ) );
   }
 
-  public static String getFingerPrint( Key privKey ) {
-    try {
-      byte[] fp = Digest.SHA1.get( ).digest( privKey.getEncoded( ) );
-      StringBuffer sb = new StringBuffer( );
-      for ( byte b : fp )
-        sb.append( String.format( "%02X:", b ) );
-      return sb.substring( 0, sb.length( ) - 1 ).toLowerCase( );
-    } catch ( Exception e ) {
-      LOG.error( e, e );
-      return null;
-    }
-  }
-
+  /**
+   * TODO: Move this up in the dependency tree.
+   * @param o
+   * @return
+   */
+  @Deprecated
   public static String getHexString( byte[] data ) {
     StringBuffer buf = new StringBuffer( );
     for ( int i = 0; i < data.length; i++ ) {
@@ -210,14 +148,6 @@
     return new String( UrlBase64.encode( randomBytes ) );
   }
 
-  public static String generateId( final String userId, final String prefix ) {
-    Adler32 hash = new Adler32( );
-    String key = userId + (System.currentTimeMillis( ) * Math.random( ));
-    hash.update( key.getBytes( ) );
-    String imageId = String.format( "%s-%08X", prefix, hash.getValue( ) );
-    return imageId;
-  }
-
   public static byte[] hexToBytes( String data ) {
     int k = 0;
     byte[] results = new byte[data.length( ) / 2];
@@ -250,18 +180,4 @@
     else return ( char ) ( 'a' + ( value - 10 ) );
   }
 
-  public static String getHexSignature( ) {
-    try {
-      Signature signer = Signature.getInstance( "SHA256withRSA" );
-      signer.initSign( SystemCredentialProvider.getCredentialProvider( Component.eucalyptus ).getPrivateKey( ) );
-      signer.update( "eucalyptus".getBytes( ) );
-      byte[] sig = signer.sign( );
-      String hexSig = bytesToHex( sig );
-      return hexSig;
-    } catch ( Exception e ) {
-      LOG.fatal( e, e );
-      System.exit( -5 );
-      return null;
-    }
-  }
 }

=== removed file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/KeyTool.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/KeyTool.java	2009-09-19 18:35:08 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/KeyTool.java	1970-01-01 00:00:00 +0000
@@ -1,156 +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: chris grzegorczyk <[e-mail]>
- */
-package com.eucalyptus.auth.util;
-
-import org.apache.log4j.Logger;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.openssl.PEMWriter;
-import org.bouncycastle.x509.X509V3CertificateGenerator;
-
-import javax.security.auth.x500.X500Principal;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.SecureRandom;
-import java.security.cert.X509Certificate;
-import java.util.Calendar;
-
-public class KeyTool {
-  private static Logger LOG      = Logger.getLogger( KeyTool.class );
-
-  private String        keyAlgorithm;
-  private String        keySigningAlgorithm;
-  private int           keySize;
-  public static String  PROVIDER = "BC";
-
-  public KeyTool( ) {
-    this.keyAlgorithm = "RSA";
-    this.keySigningAlgorithm = "SHA512WithRSA";
-    this.keySize = 2048;
-  }
-
-  public KeyTool( final String keyAlgorithm, final String keySigningAlgorithm, final int keySize ) {
-    this.keyAlgorithm = keyAlgorithm;
-    this.keySigningAlgorithm = keySigningAlgorithm;
-    this.keySize = keySize;
-  }
-
-  public KeyPair getKeyPair( ) throws Exception {
-    KeyPairGenerator keyGen = null;
-    try {
-      LOG.debug( "Generating new keypair for thread=" + Thread.currentThread( ).getThreadGroup( ) + "." + Thread.currentThread( ).getName( )  );
-      keyGen = KeyPairGenerator.getInstance( this.keyAlgorithm, "BC" );
-      SecureRandom random = new SecureRandom( );
-      random.setSeed( System.currentTimeMillis( ) );
-      keyGen.initialize( this.keySize, random );
-      KeyPair keyPair = keyGen.generateKeyPair( );
-      return keyPair;
-    } catch ( Exception e ) {
-      LOG.debug( e, e );
-      throw e;
-    }
-  }
-
-  public X509Certificate getCertificate( KeyPair keyPair, String certDn ) {
-    X509V3CertificateGenerator certGen = new X509V3CertificateGenerator( );
-    X500Principal dnName = new X500Principal( certDn );
-
-    certGen.setSerialNumber( BigInteger.valueOf( System.currentTimeMillis( ) ) );
-    certGen.setIssuerDN( dnName );
-    certGen.addExtension( X509Extensions.BasicConstraints, true, new BasicConstraints( true ) );
-
-    Calendar cal = Calendar.getInstance( );
-    certGen.setNotBefore( cal.getTime( ) );
-    cal.add( Calendar.YEAR, 5 );
-    certGen.setNotAfter( cal.getTime( ) );
-    certGen.setSubjectDN( dnName );
-    certGen.setPublicKey( keyPair.getPublic( ) );
-    certGen.setSignatureAlgorithm( this.keySigningAlgorithm );
-    try {
-      X509Certificate cert = certGen.generate( keyPair.getPrivate( ), PROVIDER );
-      return cert;
-    } catch ( Exception e ) {
-      LOG.fatal( e, e );
-      System.exit( -3 );
-      return null;
-    }
-  }
-
-  public void writePem( String fileName, Object securityToken ) {
-    PEMWriter privOut = null;
-    try {
-      privOut = new PEMWriter( new FileWriter( fileName ) );
-      privOut.writeObject( securityToken );
-      privOut.close( );
-    } catch ( IOException e ) {
-      LOG.error( e, e );
-    }
-  }
-}

=== modified file 'clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/SslSetup.java'
--- clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/SslSetup.java	2009-11-18 02:56:08 +0000
+++ clc/modules/authentication/src/main/java/com/eucalyptus/auth/util/SslSetup.java	2010-08-17 20:32:41 +0000
@@ -24,7 +24,7 @@
 import org.apache.log4j.Logger;
 
 import com.eucalyptus.bootstrap.Component;
-import com.eucalyptus.util.SubDirectory;
+import com.eucalyptus.system.SubDirectory;
 import com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager;
 
 public class SslSetup {
@@ -42,7 +42,7 @@
     System.setProperty( "javax.net.ssl.keyStoreType", "PKCS12" );
     System.setProperty( "javax.net.ssl.trustStorePassword", Component.eucalyptus.name( ) );
     System.setProperty( "javax.net.ssl.keyStorePassword", Component.eucalyptus.name( ) );
-    System.setProperty( "javax.net.debug", "none" );//set this to "ssl" for debugging.
+    System.setProperty( "javax.net.debug", "ssl" );//set this to "ssl" for debugging.
     try {
       serverContext = SSLContext.getInstance( "TLS" );
       serverContext.init( SslSetup.SimpleKeyManager.getKeyManagers( ), SslSetup.SimpleTrustManager.getTrustManagers( ), null );

=== modified file 'clc/modules/bootstrap/Makefile'
--- clc/modules/bootstrap/Makefile	2010-01-24 23:57:58 +0000
+++ clc/modules/bootstrap/Makefile	2010-08-17 20:32:41 +0000
@@ -55,4 +55,4 @@
 distclean: clean
 
 uninstall:
-	@$(RM) -f $(sbindir)/eucalyptus-cloud
+	@$(RM) -f $(DESTDIR)$(sbindir)/eucalyptus-cloud

=== modified file 'clc/modules/bootstrap/arguments.ggo'
--- clc/modules/bootstrap/arguments.ggo	2010-01-23 05:39:06 +0000
+++ clc/modules/bootstrap/arguments.ggo	2010-08-17 20:32:41 +0000
@@ -13,6 +13,7 @@
 option "exhaustive-db"       -   "Individually enable exhaustive connection information for database connections." flag off
 option "exhaustive-user"       -   "Individually enable exhaustive connection information for client connections." flag off
 option "exhaustive-cc"       -   "Individually enable exhaustive connection information for client connections." flag off
+option "exhaustive-external"       -   "Individually enable exhaustive logging for external libraries." flag off
 option "log-appender"       L   "Control the destination for console output."   string  typestr="log4j-appender-name"  default="console-log" no
 option "out"       o   "Redirect standard out to file."   string  typestr="filename"  default="&1" no
 option "err"       e   "Redirect standard error to file."   string  typestr="filename"  default="&2" no
@@ -45,5 +46,6 @@
 option "debug-port"       -   "Set the port to use for the debugger." int dependon="debug" default="5005" no
 option "debug-suspend"       -   "Set the port to use for the debugger." flag dependon="debug" off
 option "profile"       p   "Launch with jprofiler enabled."   flag   off hidden
-option "profiler-home"       P   "Set the home for jprofiler." string  typestr="jprofiler directory" dependon="profile" default="/opt/jprofiler5" no hidden
+option "agentlib"       a   "Launch with agentlib enabled."   string  typestr="agentlib" dependon="profile" optional hidden
+option "profiler-home"       P   "Set the home for jprofiler." string  typestr="jprofiler directory" dependon="profile" default="/opt/jprofiler6" no hidden
 

=== modified file 'clc/modules/bootstrap/eucalyptus-bootstrap.c'
--- clc/modules/bootstrap/eucalyptus-bootstrap.c	2010-01-23 05:39:06 +0000
+++ clc/modules/bootstrap/eucalyptus-bootstrap.c	2010-08-17 20:32:41 +0000
@@ -65,7 +65,7 @@
 int java_init(euca_opts*, java_home_t*);
 int JVM_destroy(int);
 
-static void java_fail(void) { exit(123); }
+static void java_fail(void) { exit(1); }
 
 static java_home_t *get_java_home( char *path ) {
 	java_home_t *data = NULL;
@@ -182,9 +182,9 @@
 	while( waitpid( pid, &status, 0 ) != pid );
 	if( WIFEXITED( status ) ) {
 		status = WEXITSTATUS( status );
-		__abort(1, (status == 0),"User '%s' validated", user );
+		__abort(0, (status != 0),"User '%s' validated", user );
 	}
-	__abort(0,1,"Error validating user '%s'", user );
+	return 1;
 }
 
 static void controller( int sig ) {
@@ -252,10 +252,10 @@
 	setpgrp( );
 	__die(java_init( args, data ) != 1, "Failed to initialize Eucalyptus.");
     __die((r=(*env)->CallBooleanMethod(env,bootstrap.instance,bootstrap.init))==0,"Failed to init Eucalyptus.");
-    __die((r=(*env)->CallBooleanMethod(env,bootstrap.instance,bootstrap.load))==0,"Failed to load Eucalyptus.");
 	__abort(4, set_keys_ownership( GETARG( args, home ), uid, gid ) != 0,"Setting ownership of keyfile failed." );
 	__abort(4, linuxset_user_group( GETARG( args, user ), uid, gid ) != 0,"Setting the user failed." );
 	__abort(4, (set_caps(0)!=0), "set_caps (0) failed");
+    __die((r=(*env)->CallBooleanMethod(env,bootstrap.instance,bootstrap.load))==0,"Failed to load Eucalyptus.");
     __die((r=(*env)->CallBooleanMethod(env,bootstrap.instance,bootstrap.start))==0,"Failed to start Eucalyptus.");
 	handle._hup = signal_set( SIGHUP, handler );
 	handle._term = signal_set( SIGTERM, handler );
@@ -337,15 +337,15 @@
 	}
 	if( strcmp( argv[ 0 ], "eucalyptus-cloud" ) != 0 ) {
 		char *oldpath = getenv( "LD_LIBRARY_PATH" ),*libf = java_library( args, data );
-		char *old = argv[ 0 ],buf[ 4096 ],*tmp = NULL,*p1 = NULL,*p2 = NULL;
+		char *old = argv[ 0 ],buf[ 32768 ],*tmp = NULL,*p1 = NULL,*p2 = NULL;
 		p1 = strdup( libf );
 		tmp = strrchr( p1, '/' );
 		if( tmp != NULL ) tmp[ 0 ] = '\0';
 		p2 = strdup( p1 );
 		tmp = strrchr( p2, '/' );
 		if( tmp != NULL ) tmp[ 0 ] = '\0';
-		if( oldpath == NULL ) snprintf( buf, 4096, "%s:%s:%s/bin/linux-x64", p1, p2, GETARG(args,profiler_home) );
-		else snprintf( buf, 4096, "%s:%s:%s:%s/bin/linux-x64", oldpath, p1, p2, GETARG(args,profiler_home) );
+		if( oldpath == NULL ) snprintf( buf, 32768, "%s:%s:%s/bin/linux-x64", p1, p2, GETARG(args,profiler_home) );
+		else snprintf( buf, 32768, "%s:%s:%s:%s/bin/linux-x64", oldpath, p1, p2, GETARG(args,profiler_home) );
 		tmp = strdup( buf );
 
 		setenv( "LD_LIBRARY_PATH", tmp, 1 );
@@ -357,15 +357,10 @@
 	}
 	__debug( "Running w/ LD_LIBRARY_PATH=%s", getenv( "LD_LIBRARY_PATH" ) );
 	if(args->fork_flag) {
-//TODO: commented out for the time being to make dan happi.
-//		if(args->debug_flag) {
-//			__debug("Ignoring --fork because of --debug.");
-//		} else {
-			pid = fork( );
-			__die(( pid == -1 ),"Cannot detach from parent process" );
-			if( pid != 0 ) return wait_child( args, pid );
-			setsid( );
-//		}
+		pid = fork( );
+		__die(( pid == -1 ),"Cannot detach from parent process" );
+		if( pid != 0 ) return wait_child( args, pid );
+		setsid( );
 	}
 	set_output(GETARG(args,out), GETARG(args,err));
 	while( ( pid = fork( ) ) != -1 ) {
@@ -376,8 +371,8 @@
 		signal( SIGINT, controller );
 		while( waitpid( pid, &status, 0 ) != pid );
 		if( WIFEXITED( status ) ) {
+			status = WEXITSTATUS( status );
 			__debug( "Eucalyptus exited with status: %d", status );
-			status = WEXITSTATUS( status );
 			if( status != 122 ) unlink( GETARG( args, pidfile ) );
 			if( status == 123 ) {
 				__debug( "Reloading service" );
@@ -447,7 +442,7 @@
     return libjvm_path;
 }
 
-void java_load_bootstrapper(void) {
+void euca_load_bootstrapper(void) {
     __die((bootstrap.class_name=((*env)->NewStringUTF(env,EUCA_MAIN)))==NULL,"Cannot create string for class name.");
     __die((bootstrap.clazz=((*env)->FindClass(env,EUCA_MAIN)))==NULL,"Cannot find Eucalyptus bootstrapper: %s.",EUCA_MAIN);
     __debug("Found Eucalyptus bootstrapper: %s",EUCA_MAIN);
@@ -479,7 +474,7 @@
 }
 
 char* java_library_path(euca_opts *args) {
-#define JAVA_PATH_LEN 16384
+#define JAVA_PATH_LEN 65536
     char lib_dir[256],etc_dir[256],script_dir[256],*jar_list=(char*)malloc(JAVA_PATH_LEN*sizeof(char));
     __die(( strlen(GETARG(args,home))+strlen(EUCA_LIB_DIR)>=254),"Directory path too long: %s/%s", GETARG(args,home), EUCA_LIB_DIR);
     snprintf(lib_dir,255,"%s%s",GETARG(args,home),EUCA_LIB_DIR);
@@ -539,6 +534,7 @@
     	JVM_ARG(opt[++x],"-Deuca.log.exhaustive.db=TRACE");
     	JVM_ARG(opt[++x],"-Deuca.log.exhaustive.user=TRACE");
     	JVM_ARG(opt[++x],"-Deuca.log.exhaustive.cc=TRACE");
+    	JVM_ARG(opt[++x],"-Deuca.log.exhaustive.external=TRACE");
     } else {
     	if(args->exhaustive_db_flag) {
         	JVM_ARG(opt[++x],"-Deuca.log.exhaustive.db=TRACE");
@@ -555,6 +551,11 @@
     	} else {
         	JVM_ARG(opt[++x],"-Deuca.log.exhaustive.user=FATAL");
     	}
+    	if(args->exhaustive_external_flag) {
+        	JVM_ARG(opt[++x],"-Deuca.log.exhaustive.external=TRACE");
+    	} else {
+        	JVM_ARG(opt[++x],"-Deuca.log.exhaustive.external=FATAL");
+    	}
     }
     JVM_ARG(opt[++x],"-Deuca.log.level=%1$s",GETARG(args,log_level));
     JVM_ARG(opt[++x],"-Deuca.log.appender=%1$s",GETARG(args,log_appender));
@@ -592,7 +593,14 @@
     	JVM_ARG(opt[++x],"-Xdebug");
     	JVM_ARG(opt[++x],"-Xrunjdwp:transport=dt_socket,server=y,suspend=%2$s,address=%1$d",GETARG(args,debug_port),(args->debug_suspend_flag?"y":"n"));
     }
-    if(args->profile_flag) {
+    if(args->debug_flag||args->profile_flag) {
+    	JVM_ARG(opt[++x],"-Dcom.sun.management.jmxremote");
+    	JVM_ARG(opt[++x],"-XX:+HeapDumpOnOutOfMemoryError");
+    	JVM_ARG(opt[++x],"-XX:HeapDumpPath=%s/var/log/eucalyptus/",GETARG(args,home));
+    }
+    if(args->profile_flag && args->agentlib_given ) {
+    	JVM_ARG(opt[++x],"-agentlib:%s",GETARG(args,agentlib));
+    } else if(args->profile_flag) {
     	JVM_ARG(opt[++x],"-agentlib:jprofilerti=port=8849");
     	JVM_ARG(opt[++x],"-Xbootclasspath/a:%1$s/bin/agent.jar",GETARG(args,profiler_home));
     }

=== modified file 'clc/modules/bootstrap/eucalyptus-bootstrap.h'
--- clc/modules/bootstrap/eucalyptus-bootstrap.h	2010-01-28 02:34:16 +0000
+++ clc/modules/bootstrap/eucalyptus-bootstrap.h	2010-08-17 20:32:41 +0000
@@ -68,9 +68,10 @@
 #define EUCA_LIB_DIR "/usr/share/eucalyptus"
 #define EUCA_ETC_DIR "/etc/eucalyptus/cloud.d"
 #define EUCA_SCRIPT_DIR "/etc/eucalyptus/cloud.d/scripts"
-
 #define EUCA_MAIN "com/eucalyptus/bootstrap/SystemBootstrapper"
 #define EUCA_RET_RELOAD 123
+#define java_load_bootstrapper euca_load_bootstrapper
+void euca_load_bootstrapper(void);
 
 typedef struct {
 	char* method_name;
@@ -114,12 +115,14 @@
 	    "-Djava.net.preferIPv4Stack=true",
 	    "-Djava.security.policy=%1$s/etc/eucalyptus/cloud.d/security.policy",
 	    "-Djava.library.path=%1$s/usr/lib/eucalyptus",
+	    "-Dsun.java.command=Eucalyptus",
 	    "-Deuca.home=%1$s/",
 	    "-Deuca.var.dir=%1$s/var/lib/eucalyptus",
+	    "-Deuca.run.dir=%1$s/var/run/eucalyptus",
 	    "-Deuca.lib.dir=%1$s/usr/share/eucalyptus",
 	    "-Deuca.conf.dir=%1$s/etc/eucalyptus/cloud.d",
 	    "-Deuca.log.dir=%1$s/var/log/eucalyptus",
-	    "-Deuca.version=1.6.2",
+	    "-Deuca.version=2.0.0",
 	    NULL,
 };
 static char *libjvm_paths[ ] = {

=== modified file 'clc/modules/bootstrap/eucalyptus-opts.c'
--- clc/modules/bootstrap/eucalyptus-opts.c	2010-01-23 05:39:06 +0000
+++ clc/modules/bootstrap/eucalyptus-opts.c	2010-08-17 20:32:41 +0000
@@ -47,6 +47,7 @@
   "      --exhaustive-db           Individually enable exhaustive connection \n                                  information for database connections.  \n                                  (default=off)",
   "      --exhaustive-user         Individually enable exhaustive connection \n                                  information for client connections.  \n                                  (default=off)",
   "      --exhaustive-cc           Individually enable exhaustive connection \n                                  information for client connections.  \n                                  (default=off)",
+  "      --exhaustive-external     Individually enable exhaustive logging for \n                                  external libraries.  (default=off)",
   "  -L, --log-appender=log4j-appender-name\n                                Control the destination for console output.  \n                                  (default=`console-log')",
   "  -o, --out=filename            Redirect standard out to file.  (default=`&1')",
   "  -e, --err=filename            Redirect standard error to file.  \n                                  (default=`&2')",
@@ -74,7 +75,8 @@
   "      --debug-port=INT          Set the port to use for the debugger.  \n                                  (default=`5005')",
   "      --debug-suspend           Set the port to use for the debugger.  \n                                  (default=off)",
   "  -p, --profile                 Launch with jprofiler enabled.  (default=off)",
-  "  -P, --profiler-home=jprofiler directory\n                                Set the home for jprofiler.  \n                                  (default=`/opt/jprofiler5')",
+  "  -a, --agentlib=agentlib       Launch with agentlib enabled.",
+  "  -P, --profiler-home=jprofiler directory\n                                Set the home for jprofiler.  \n                                  (default=`/opt/jprofiler6')",
     0
 };
 
@@ -122,11 +124,12 @@
   eucalyptus_opts_help[38] = eucalyptus_opts_full_help[38];
   eucalyptus_opts_help[39] = eucalyptus_opts_full_help[39];
   eucalyptus_opts_help[40] = eucalyptus_opts_full_help[40];
-  eucalyptus_opts_help[41] = 0; 
+  eucalyptus_opts_help[41] = eucalyptus_opts_full_help[41];
+  eucalyptus_opts_help[42] = 0; 
   
 }
 
-const char *eucalyptus_opts_help[42];
+const char *eucalyptus_opts_help[43];
 
 typedef enum {ARG_NO
   , ARG_FLAG
@@ -166,6 +169,7 @@
   args_info->exhaustive_db_given = 0 ;
   args_info->exhaustive_user_given = 0 ;
   args_info->exhaustive_cc_given = 0 ;
+  args_info->exhaustive_external_given = 0 ;
   args_info->log_appender_given = 0 ;
   args_info->out_given = 0 ;
   args_info->err_given = 0 ;
@@ -189,6 +193,7 @@
   args_info->debug_port_given = 0 ;
   args_info->debug_suspend_given = 0 ;
   args_info->profile_given = 0 ;
+  args_info->agentlib_given = 0 ;
   args_info->profiler_home_given = 0 ;
 }
 
@@ -213,6 +218,7 @@
   args_info->exhaustive_db_flag = 0;
   args_info->exhaustive_user_flag = 0;
   args_info->exhaustive_cc_flag = 0;
+  args_info->exhaustive_external_flag = 0;
   args_info->log_appender_arg = gengetopt_strdup ("console-log");
   args_info->log_appender_orig = NULL;
   args_info->out_arg = gengetopt_strdup ("&1");
@@ -244,7 +250,9 @@
   args_info->debug_port_orig = NULL;
   args_info->debug_suspend_flag = 0;
   args_info->profile_flag = 0;
-  args_info->profiler_home_arg = gengetopt_strdup ("/opt/jprofiler5");
+  args_info->agentlib_arg = NULL;
+  args_info->agentlib_orig = NULL;
+  args_info->profiler_home_arg = gengetopt_strdup ("/opt/jprofiler6");
   args_info->profiler_home_orig = NULL;
   
 }
@@ -270,32 +278,34 @@
   args_info->exhaustive_db_help = eucalyptus_opts_full_help[12] ;
   args_info->exhaustive_user_help = eucalyptus_opts_full_help[13] ;
   args_info->exhaustive_cc_help = eucalyptus_opts_full_help[14] ;
-  args_info->log_appender_help = eucalyptus_opts_full_help[15] ;
-  args_info->out_help = eucalyptus_opts_full_help[16] ;
-  args_info->err_help = eucalyptus_opts_full_help[17] ;
-  args_info->remote_cloud_help = eucalyptus_opts_full_help[19] ;
-  args_info->remote_walrus_help = eucalyptus_opts_full_help[20] ;
-  args_info->remote_dns_help = eucalyptus_opts_full_help[21] ;
-  args_info->remote_storage_help = eucalyptus_opts_full_help[22] ;
-  args_info->disable_cloud_help = eucalyptus_opts_full_help[24] ;
-  args_info->disable_walrus_help = eucalyptus_opts_full_help[25] ;
-  args_info->disable_dns_help = eucalyptus_opts_full_help[26] ;
-  args_info->disable_storage_help = eucalyptus_opts_full_help[27] ;
-  args_info->disable_iscsi_help = eucalyptus_opts_full_help[28] ;
-  args_info->check_help = eucalyptus_opts_full_help[30] ;
-  args_info->stop_help = eucalyptus_opts_full_help[31] ;
-  args_info->fork_help = eucalyptus_opts_full_help[32] ;
-  args_info->pidfile_help = eucalyptus_opts_full_help[33] ;
-  args_info->java_home_help = eucalyptus_opts_full_help[35] ;
-  args_info->jvm_name_help = eucalyptus_opts_full_help[36] ;
-  args_info->jvm_args_help = eucalyptus_opts_full_help[37] ;
+  args_info->exhaustive_external_help = eucalyptus_opts_full_help[15] ;
+  args_info->log_appender_help = eucalyptus_opts_full_help[16] ;
+  args_info->out_help = eucalyptus_opts_full_help[17] ;
+  args_info->err_help = eucalyptus_opts_full_help[18] ;
+  args_info->remote_cloud_help = eucalyptus_opts_full_help[20] ;
+  args_info->remote_walrus_help = eucalyptus_opts_full_help[21] ;
+  args_info->remote_dns_help = eucalyptus_opts_full_help[22] ;
+  args_info->remote_storage_help = eucalyptus_opts_full_help[23] ;
+  args_info->disable_cloud_help = eucalyptus_opts_full_help[25] ;
+  args_info->disable_walrus_help = eucalyptus_opts_full_help[26] ;
+  args_info->disable_dns_help = eucalyptus_opts_full_help[27] ;
+  args_info->disable_storage_help = eucalyptus_opts_full_help[28] ;
+  args_info->disable_iscsi_help = eucalyptus_opts_full_help[29] ;
+  args_info->check_help = eucalyptus_opts_full_help[31] ;
+  args_info->stop_help = eucalyptus_opts_full_help[32] ;
+  args_info->fork_help = eucalyptus_opts_full_help[33] ;
+  args_info->pidfile_help = eucalyptus_opts_full_help[34] ;
+  args_info->java_home_help = eucalyptus_opts_full_help[36] ;
+  args_info->jvm_name_help = eucalyptus_opts_full_help[37] ;
+  args_info->jvm_args_help = eucalyptus_opts_full_help[38] ;
   args_info->jvm_args_min = 0;
   args_info->jvm_args_max = 0;
-  args_info->debug_help = eucalyptus_opts_full_help[38] ;
-  args_info->debug_port_help = eucalyptus_opts_full_help[39] ;
-  args_info->debug_suspend_help = eucalyptus_opts_full_help[40] ;
-  args_info->profile_help = eucalyptus_opts_full_help[41] ;
-  args_info->profiler_home_help = eucalyptus_opts_full_help[42] ;
+  args_info->debug_help = eucalyptus_opts_full_help[39] ;
+  args_info->debug_port_help = eucalyptus_opts_full_help[40] ;
+  args_info->debug_suspend_help = eucalyptus_opts_full_help[41] ;
+  args_info->profile_help = eucalyptus_opts_full_help[42] ;
+  args_info->agentlib_help = eucalyptus_opts_full_help[43] ;
+  args_info->profiler_home_help = eucalyptus_opts_full_help[44] ;
   
 }
 
@@ -455,6 +465,8 @@
   free_string_field (&(args_info->jvm_name_orig));
   free_multiple_string_field (args_info->jvm_args_given, &(args_info->jvm_args_arg), &(args_info->jvm_args_orig));
   free_string_field (&(args_info->debug_port_orig));
+  free_string_field (&(args_info->agentlib_arg));
+  free_string_field (&(args_info->agentlib_orig));
   free_string_field (&(args_info->profiler_home_arg));
   free_string_field (&(args_info->profiler_home_orig));
   
@@ -522,6 +534,8 @@
     write_into_file(outfile, "exhaustive-user", 0, 0 );
   if (args_info->exhaustive_cc_given)
     write_into_file(outfile, "exhaustive-cc", 0, 0 );
+  if (args_info->exhaustive_external_given)
+    write_into_file(outfile, "exhaustive-external", 0, 0 );
   if (args_info->log_appender_given)
     write_into_file(outfile, "log-appender", args_info->log_appender_orig, 0);
   if (args_info->out_given)
@@ -567,6 +581,8 @@
     write_into_file(outfile, "debug-suspend", 0, 0 );
   if (args_info->profile_given)
     write_into_file(outfile, "profile", 0, 0 );
+  if (args_info->agentlib_given)
+    write_into_file(outfile, "agentlib", args_info->agentlib_orig, 0);
   if (args_info->profiler_home_given)
     write_into_file(outfile, "profiler-home", args_info->profiler_home_orig, 0);
   
@@ -837,6 +853,11 @@
       fprintf (stderr, "%s: '--debug-suspend' option depends on option 'debug'%s\n", prog_name, (additional_error ? additional_error : ""));
       error = 1;
     }
+  if (args_info->agentlib_given && ! args_info->profile_given)
+    {
+      fprintf (stderr, "%s: '--agentlib' ('-a') option depends on option 'profile'%s\n", prog_name, (additional_error ? additional_error : ""));
+      error = 1;
+    }
   if (args_info->profiler_home_given && ! args_info->profile_given)
     {
       fprintf (stderr, "%s: '--profiler-home' ('-P') option depends on option 'profile'%s\n", prog_name, (additional_error ? additional_error : ""));
@@ -1145,6 +1166,7 @@
         { "exhaustive-db",	0, NULL, 0 },
         { "exhaustive-user",	0, NULL, 0 },
         { "exhaustive-cc",	0, NULL, 0 },
+        { "exhaustive-external",	0, NULL, 0 },
         { "log-appender",	1, NULL, 'L' },
         { "out",	1, NULL, 'o' },
         { "err",	1, NULL, 'e' },
@@ -1168,11 +1190,12 @@
         { "debug-port",	1, NULL, 0 },
         { "debug-suspend",	0, NULL, 0 },
         { "profile",	0, NULL, 'p' },
+        { "agentlib",	1, NULL, 'a' },
         { "profiler-home",	1, NULL, 'P' },
         { 0,  0, 0, 0 }
       };
 
-      c = getopt_long (argc, argv, "Vu:h:c:w:D:vl:xL:o:e:CSfj:J:X:dpP:", long_options, &option_index);
+      c = getopt_long (argc, argv, "Vu:h:c:w:D:vl:xL:o:e:CSfj:J:X:dpa:P:", long_options, &option_index);
 
       if (c == -1) break;	/* Exit from `while (1)' loop.  */
 
@@ -1391,12 +1414,24 @@
             goto failure;
         
           break;
+        case 'a':	/* Launch with agentlib enabled..  */
+        
+        
+          if (update_arg( (void *)&(args_info->agentlib_arg), 
+               &(args_info->agentlib_orig), &(args_info->agentlib_given),
+              &(local_args_info.agentlib_given), optarg, 0, 0, ARG_STRING,
+              check_ambiguity, override, 0, 0,
+              "agentlib", 'a',
+              additional_error))
+            goto failure;
+        
+          break;
         case 'P':	/* Set the home for jprofiler..  */
         
         
           if (update_arg( (void *)&(args_info->profiler_home_arg), 
                &(args_info->profiler_home_orig), &(args_info->profiler_home_given),
-              &(local_args_info.profiler_home_given), optarg, 0, "/opt/jprofiler5", ARG_STRING,
+              &(local_args_info.profiler_home_given), optarg, 0, "/opt/jprofiler6", ARG_STRING,
               check_ambiguity, override, 0, 0,
               "profiler-home", 'P',
               additional_error))
@@ -1453,6 +1488,18 @@
               goto failure;
           
           }
+          /* Individually enable exhaustive logging for external libraries..  */
+          else if (strcmp (long_options[option_index].name, "exhaustive-external") == 0)
+          {
+          
+          
+            if (update_arg((void *)&(args_info->exhaustive_external_flag), 0, &(args_info->exhaustive_external_given),
+                &(local_args_info.exhaustive_external_given), optarg, 0, 0, ARG_FLAG,
+                check_ambiguity, override, 1, 0, "exhaustive-external", '-',
+                additional_error))
+              goto failure;
+          
+          }
           /* Do not try to bootstrap cloud services locally..  */
           else if (strcmp (long_options[option_index].name, "remote-cloud") == 0)
           {

=== modified file 'clc/modules/bootstrap/eucalyptus-opts.h'
--- clc/modules/bootstrap/eucalyptus-opts.h	2010-01-23 05:39:06 +0000
+++ clc/modules/bootstrap/eucalyptus-opts.h	2010-08-17 20:32:41 +0000
@@ -70,6 +70,8 @@
   const char *exhaustive_user_help; /**< @brief Individually enable exhaustive connection information for client connections. help description.  */
   int exhaustive_cc_flag;	/**< @brief Individually enable exhaustive connection information for client connections. (default=off).  */
   const char *exhaustive_cc_help; /**< @brief Individually enable exhaustive connection information for client connections. help description.  */
+  int exhaustive_external_flag;	/**< @brief Individually enable exhaustive logging for external libraries. (default=off).  */
+  const char *exhaustive_external_help; /**< @brief Individually enable exhaustive logging for external libraries. help description.  */
   char * log_appender_arg;	/**< @brief Control the destination for console output. (default='console-log').  */
   char * log_appender_orig;	/**< @brief Control the destination for console output. original value given at command line.  */
   const char *log_appender_help; /**< @brief Control the destination for console output. help description.  */
@@ -126,7 +128,10 @@
   const char *debug_suspend_help; /**< @brief Set the port to use for the debugger. help description.  */
   int profile_flag;	/**< @brief Launch with jprofiler enabled. (default=off).  */
   const char *profile_help; /**< @brief Launch with jprofiler enabled. help description.  */
-  char * profiler_home_arg;	/**< @brief Set the home for jprofiler. (default='/opt/jprofiler5').  */
+  char * agentlib_arg;	/**< @brief Launch with agentlib enabled..  */
+  char * agentlib_orig;	/**< @brief Launch with agentlib enabled. original value given at command line.  */
+  const char *agentlib_help; /**< @brief Launch with agentlib enabled. help description.  */
+  char * profiler_home_arg;	/**< @brief Set the home for jprofiler. (default='/opt/jprofiler6').  */
   char * profiler_home_orig;	/**< @brief Set the home for jprofiler. original value given at command line.  */
   const char *profiler_home_help; /**< @brief Set the home for jprofiler. help description.  */
   
@@ -144,6 +149,7 @@
   unsigned int exhaustive_db_given ;	/**< @brief Whether exhaustive-db was given.  */
   unsigned int exhaustive_user_given ;	/**< @brief Whether exhaustive-user was given.  */
   unsigned int exhaustive_cc_given ;	/**< @brief Whether exhaustive-cc was given.  */
+  unsigned int exhaustive_external_given ;	/**< @brief Whether exhaustive-external was given.  */
   unsigned int log_appender_given ;	/**< @brief Whether log-appender was given.  */
   unsigned int out_given ;	/**< @brief Whether out was given.  */
   unsigned int err_given ;	/**< @brief Whether err was given.  */
@@ -167,6 +173,7 @@
   unsigned int debug_port_given ;	/**< @brief Whether debug-port was given.  */
   unsigned int debug_suspend_given ;	/**< @brief Whether debug-suspend was given.  */
   unsigned int profile_given ;	/**< @brief Whether profile was given.  */
+  unsigned int agentlib_given ;	/**< @brief Whether agentlib was given.  */
   unsigned int profiler_home_given ;	/**< @brief Whether profiler-home was given.  */
 
 } ;

=== modified file 'clc/modules/cloud/src/main/resources/com.eucalyptus.CloudServiceProvider'
--- clc/modules/cloud/src/main/resources/com.eucalyptus.CloudServiceProvider	2009-08-14 14:29:33 +0000
+++ clc/modules/cloud/src/main/resources/com.eucalyptus.CloudServiceProvider	2010-08-17 20:32:41 +0000
@@ -5,3 +5,6 @@
 euca.model.storage=eucalyptus-storage.xml
 euca.model.userdata=eucalyptus-userdata.xml
 euca.model.verification=eucalyptus-verification.xml
+euca.url.local=vm://EucalyptusRequestQueue
+euca.url.pattern=http://%s:%d/internal/%s
+euca.url.port=8773
\ No newline at end of file

=== modified file 'clc/modules/cloud/src/main/resources/eucalyptus-interface.xml'
--- clc/modules/cloud/src/main/resources/eucalyptus-interface.xml	2009-11-18 02:56:08 +0000
+++ clc/modules/cloud/src/main/resources/eucalyptus-interface.xml	2010-08-17 20:32:41 +0000
@@ -89,10 +89,14 @@
 					<outbound-endpoint ref="StartVerifyWS" />
 					<payload-type-filter expectedType="edu.ucsb.eucalyptus.msgs.RunInstancesType" />
 				</filtering-router>
-				<filtering-router>
-					<outbound-endpoint ref="VmControlWS" />
-					<payload-type-filter expectedType="edu.ucsb.eucalyptus.msgs.VmControlMessage" />
-				</filtering-router>
+        <filtering-router>
+          <outbound-endpoint ref="VmControlWS" />
+          <payload-type-filter expectedType="edu.ucsb.eucalyptus.msgs.VmControlMessage" />
+        </filtering-router>
+        <filtering-router>
+          <outbound-endpoint ref="VmControlWS" />
+          <payload-type-filter expectedType="edu.ucsb.eucalyptus.msgs.VmBundleMessage" />
+        </filtering-router>
 				<filtering-router>
 					<outbound-endpoint ref="ClusterEndpointWS" />
 					<payload-type-filter expectedType="edu.ucsb.eucalyptus.msgs.ClusterMessage" />

=== modified file 'clc/modules/cloud/src/main/resources/eucalyptus-runtime.xml'
--- clc/modules/cloud/src/main/resources/eucalyptus-runtime.xml	2009-09-08 21:45:10 +0000
+++ clc/modules/cloud/src/main/resources/eucalyptus-runtime.xml	2010-08-17 20:32:41 +0000
@@ -81,7 +81,7 @@
       <inbound>
         <inbound-endpoint ref="VmControlWS"/>
       </inbound>
-      <component class="edu.ucsb.eucalyptus.cloud.ws.VmControl"/>
+      <component class="com.eucalyptus.vm.VmControl"/>
       <outbound>
         <outbound-pass-through-router>
           <outbound-endpoint ref="ReplyQueueEndpoint"/>
@@ -99,21 +99,21 @@
         <inbound>
           <inbound-endpoint ref="ImageResolveWS"/>
         </inbound>
-        <component class="edu.ucsb.eucalyptus.cloud.ws.ImageManager"/>
+        <component class="com.eucalyptus.images.ImageManager"/>
       </service>
 
     <service name="ClusterSink">
       <inbound>
         <inbound-endpoint ref="ClusterSinkWS"/>
       </inbound>
-      <component class="edu.ucsb.eucalyptus.cloud.cluster.ClusterEndpoint"/>
+      <component class="com.eucalyptus.cluster.ClusterEndpoint"/>
     </service>
 
     <service name="ClusterEndpoint">
       <inbound>
         <inbound-endpoint ref="ClusterEndpointWS"/>
       </inbound>
-      <component class="edu.ucsb.eucalyptus.cloud.cluster.ClusterEndpoint"/>
+      <component class="com.eucalyptus.cluster.ClusterEndpoint"/>
       <outbound>
         <outbound-pass-through-router>
           <outbound-endpoint ref="ReplyQueueEndpoint"/>
@@ -125,7 +125,7 @@
       <inbound>
         <inbound-endpoint ref="AddressWS"/>
       </inbound>
-      <component class="edu.ucsb.eucalyptus.cloud.ws.AddressManager"/>
+      <component class="com.eucalyptus.address.AddressManager"/>
       <outbound>
         <outbound-pass-through-router>
           <outbound-endpoint ref="ReplyQueueEndpoint"/>
@@ -137,7 +137,7 @@
       <inbound>
         <inbound-endpoint ref="SystemStateWS"/>
       </inbound>
-      <component class="edu.ucsb.eucalyptus.cloud.ws.SystemState"/>
+      <component class="com.eucalyptus.vm.SystemState"/>
       <outbound>
         <outbound-pass-through-router>
           <outbound-endpoint ref="ReplyQueueEndpoint"/>
@@ -149,7 +149,7 @@
       <inbound>
         <inbound-endpoint ref="UpdateSystemWS"/>
       </inbound>
-      <component class="edu.ucsb.eucalyptus.cloud.ws.CreateVmInstances"/>
+      <component class="com.eucalyptus.sla.CreateVmInstances"/>
       <outbound>
         <multicasting-router>
           <outbound-endpoint ref="ClusterSinkWS"/>
@@ -162,7 +162,7 @@
       <inbound>
         <inbound-endpoint ref="TransformReplyWS"/>
       </inbound>
-      <component class="edu.ucsb.eucalyptus.cloud.ws.VmReplyTransform"/>
+      <component class="com.eucalyptus.vm.VmReplyTransform"/>
       <outbound>
         <outbound-pass-through-router>
           <outbound-endpoint ref="ReplyQueueEndpoint"/>
@@ -177,7 +177,7 @@
       <inbound>
         <inbound-endpoint ref="VmMetadataWS"/>
       </inbound>
-      <component class="edu.ucsb.eucalyptus.cloud.ws.VmMetadata"/>
+      <component class="com.eucalyptus.vm.VmMetadata"/>
     </service>
   </model>
 

=== modified file 'clc/modules/cloud/src/main/resources/eucalyptus-services.xml'
--- clc/modules/cloud/src/main/resources/eucalyptus-services.xml	2009-10-23 04:34:22 +0000
+++ clc/modules/cloud/src/main/resources/eucalyptus-services.xml	2010-08-17 20:32:41 +0000
@@ -73,7 +73,7 @@
        http://www.mulesource.org/schema/mule/vm/2.0 http://www.mulesource.org/schema/mule/vm/2.0/mule-vm.xsd
        http://www.eucalyptus.com/schema/cloud/1.6 http://www.eucalyptus.com/schema/cloud/1.6/euca.xsd">
   <!--user data services-->
-  <euca:endpoint name="EucalyptusWS" connector-ref="eucaws" address="http://127.0.0.1:8773/services/Eucalyptus" synchronous="true" />
+  <euca:endpoint name="EucalyptusWS" connector-ref="eucaws" address="http://127.0.0.1:${euca.ws.port}/services/Eucalyptus" synchronous="true" />
   <endpoint name="ShortBusWS" address="vm://ShortBus" synchronous="false" />
   <endpoint name="ImageWS" address="vm://Image" synchronous="false" />
   <endpoint name="VolumeWS" address="vm://Volume" synchronous="false" />

=== modified file 'clc/modules/cloud/src/main/resources/eucalyptus-storage.xml'
--- clc/modules/cloud/src/main/resources/eucalyptus-storage.xml	2009-08-27 10:37:27 +0000
+++ clc/modules/cloud/src/main/resources/eucalyptus-storage.xml	2010-08-17 20:32:41 +0000
@@ -81,7 +81,7 @@
             <inbound>
                 <inbound-endpoint ref="ImageWS"/>
             </inbound>
-            <component class="edu.ucsb.eucalyptus.cloud.ws.ImageManager"/>
+            <component class="com.eucalyptus.images.ImageManager"/>
             <outbound>
                 <outbound-pass-through-router>
                     <outbound-endpoint ref="ReplyQueueEndpoint"/>
@@ -92,7 +92,7 @@
             <inbound>
                 <inbound-endpoint ref="VolumeWS"/>
             </inbound>
-            <component class="edu.ucsb.eucalyptus.cloud.ws.VolumeManager"/>
+            <component class="com.eucalyptus.blockstorage.VolumeManager"/>
             <outbound>
                 <outbound-pass-through-router>
                     <outbound-endpoint ref="ReplyQueueEndpoint"/>
@@ -103,7 +103,7 @@
             <inbound>
                 <inbound-endpoint ref="SnapshotWS"/>
             </inbound>
-            <component class="edu.ucsb.eucalyptus.cloud.ws.SnapshotManager"/>
+            <component class="com.eucalyptus.blockstorage.SnapshotManager"/>
             <outbound>
                 <outbound-pass-through-router>
                     <outbound-endpoint ref="ReplyQueueEndpoint"/>

=== modified file 'clc/modules/cloud/src/main/resources/eucalyptus-verification.xml'
--- clc/modules/cloud/src/main/resources/eucalyptus-verification.xml	2009-12-16 12:49:23 +0000
+++ clc/modules/cloud/src/main/resources/eucalyptus-verification.xml	2010-08-17 20:32:41 +0000
@@ -105,7 +105,7 @@
             <inbound>
                 <inbound-endpoint ref="ImageVerifyWS"/>
             </inbound>
-            <component class="edu.ucsb.eucalyptus.cloud.ws.ImageManager"/>
+            <component class="com.eucalyptus.images.ImageManager"/>
             <outbound>
                 <outbound-pass-through-router>
                     <outbound-endpoint ref="KeyPairVerifyWS"/>
@@ -129,7 +129,7 @@
             <inbound>
                 <inbound-endpoint ref="VmTypeVerifyWS"/>
             </inbound>
-            <component class="edu.ucsb.eucalyptus.cloud.cluster.VmTypeVerify"/>
+            <component class="com.eucalyptus.cluster.VmTypeVerify"/>
             <outbound>
                 <outbound-pass-through-router>
                     <outbound-endpoint ref="GroupsVerifyWS"/>

=== removed file 'clc/modules/cluster-manager/cluster-manager.iml'
--- clc/modules/cluster-manager/cluster-manager.iml	2009-06-24 02:29:49 +0000
+++ clc/modules/cluster-manager/cluster-manager.iml	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Groovy" name="Groovy">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build" />
-    <output-test url="file://$MODULE_DIR$/build" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../target">
-      <excludeFolder url="file://$MODULE_DIR$/../../target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="eucalyptus-deps" level="project" />
-    <orderEntry type="module" module-name="msgs" exported="" />
-    <orderEntry type="module" module-name="core" exported="" />
-    <orderEntry type="module" module-name="axis2-transport" exported="" />
-  </component>
-</module>
-

=== removed file 'clc/modules/cluster-manager/conf/scripts/LeastFullFirst.groovy'
--- clc/modules/cluster-manager/conf/scripts/LeastFullFirst.groovy	2009-12-17 12:35:33 +0000
+++ clc/modules/cluster-manager/conf/scripts/LeastFullFirst.groovy	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-package com.eucalyptus.sla;
-
-import com.eucalyptus.cluster.Cluster;
-import com.eucalyptus.cluster.Clusters;
-import edu.ucsb.eucalyptus.cloud.ResourceToken;
-import edu.ucsb.eucalyptus.cloud.VmAllocationInfo;
-import com.eucalyptus.util.NotEnoughResourcesAvailable;
-
-public class LeastFullFirst implements ResourceAllocator {
-  
-  @Override
-  public void allocate( VmAllocationInfo vmInfo ) throws Exception {
-    def clusterMap = [:]
-    Clusters.getInstance().listValues().collect{ Cluster it ->
-      clusterMap[it] = it.getNodeState( ).getAvailability( vmInfo.getRequest( ).getInstanceType( ) )
-    }
-    
-    def leastFull = clusterMap.sort{ it.value }.find{ it }
-    def amount = [leastFull.value.getAvailable(), vmInfo.request.maxCount].min();
-    if( amount < vmInfo.request.minCount ) {
-      throw new NotEnoughResourcesAvailable("Not enough resources (${leastFull.value} < ${vmInfo.request.minCount}: vm instances.")  ;
-    }
-    def allocation = leastFull.key.getNodeState().getResourceAllocation(vmInfo.request.correlationId, vmInfo.request.userId, vmInfo.request.instanceType, amount)
-    vmInfo.getAllocationTokens( ).add( allocation );
-  }
-  
-  @Override
-  public void fail( VmAllocationInfo vmInfo, Throwable t ) {
-    vmInfo.allocationTokens.each  { ResourceToken it ->
-      Clusters.getInstance().lookup( it.getCluster( ) ).getNodeState( ).releaseToken( it )
-    }
-  }
-  
-}

=== removed file 'clc/modules/cluster-manager/pom.xml'
--- clc/modules/cluster-manager/pom.xml	2009-08-27 10:37:27 +0000
+++ clc/modules/cluster-manager/pom.xml	1970-01-01 00:00:00 +0000
@@ -1,101 +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: chris grzegorczyk <[e-mail]>
-  --> 
-<project >
-    <parent>
-        <groupId>eucalyptus</groupId>
-        <artifactId>cloud</artifactId>
-        <version>1</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>eucalyptus</groupId>
-    <artifactId>cluster-manager</artifactId>
-    <version>${euca.version}</version>
-    <name>Eucalyptus Cluster Manager</name>
-    <dependencies>
-        <dependency>
-            <groupId>eucalyptus</groupId>
-            <artifactId>msgs</artifactId>
-            <version>${euca.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>eucalyptus</groupId>
-            <artifactId>core</artifactId>
-            <version>${euca.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>eucalyptus</groupId>
-            <artifactId>wsstack</artifactId>
-            <version>${euca.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.drools</groupId>
-            <artifactId>drools-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.drools</groupId>
-            <artifactId>drools-compiler</artifactId>
-        </dependency>
-
-    </dependencies>
-</project>
\ No newline at end of file

=== modified file 'clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/AbstractSystemAddressManager.java'
--- clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/AbstractSystemAddressManager.java	2010-06-26 04:02:24 +0000
+++ clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/AbstractSystemAddressManager.java	2010-08-17 20:32:41 +0000
@@ -8,22 +8,19 @@
 import org.apache.log4j.Logger;
 import com.eucalyptus.bootstrap.Component;
 import com.eucalyptus.cluster.Cluster;
-import com.eucalyptus.cluster.SuccessCallback;
-import com.eucalyptus.net.util.ClusterAddressInfo;
-import com.eucalyptus.util.EntityWrapper;
+import com.eucalyptus.cluster.VmInstance;
+import com.eucalyptus.cluster.VmInstances;
+import com.eucalyptus.entities.EntityWrapper;
+import com.eucalyptus.util.Exceptions;
 import com.eucalyptus.util.LogUtil;
 import com.eucalyptus.util.NotEnoughResourcesAvailable;
+import com.eucalyptus.vm.VmState;
 import com.google.common.collect.Lists;
-import edu.ucsb.eucalyptus.cloud.cluster.AssignAddressCallback;
-import edu.ucsb.eucalyptus.cloud.cluster.QueuedEventCallback;
-import edu.ucsb.eucalyptus.cloud.cluster.UnassignAddressCallback;
-import edu.ucsb.eucalyptus.cloud.cluster.VmInstance;
-import edu.ucsb.eucalyptus.cloud.cluster.VmInstances;
 import edu.ucsb.eucalyptus.cloud.exceptions.ExceptionList;
-import edu.ucsb.eucalyptus.constants.VmState;
 
 public abstract class AbstractSystemAddressManager {
-  static Logger LOG = Logger.getLogger( AbstractSystemAddressManager.class );  
+  static Logger LOG = Logger.getLogger( AbstractSystemAddressManager.class );
+  
   public Address allocateNext( String userId ) throws NotEnoughResourcesAvailable {
     Address addr = Addresses.getInstance( ).enableFirst( ).allocate( userId );
     LOG.debug( "Allocated address for public addressing: " + addr.toString( ) );
@@ -33,10 +30,9 @@
     }
     return addr;
   }
-
+  
   public abstract void assignSystemAddress( final VmInstance vm ) throws NotEnoughResourcesAvailable;
-  public abstract void releaseSystemAddress( final Address addr );
-  public abstract List<Address> getReservedAddresses();
+  public abstract List<Address> getReservedAddresses( );
   public abstract void inheritReservedAddresses( List<Address> previouslyReservedAddresses );
   public abstract List<Address> allocateSystemAddresses( String cluster, int count ) throws NotEnoughResourcesAvailable;
   
@@ -85,6 +81,7 @@
       } catch ( NoSuchElementException e1 ) {
         try {
           addr = Addresses.getInstance( ).lookup( addrInfo.getAddress( ) );
+<<<<<<< TREE
           LOG.trace( "Found address in the active set cache: " + addr );
         } catch ( NoSuchElementException e ) {}
       }
@@ -105,8 +102,121 @@
         } else if( addr == null && vm == null ) {
           addr = new Address( addrInfo.getAddress( ), cluster.getName( ) );
           cluster.getState().handleOrphan( addrInfo );
-        }
-      } else {
+=======
+          LOG.trace( "Found address in the active set cache: " + addr );
+        } catch ( NoSuchElementException e ) {}
+      }
+      Helper.checkUniqueness( addrInfo );
+      if ( addrInfo.hasMapping( ) ) {
+        vm = Helper.maybeFindVm( addrInfo.getAddress( ), addrInfo.getInstanceIp( ) );
+        if ( addr != null && vm != null ) {
+          Helper.ensureAllocated( addr, vm );
+          cluster.getState( ).clearOrphan( addrInfo );
+        } else if ( addr != null && vm != null && vm.getState( ).ordinal( ) > VmState.RUNNING.ordinal( ) ) {
+          cluster.getState( ).handleOrphan( addrInfo );
+        } else if ( addr != null && vm == null ) {
+          cluster.getState( ).handleOrphan( addrInfo );
+        } else if ( addr == null && vm != null ) {
+          addr = new Address( addrInfo.getAddress( ), cluster.getName( ), Component.eucalyptus.name( ), vm.getInstanceId( ), vm.getPrivateAddress( ) );
+          cluster.getState( ).clearOrphan( addrInfo );
+        } else if( addr == null && vm == null ) {
+          addr = new Address( addrInfo.getAddress( ), cluster.getName( ) );
+          cluster.getState().handleOrphan( addrInfo );
+        }
+      } else {
+        if( addr != null && addr.isAssigned( ) && !addr.isPending( ) ) {
+          cluster.getState( ).handleOrphan( addrInfo );
+        } else if( addr != null && !addr.isAssigned( ) && !addr.isPending( ) && addr.isSystemOwned( ) ) {
+          try {
+            addr.release( );
+          } catch ( Exception ex ) {
+            LOG.error( ex );
+          }
+        } else if( addr != null && Address.Transition.system.equals( addr.getTransition( ) ) ) {
+          cluster.getState( ).handleOrphan( addrInfo );
+        } else if( addr == null ) {
+          addr = new Address( addrInfo.getAddress( ), cluster.getName( ) );
+          Helper.clearVmState( addrInfo );
+        }
+      } 
+      return addr;
+    }