Fixed references in www which were stale

eucalyptus · Aug 10, 2009 · 9400d6a · 9400d6a
1 parent d3a33f1
commit 9400d6a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/clc/.project b/clc/.project
@@ -15,11 +15,6 @@
 				</dictionary>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.codehaus.groovy.eclipse.groovyBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
 			<triggers>full,incremental,</triggers>
@@ -30,9 +25,14 @@
 				</dictionary>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.codehaus.groovy.eclipse.groovyNature</nature>
+		<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/EucalyptusWebBackendImpl.java b/clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/EucalyptusWebBackendImpl.java
@@ -34,6 +34,7 @@
 
 package edu.ucsb.eucalyptus.admin.server;
 
+import com.eucalyptus.util.BaseDirectory;
 import com.google.gwt.user.client.rpc.SerializableException;
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 import com.google.gwt.user.server.rpc.UnexpectedException;
@@ -44,7 +45,6 @@
 import edu.ucsb.eucalyptus.admin.client.SystemConfigWeb;
 import edu.ucsb.eucalyptus.admin.client.UserInfoWeb;
 import edu.ucsb.eucalyptus.admin.client.VmTypeWeb;
-import edu.ucsb.eucalyptus.util.BaseDirectory;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.log4j.Logger;

diff --git a/clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/Registration.java b/clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/Registration.java
@@ -1,7 +1,7 @@
 package edu.ucsb.eucalyptus.admin.server;
 
+import com.eucalyptus.auth.Hashes;
 import com.eucalyptus.util.EucalyptusCloudException;
-import edu.ucsb.eucalyptus.keys.Hashes;
 import edu.ucsb.eucalyptus.util.EucalyptusProperties;
 import org.apache.log4j.Logger;
 

diff --git a/clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/X509Download.java b/clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/X509Download.java
@@ -31,16 +31,15 @@
 import edu.ucsb.eucalyptus.admin.client.UserInfoWeb;
 
 import com.eucalyptus.auth.Credentials;
+import com.eucalyptus.auth.Hashes;
 import com.eucalyptus.auth.User;
 import com.eucalyptus.auth.X509Cert;
+import com.eucalyptus.auth.util.EucaKeyStore;
 import com.eucalyptus.auth.util.KeyTool;
 import com.eucalyptus.util.EntityWrapper;
 import com.eucalyptus.util.EucalyptusCloudException;
 import edu.ucsb.eucalyptus.cloud.entities.CertificateInfo;
 import edu.ucsb.eucalyptus.cloud.entities.UserInfo;
-import edu.ucsb.eucalyptus.keys.AbstractKeyStore;
-import edu.ucsb.eucalyptus.keys.Hashes;
-import edu.ucsb.eucalyptus.keys.UserKeyStore;
 import edu.ucsb.eucalyptus.util.EucalyptusProperties;
 import org.apache.log4j.Logger;
 import org.bouncycastle.util.encoders.UrlBase64;
@@ -143,12 +142,7 @@ public static byte[] getX509Zip( String userName, String newKeyName ) throws Gen
     try {
       x509.checkValidity( );
       Credentials.Users.addCertificate( userName, newKeyName, x509 );
-      AbstractKeyStore ks = UserKeyStore.getInstance( );
-      ks.addCertificate( newKeyName, x509 );
-      cloudCert = ks.getCertificate( EucalyptusProperties.NAME );
-      ks.store( );
-    } catch ( IOException e ) {
-      LOG.fatal( e, e );
+      cloudCert = EucaKeyStore.getInstance( ).getCertificate( EucalyptusProperties.NAME );
     } catch ( GeneralSecurityException e ) {
       LOG.fatal( e, e );
     }