Author: adietish
Date: 2011-06-09 08:37:04 -0400 (Thu, 09 Jun 2011)
New Revision: 31958
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/client-0.2.0-SNAPSHOT.jar
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/.classpath
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/build.properties
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/DeltaCloudDriver.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProfile.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProperty.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImageFactory.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstanceFactory.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudKey.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudRealm.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudResourceAction.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/AbstractInstanceHandler.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/context/MockIntegrationTestContext.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/DeltaCloudMockIntegrationTest.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/CloudSchedulingRulesTest.java
Log:
[JBIDE-9105] removed org.jboss.tools.deltacloud.client and replaced by a jarred version of
org.apache.deltacloud java client (it's the same code, but it's now hosted in the
deltacloud project
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/.classpath
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/.classpath 2011-06-09
12:00:51 UTC (rev 31957)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/.classpath 2011-06-09
12:37:04 UTC (rev 31958)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry exported="true" kind="lib"
path="client-0.2.0-SNAPSHOT.jar"
sourcepath="/home/adietish/jboss-workspaces/deltacloud/deltacloud/clients/java"/>
<classpathentry exported="true" kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry exported="true" kind="con"
path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 2011-06-09
12:00:51 UTC (rev 31957)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 2011-06-09
12:37:04 UTC (rev 31958)
@@ -7,10 +7,13 @@
Bundle-Vendor: JBoss by Red Hat
Require-Bundle: org.jboss.tools.common;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.equinox.security;bundle-version="1.1.0",
- org.jboss.tools.deltacloud.client;bundle-version="[0.2.0,1.0.0)"
+ org.eclipse.equinox.security;bundle-version="1.1.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
-Export-Package:
org.jboss.tools.deltacloud.core;x-friends:="org.jboss.tools.deltacloud.ui,org.jboss.tools.deltacloud.test,org.jboss.tools.deltacloud.integration",
+Export-Package:
org.apache.deltacloud.client;x-friends:="org.jboss.tools.deltacloud.integration,org.jboss.tools.deltacloud.test",
+
org.apache.deltacloud.client.utils;x-friends:="org.jboss.tools.deltacloud.test,org.jboss.tools.deltacloud.ui",
+
org.jboss.tools.deltacloud.core;x-friends:="org.jboss.tools.deltacloud.ui,org.jboss.tools.deltacloud.test,org.jboss.tools.deltacloud.integration",
org.jboss.tools.deltacloud.core.job;x-friends:="org.jboss.tools.deltacloud.ui,org.jboss.tools.deltacloud.test",
org.jboss.tools.internal.deltacloud.core.observable;x-friends:="org.jboss.tools.deltacloud.ui"
+Bundle-ClassPath: client-0.2.0-SNAPSHOT.jar,
+ .
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/build.properties
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/build.properties 2011-06-09
12:00:51 UTC (rev 31957)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/build.properties 2011-06-09
12:37:04 UTC (rev 31958)
@@ -2,5 +2,6 @@
output.. = bin/
bin.includes = ChangeLog,\
about.html,\
- .,\
- META-INF/
+ .,\
+ META-INF/,\
+ client-0.2.0-SNAPSHOT.jar
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/client-0.2.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/client-0.2.0-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
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 2011-06-09
12:00:51 UTC (rev 31957)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2011-06-09
12:37:04 UTC (rev 31958)
@@ -16,18 +16,18 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.deltacloud.client.API.Driver;
+import org.apache.deltacloud.client.DeltaCloudAuthClientException;
+import org.apache.deltacloud.client.DeltaCloudClient;
+import org.apache.deltacloud.client.DeltaCloudClientException;
+import org.apache.deltacloud.client.DeltaCloudClientImpl;
+import org.apache.deltacloud.client.DeltaCloudNotFoundClientException;
+import org.apache.deltacloud.client.HardwareProfile;
+import org.apache.deltacloud.client.Image;
+import org.apache.deltacloud.client.Instance;
+import org.apache.deltacloud.client.Key;
+import org.apache.deltacloud.client.Realm;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.jboss.tools.deltacloud.client.DeltaCloudAuthClientException;
-import org.jboss.tools.deltacloud.client.DeltaCloudClient;
-import org.jboss.tools.deltacloud.client.DeltaCloudClientException;
-import org.jboss.tools.deltacloud.client.DeltaCloudClientImpl;
-import org.jboss.tools.deltacloud.client.DeltaCloudNotFoundClientException;
-import org.jboss.tools.deltacloud.client.HardwareProfile;
-import org.jboss.tools.deltacloud.client.Image;
-import org.jboss.tools.deltacloud.client.Instance;
-import org.jboss.tools.deltacloud.client.Key;
-import org.jboss.tools.deltacloud.client.Realm;
-import org.jboss.tools.deltacloud.client.API.Driver;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance.State;
import org.jboss.tools.internal.deltacloud.core.observable.ObservablePojo;
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudDriver.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudDriver.java 2011-06-09
12:00:51 UTC (rev 31957)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudDriver.java 2011-06-09
12:37:04 UTC (rev 31958)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core;
-import org.jboss.tools.deltacloud.client.API.Driver;
+import org.apache.deltacloud.client.API.Driver;
/**
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProfile.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProfile.java 2011-06-09
12:00:51 UTC (rev 31957)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProfile.java 2011-06-09
12:37:04 UTC (rev 31958)
@@ -13,8 +13,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.jboss.tools.deltacloud.client.HardwareProfile;
-import org.jboss.tools.deltacloud.client.Property;
+import org.apache.deltacloud.client.HardwareProfile;
+import org.apache.deltacloud.client.Property;
/**
* @author Jeff Johnston
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProperty.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProperty.java 2011-06-09
12:00:51 UTC (rev 31957)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProperty.java 2011-06-09
12:37:04 UTC (rev 31958)
@@ -12,7 +12,7 @@
import java.util.List;
-import org.jboss.tools.deltacloud.client.Property;
+import org.apache.deltacloud.client.Property;
public class DeltaCloudHardwareProperty {
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java 2011-06-09
12:00:51 UTC (rev 31957)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java 2011-06-09
12:37:04 UTC (rev 31958)
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.jboss.tools.deltacloud.core;
-import org.jboss.tools.deltacloud.client.Image;
+import org.apache.deltacloud.client.Image;
/**
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImageFactory.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImageFactory.java 2011-06-09
12:00:51 UTC (rev 31957)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImageFactory.java 2011-06-09
12:37:04 UTC (rev 31958)
@@ -14,8 +14,8 @@
import java.util.Collection;
import java.util.List;
+import org.apache.deltacloud.client.Image;
import org.eclipse.core.runtime.Assert;
-import org.jboss.tools.deltacloud.client.Image;
/**
* @author André Dietisheim
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2011-06-09
12:00:51 UTC (rev 31957)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2011-06-09
12:37:04 UTC (rev 31958)
@@ -14,10 +14,10 @@
import java.util.ArrayList;
import java.util.List;
-import org.jboss.tools.deltacloud.client.Action;
-import org.jboss.tools.deltacloud.client.DeltaCloudClient;
-import org.jboss.tools.deltacloud.client.DeltaCloudClientException;
-import org.jboss.tools.deltacloud.client.Instance;
+import org.apache.deltacloud.client.Action;
+import org.apache.deltacloud.client.DeltaCloudClient;
+import org.apache.deltacloud.client.DeltaCloudClientException;
+import org.apache.deltacloud.client.Instance;
/**
* An instance that may be reached on a DeltaCloud instance. Wraps Instance from
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstanceFactory.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstanceFactory.java 2011-06-09
12:00:51 UTC (rev 31957)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstanceFactory.java 2011-06-09
12:37:04 UTC (rev 31958)
@@ -14,8 +14,8 @@
import java.util.Collection;
import java.util.List;
+import org.apache.deltacloud.client.Instance;
import org.eclipse.core.runtime.Assert;
-import org.jboss.tools.deltacloud.client.Instance;
/**
* @author André Dietisheim
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudKey.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudKey.java 2011-06-09
12:00:51 UTC (rev 31957)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudKey.java 2011-06-09
12:37:04 UTC (rev 31958)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core;
-import org.jboss.tools.deltacloud.client.Key;
+import org.apache.deltacloud.client.Key;
/**
* @author André Dietisheim
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2011-06-09
12:00:51 UTC (rev 31957)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2011-06-09
12:37:04 UTC (rev 31958)
@@ -26,10 +26,10 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.deltacloud.client.utils.StringUtils;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.ListenerList;
-import org.jboss.tools.deltacloud.client.utils.StringUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudRealm.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudRealm.java 2011-06-09
12:00:51 UTC (rev 31957)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudRealm.java 2011-06-09
12:37:04 UTC (rev 31958)
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.jboss.tools.deltacloud.core;
-import org.jboss.tools.deltacloud.client.Realm;
+import org.apache.deltacloud.client.Realm;
/**
*
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudResourceAction.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudResourceAction.java 2011-06-09
12:00:51 UTC (rev 31957)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudResourceAction.java 2011-06-09
12:37:04 UTC (rev 31958)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core;
-import org.jboss.tools.deltacloud.client.Action;
+import org.apache.deltacloud.client.Action;
/**
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF 2011-06-09
12:00:51 UTC (rev 31957)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF 2011-06-09
12:37:04 UTC (rev 31958)
@@ -10,7 +10,6 @@
org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.ui.views;bundle-version="3.6.0",
org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
- org.jboss.tools.deltacloud.client,
org.jboss.tools.deltacloud.core;bundle-version="[0.0.1,1.0.0]",
org.eclipse.rse.core;bundle-version="3.1.200",
org.eclipse.jface.databinding;bundle-version="1.5.0",
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/AbstractInstanceHandler.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/AbstractInstanceHandler.java 2011-06-09
12:00:51 UTC (rev 31957)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/AbstractInstanceHandler.java 2011-06-09
12:37:04 UTC (rev 31958)
@@ -10,12 +10,12 @@
******************************************************************************/
package org.jboss.tools.deltacloud.ui.commands;
+import org.apache.deltacloud.client.utils.StringUtils;
+import org.apache.deltacloud.client.utils.StringUtils.IElementFormatter;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.IHandler;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.jboss.tools.deltacloud.client.utils.StringUtils;
-import org.jboss.tools.deltacloud.client.utils.StringUtils.IElementFormatter;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
import org.jboss.tools.deltacloud.core.DeltaCloudResourceAction;
import org.jboss.tools.deltacloud.core.job.InstanceActionJob;
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java 2011-06-09
12:00:51 UTC (rev 31957)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java 2011-06-09
12:37:04 UTC (rev 31958)
@@ -12,10 +12,10 @@
import java.util.List;
+import org.apache.deltacloud.client.utils.StringUtils;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySource;
import org.eclipse.ui.views.properties.PropertyDescriptor;
-import org.jboss.tools.deltacloud.client.utils.StringUtils;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
import org.jboss.tools.deltacloud.ui.views.CVMessages;
import org.jboss.tools.deltacloud.ui.views.cloud.InstanceItem;
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java 2011-06-09
12:00:51 UTC (rev 31957)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java 2011-06-09
12:37:04 UTC (rev 31958)
@@ -13,8 +13,8 @@
import java.io.File;
import java.io.FileNotFoundException;
+import org.apache.deltacloud.client.utils.StringUtils;
import org.eclipse.core.runtime.Platform;
-import org.jboss.tools.deltacloud.client.utils.StringUtils;
import org.jboss.tools.deltacloud.core.DeltaCloudException;
import org.jboss.tools.deltacloud.ui.preferences.StringPreferenceValue;
import org.jboss.tools.deltacloud.ui.preferences.StringsPreferenceValue;
Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF 2011-06-09
12:00:51 UTC (rev 31957)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF 2011-06-09
12:37:04 UTC (rev 31958)
@@ -6,8 +6,7 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.jboss.tools.common;bundle-version="[3.2.0,4.0.0)",
- org.jboss.tools.deltacloud.client;bundle-version="0.1.0",
- org.jboss.tools.deltacloud.core;bundle-version="0.0.1",
- org.jboss.tools.deltacloud.ui;bundle-version="0.1.0",
+ org.jboss.tools.deltacloud.core;bundle-version="[0.2.0,1.0.0)",
+ org.jboss.tools.deltacloud.ui;bundle-version="[0.2.0,1.0.0)",
org.junit;bundle-version="[4.8.0,5.0.0)"
Bundle-ClassPath: .
Modified:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/context/MockIntegrationTestContext.java
===================================================================
---
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/context/MockIntegrationTestContext.java 2011-06-09
12:00:51 UTC (rev 31957)
+++
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/context/MockIntegrationTestContext.java 2011-06-09
12:37:04 UTC (rev 31958)
@@ -24,12 +24,12 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import org.jboss.tools.deltacloud.client.DeltaCloudClient;
-import org.jboss.tools.deltacloud.client.DeltaCloudClientException;
-import org.jboss.tools.deltacloud.client.DeltaCloudClientImpl;
-import org.jboss.tools.deltacloud.client.Image;
-import org.jboss.tools.deltacloud.client.Instance;
-import org.jboss.tools.deltacloud.client.StateAware.State;
+import org.apache.deltacloud.client.DeltaCloudClient;
+import org.apache.deltacloud.client.DeltaCloudClientException;
+import org.apache.deltacloud.client.DeltaCloudClientImpl;
+import org.apache.deltacloud.client.Image;
+import org.apache.deltacloud.client.Instance;
+import org.apache.deltacloud.client.StateAware.State;
/**
* A class that holds the integration test context
Modified:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/DeltaCloudMockIntegrationTest.java
===================================================================
---
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/DeltaCloudMockIntegrationTest.java 2011-06-09
12:00:51 UTC (rev 31957)
+++
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/DeltaCloudMockIntegrationTest.java 2011-06-09
12:37:04 UTC (rev 31958)
@@ -15,7 +15,7 @@
import java.io.IOException;
import java.net.MalformedURLException;
-import org.jboss.tools.deltacloud.client.DeltaCloudClientException;
+import org.apache.deltacloud.client.DeltaCloudClientException;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudException;
import org.jboss.tools.internal.deltacloud.test.context.MockIntegrationTestContext;
Modified:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/CloudSchedulingRulesTest.java
===================================================================
---
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/CloudSchedulingRulesTest.java 2011-06-09
12:00:51 UTC (rev 31957)
+++
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/CloudSchedulingRulesTest.java 2011-06-09
12:37:04 UTC (rev 31958)
@@ -13,7 +13,7 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import org.jboss.tools.deltacloud.client.Instance;
+import org.apache.deltacloud.client.Instance;
import org.jboss.tools.deltacloud.core.DeltaCloudException;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob;