[jbosstools-commits] JBoss Tools SVN: r24162 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: jjohnstn
Date: 2010-08-13 14:02:38 -0400 (Fri, 13 Aug 2010)
New Revision: 24162

Modified:
   trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
   trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
Log:
2010-08-13  Jeff Johnston  <jjohnstn at redhat.com>

	* src/org/jboss/tools/deltacloud/core/DeltaCloud.java (DeltaCloud): Take the
	url as a String input.  Create the URL when constructing the client and add
	"/api" to the user-specified url. 
	(getURL): Return the url directly. 



Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog	2010-08-13 17:59:41 UTC (rev 24161)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog	2010-08-13 18:02:38 UTC (rev 24162)
@@ -1,3 +1,10 @@
+2010-08-13  Jeff Johnston  <jjohnstn at redhat.com>
+
+	* src/org/jboss/tools/deltacloud/core/DeltaCloud.java (DeltaCloud): Take the
+	url as a String input.  Create the URL when constructing the client and add
+	"/api" to the user-specified url. 
+	(getURL): Return the url directly. 
+
 2010-08-12  Jeff Johnston  <jjohnstn at redhat.com>
 
 	* src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java (destroyInstance): Fix to use

Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java	2010-08-13 17:59:41 UTC (rev 24161)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java	2010-08-13 18:02:38 UTC (rev 24162)
@@ -19,15 +19,15 @@
 	
 	private String name;
 	private String username;
-	private URL url;
+	private String url;
 	private DeltaCloudClient client;
 	private ArrayList<DeltaCloudInstance> instances;
 	
 	ListenerList instanceListeners = new ListenerList();
 	ListenerList imageListeners = new ListenerList();
 	
-	public DeltaCloud(String name, URL url, String username, String passwd) throws MalformedURLException {
-		this.client = new DeltaCloudClient(url, username, passwd);
+	public DeltaCloud(String name, String url, String username, String passwd) throws MalformedURLException {
+		this.client = new DeltaCloudClient(new URL(url + "/api"), username, passwd); //$NON-NLS-1$
 		this.url = url;
 		this.name = name;
 		this.username = username;
@@ -38,7 +38,7 @@
 	}
 	
 	public String getURL() {
-		return url.toString();
+		return url;
 	}
 	
 	public String getUsername() {