Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge commit 'e584b4794b17cc1483d0ca18f973978320072e07' into testing

  • Loading branch information...
commit f83ffd4737c39f4c60cd915280500528e85182e6 2 parents 1cbc64a + e584b47
Neil Soman authored May 17, 2012
3  clc/modules/www/conf/eucalyptus-web-default.properties
@@ -13,6 +13,5 @@
13 13
 account-signup-email-subject = [Eucalyptus] New account has been signed up
14 14
 search-result-page-size = 20
15 15
 rightscale-registration-base-url = https://my.rightscale.com/cloud_registrations/new?callback_url=
16  
-image-download-url = http://www.eucalyptussoftware.com/downloads/eucalyptus-images/list.php?version=
17  
-tool-download-url = http://www.eucalyptussoftware.com/downloads/eucalyptus-tools/list.php?version=
  16
+tool-download-url = http://tools.eucalyptus.com/list.php?version=
18 17
 eustore-description = <p>EuStore is an easy way for Eucalyptus users and administrators to install images on their cloud. It consists of a set of images hosted by Eucalyptus and some client tools that provide an easy way to install images on your own cloud.</p><br/><p>If you have euca2ools installed, you already have the EuStore client tools as well! Start by running <i>eustore-describe-images</i> to get a list of images. Then, use <i>eustore-install-image</i> to install one locally. For more information on these commands, please see the <a href="http://www.eucalyptus.com/sites/all/modules/pubdlcnt/pubdlcnt.php?file=/sites/all/files/docs/latest/cli.pdf&nid=296">EuStore documentation</a></p>
9  clc/modules/www/src/main/java/com/eucalyptus/webui/client/service/EucalyptusService.java
@@ -498,15 +498,6 @@
498 498
   public CloudInfo getCloudInfo( Session session, boolean setExternalHostPort ) throws EucalyptusServiceException;
499 499
   
500 500
   /**
501  
-   * Get the list of image downloads.
502  
-   * 
503  
-   * @param session
504  
-   * @return
505  
-   * @throws EucalyptusServiceException
506  
-   */
507  
-  public ArrayList<DownloadInfo> getImageDownloads( Session session ) throws EucalyptusServiceException;
508  
-  
509  
-  /**
510 501
    * Get the list of tool downloads.
511 502
    * 
512 503
    * @param session
2  clc/modules/www/src/main/java/com/eucalyptus/webui/client/service/EucalyptusServiceAsync.java
@@ -107,8 +107,6 @@
107 107
 
108 108
   void getCloudInfo( Session session, boolean setExternalHostPort, AsyncCallback<CloudInfo> callback );
109 109
 
110  
-  void getImageDownloads( Session session, AsyncCallback<ArrayList<DownloadInfo>> callback );
111  
-
112 110
   void getToolDownloads( Session session, AsyncCallback<ArrayList<DownloadInfo>> callback );
113 111
 
114 112
   void getGuide( Session session, String snippet, AsyncCallback<ArrayList<GuideItem>> callback );
12  clc/modules/www/src/main/java/com/eucalyptus/webui/server/EucalyptusServiceImpl.java
@@ -526,18 +526,6 @@ public CloudInfo getCloudInfo( Session session, boolean setExternalHostPort ) th
526 526
   }
527 527
 
528 528
   @Override
529  
-  public ArrayList<DownloadInfo> getImageDownloads( Session session ) throws EucalyptusServiceException {
530  
-    verifySession( session );
531  
-    String version;
532  
-    try {
533  
-      version = UriUtils.encodeQuery( WebProperties.getVersion( ), "UTF-8" );
534  
-    } catch ( Exception e ) {
535  
-      version = WebProperties.getVersion( );
536  
-    }
537  
-    return DownloadsWebBackend.getDownloads( WebProperties.getProperty( WebProperties.IMAGE_DOWNLOAD_URL, WebProperties.IMAGE_DOWNLOAD_URL_DEFAULT ) + version );
538  
-  }
539  
-
540  
-  @Override
541 529
   public ArrayList<DownloadInfo> getToolDownloads( Session session ) throws EucalyptusServiceException {
542 530
     verifySession( session );
543 531
     String version;
5  clc/modules/www/src/main/java/com/eucalyptus/webui/server/WebProperties.java
@@ -61,11 +61,8 @@
61 61
   public static final String RIGHTSCALE_WHOAMI_URL = "rightscale-whoami-url";
62 62
   public static final String RIGHTSCALE_WHOAMI_URL_DEFAULT = "https://my.rightscale.com/whoami?api_version=1.0&cloud=0";
63 63
   
64  
-  public static final String IMAGE_DOWNLOAD_URL = "image-download-url";
65  
-  public static final String IMAGE_DOWNLOAD_URL_DEFAULT = "http://www.eucalyptussoftware.com/downloads/eucalyptus-images/list.php?version=";
66  
-  
67 64
   public static final String TOOL_DOWNLOAD_URL = "tool-download-url";
68  
-  public static final String TOOL_DOWNLOAD_URL_DEFAULT = "http://www.eucalyptussoftware.com/downloads/eucalyptus-tools/list.php?version=";
  65
+  public static final String TOOL_DOWNLOAD_URL_DEFAULT = "http://tools.eucalyptus.com/list.php?version=";
69 66
   
70 67
   public static HashMap<String, String> getProperties( ) {
71 68
     Properties props = new Properties( );
7  clc/modules/www/test-gwt/src/com/eucalyptus/webui/server/EucalyptusServiceImpl.java
@@ -386,13 +386,6 @@ public CloudInfo getCloudInfo( Session session, boolean setExternalHostPort ) th
386 386
   }
387 387
 
388 388
   @Override
389  
-  public ArrayList<DownloadInfo> getImageDownloads( Session session ) throws EucalyptusServiceException {
390  
-    return new ArrayList<DownloadInfo>( Arrays.asList( new DownloadInfo( "http://localhost", "kernel", "Kernel image" ),
391  
-                                                          new DownloadInfo( "http://localhost", "ramdisk", "Ramdisk image" ),
392  
-                                                          new DownloadInfo( "http://localhost", "root", "Root disk image" ) ) );
393  
-  }
394  
-
395  
-  @Override
396 389
   public ArrayList<DownloadInfo> getToolDownloads( Session session ) throws EucalyptusServiceException {
397 390
     return new ArrayList<DownloadInfo>( Arrays.asList( new DownloadInfo( "http://localhost", "euca-tools", "EUCA tools" ),
398 391
                                                           new DownloadInfo( "http://localhost", "boto", "BOTO" ),

0 notes on commit f83ffd4

Please sign in to comment.
Something went wrong with that request. Please try again.