Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2014-10-14 15:02:25 -0400
committerslewis2014-10-14 15:02:25 -0400
commit8b2457670d69d6241d325dea2ebaef98d4f7362a (patch)
treea118eb5669dad808b1cc2f52a5564a840753a580
parenta09618669f96da5d62ba6cbfdcc11efacb8b8c95 (diff)
downloadorg.eclipse.ecf-change/34754/1.tar.gz
org.eclipse.ecf-change/34754/1.tar.xz
org.eclipse.ecf-change/34754/1.zip
Update/fix by to scp contribution by J Langley as per bugchange/34754/1
https://bugs.eclipse.org/bugs/show_bug.cgi?id=445729 See comments on gerrit https://git.eclipse.org/r/#/c/34754/ This commit implements changes suggested by slewis in comments in gerrit review. Change-Id: Ic59d7a349b74124038d654d3bc3084537cfe95d8
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer.scp/META-INF/MANIFEST.MF5
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer.scp/plugin.xml2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer.scp/src/org/eclipse/ecf/internal/provider/filetransfer/scp/ScpBrowseFileTransferFactory.java (renamed from providers/bundles/org.eclipse.ecf.provider.filetransfer.scp/src/org/eclipse/ecf/provider/filetransfer/scp/ScpBrowseFileTransferFactory.java)3
3 files changed, 4 insertions, 6 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.scp/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer.scp/META-INF/MANIFEST.MF
index 02aa27435..96c59dbb0 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.scp/META-INF/MANIFEST.MF
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.scp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer.scp;singleton:=true
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 2.1.0.qualifier
Bundle-Activator: org.eclipse.ecf.internal.provider.filetransfer.scp.Activator
Bundle-Vendor: %plugin.provider
Import-Package: com.jcraft.jsch,
@@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.equinox.common,
org.eclipse.ecf,
org.eclipse.ecf.provider.filetransfer,
org.eclipse.ecf.filetransfer
-Export-Package: org.eclipse.ecf.internal.provider.filetransfer.scp;x-internal:=true,
- org.eclipse.ecf.provider.filetransfer.scp
+Export-Package: org.eclipse.ecf.internal.provider.filetransfer.scp;x-internal:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Bundle-ActivationPolicy: lazy
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.scp/plugin.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.scp/plugin.xml
index 3bd1cd727..3ce5bd334 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.scp/plugin.xml
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.scp/plugin.xml
@@ -18,7 +18,7 @@
<extension
point="org.eclipse.ecf.provider.filetransfer.browseFileTransferProtocolFactory">
<browseFileTransferProtocolFactory
- class="org.eclipse.ecf.provider.filetransfer.scp.ScpBrowseFileTransferFactory"
+ class="org.eclipse.ecf.internal.provider.filetransfer.scp.ScpBrowseFileTransferFactory"
priority="45"
protocol="scp">
</browseFileTransferProtocolFactory>
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.scp/src/org/eclipse/ecf/provider/filetransfer/scp/ScpBrowseFileTransferFactory.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer.scp/src/org/eclipse/ecf/internal/provider/filetransfer/scp/ScpBrowseFileTransferFactory.java
index 0dd6cf0f0..7cabdb651 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.scp/src/org/eclipse/ecf/provider/filetransfer/scp/ScpBrowseFileTransferFactory.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.scp/src/org/eclipse/ecf/internal/provider/filetransfer/scp/ScpBrowseFileTransferFactory.java
@@ -9,7 +9,7 @@
* CohesionForce Inc - initial API and implementation
*******************************************************************************/
-package org.eclipse.ecf.provider.filetransfer.scp;
+package org.eclipse.ecf.internal.provider.filetransfer.scp;
import java.net.MalformedURLException;
import java.net.URL;
@@ -22,7 +22,6 @@ import org.eclipse.ecf.filetransfer.*;
import org.eclipse.ecf.filetransfer.identity.IFileID;
import org.eclipse.ecf.filetransfer.service.IRemoteFileSystemBrowser;
import org.eclipse.ecf.filetransfer.service.IRemoteFileSystemBrowserFactory;
-import org.eclipse.ecf.internal.provider.filetransfer.scp.ScpFileSystemBrowser;
import org.eclipse.ecf.provider.filetransfer.identity.FileTransferNamespace;
import org.eclipse.osgi.util.NLS;

Back to the top