Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Hammer2019-06-14 10:36:08 -0400
committerScott Lewis2019-10-12 12:56:43 -0400
commitf98e978557da61e452474066ac2a008698205733 (patch)
treea10020c13565175cdee79f90cded03ae0beab65c
parent987e1fddb48302a8d8f7bfdc8c5ccb540ac5ad63 (diff)
downloadorg.eclipse.ecf-f98e978557da61e452474066ac2a008698205733.tar.gz
org.eclipse.ecf-f98e978557da61e452474066ac2a008698205733.tar.xz
org.eclipse.ecf-f98e978557da61e452474066ac2a008698205733.zip
Use jdk 5 for-each loop
Replace simple uses of Iterator with a corresponding for-each loop. Also add missing braces on loops as necessary. Bug: 547630 Change-Id: Icc7d2cd06c46657a195c2aa73b91dfa3a1be9c53 Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/Activator.java8
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/PlatformHelper.java7
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java59
-rw-r--r--framework/bundles/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.ssl/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFTrustManager.java6
-rw-r--r--framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/SSLContextHelper.java8
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/META-INF/MANIFEST.MF2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/pom.xml2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/src/org/eclipse/ecf/internal/provider/filetransfer/httpclient45/HttpClientDefaultSSLSocketFactoryModifier.java8
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/src/org/eclipse/ecf/provider/filetransfer/httpclient45/HttpClientRetrieveFileTransfer.java16
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer/pom.xml2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/internal/provider/filetransfer/Activator.java125
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/identity/FileTransferNamespace.java5
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java14
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java14
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/util/ProxySetupHelper.java14
-rw-r--r--releng/features/org.eclipse.ecf.core.feature/feature.xml2
-rw-r--r--releng/features/org.eclipse.ecf.core.feature/pom.xml2
-rw-r--r--releng/features/org.eclipse.ecf.core.ssl.feature/feature.xml2
-rw-r--r--releng/features/org.eclipse.ecf.core.ssl.feature/pom.xml2
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.feature/feature.xml2
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.feature/pom.xml2
28 files changed, 164 insertions, 152 deletions
diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF
index 0ccca9159..8f361c8c2 100644
--- a/framework/bundles/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.filetransfer;singleton:=true
Automatic-Module-Name: org.eclipse.ecf.filetransfer
-Bundle-Version: 5.0.100.qualifier
+Bundle-Version: 5.0.200.qualifier
Bundle-Activator: org.eclipse.ecf.internal.filetransfer.Activator
Bundle-Vendor: %plugin.provider
Eclipse-LazyStart: true
diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/pom.xml b/framework/bundles/org.eclipse.ecf.filetransfer/pom.xml
index d92237fae..05aa9ee1e 100644
--- a/framework/bundles/org.eclipse.ecf.filetransfer/pom.xml
+++ b/framework/bundles/org.eclipse.ecf.filetransfer/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.filetransfer</artifactId>
- <version>5.0.100-SNAPSHOT</version>
+ <version>5.0.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/Activator.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/Activator.java
index 928c8fb82..8154d1961 100644
--- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/Activator.java
+++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/Activator.java
@@ -91,13 +91,13 @@ public class Activator implements BundleActivator {
}
IConfigurationElement[] configurationElements = extensionPoint.getConfigurationElements();
- for (int i = 0; i < configurationElements.length; i++) {
+ for (IConfigurationElement configurationElement : configurationElements) {
AbstractURLStreamHandlerService svc = null;
String protocol = null;
try {
- svc = (AbstractURLStreamHandlerService) configurationElements[i].createExecutableExtension(SERVICE_CLASS_ATTRIBUTE);
- protocol = configurationElements[i].getAttribute(PROTOCOL_ATTRIBUTE);
- } catch (CoreException e) {
+ svc = (AbstractURLStreamHandlerService) configurationElement.createExecutableExtension(SERVICE_CLASS_ATTRIBUTE);
+ protocol = configurationElement.getAttribute(PROTOCOL_ATTRIBUTE);
+ }catch (CoreException e) {
log(e.getStatus());
}
if (svc != null && protocol != null) {
diff --git a/framework/bundles/org.eclipse.ecf.identity/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.identity/META-INF/MANIFEST.MF
index 261068879..c537c1dfb 100644
--- a/framework/bundles/org.eclipse.ecf.identity/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.identity/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.identity;singleton:=true
Automatic-Module-Name: org.eclipse.ecf.identity
-Bundle-Version: 3.9.1.qualifier
+Bundle-Version: 3.9.200.qualifier
Bundle-Activator: org.eclipse.ecf.internal.core.identity.Activator
Bundle-Localization: plugin
Bundle-Vendor: %plugin.provider
diff --git a/framework/bundles/org.eclipse.ecf.identity/pom.xml b/framework/bundles/org.eclipse.ecf.identity/pom.xml
index 4deca35e3..1691c9529 100644
--- a/framework/bundles/org.eclipse.ecf.identity/pom.xml
+++ b/framework/bundles/org.eclipse.ecf.identity/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.identity</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/PlatformHelper.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/PlatformHelper.java
index 1e0e4dcee..450bcc4fb 100644
--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/PlatformHelper.java
+++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/PlatformHelper.java
@@ -41,12 +41,13 @@ public class PlatformHelper {
if (c != null) {
Bundle[] bundles = c.getBundles();
Bundle coreRuntime = null;
- for (int i = 0; i < bundles.length; i++)
- if (bundles[i].getSymbolicName().equals("org.eclipse.core.runtime")) { //$NON-NLS-1$
- coreRuntime = bundles[i];
+ for (Bundle bundle : bundles) {
+ if (bundle.getSymbolicName().equals("org.eclipse.core.runtime")) { //$NON-NLS-1$
+ coreRuntime = bundle;
platformClass = coreRuntime.loadClass("org.eclipse.core.runtime.Platform"); //$NON-NLS-1$
break;
}
+ }
}
} catch (Exception e) {
// Platform not available...just leave platformClass == null and
diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java
index 486d55872..12d5c0b31 100644
--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java
+++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java
@@ -132,37 +132,35 @@ public class Activator implements BundleActivator {
registryManager = new IRegistryChangeListener() {
public void registryChanged(IRegistryChangeEvent event) {
final IExtensionDelta delta[] = event.getExtensionDeltas(PLUGIN_ID, NAMESPACE_NAME);
- for (int i = 0; i < delta.length; i++) {
- switch (delta[i].getKind()) {
- case IExtensionDelta.ADDED:
- addNamespaceExtensions(delta[i].getExtension().getConfigurationElements());
- break;
- case IExtensionDelta.REMOVED:
- IConfigurationElement[] members = delta[i].getExtension()
- .getConfigurationElements();
- for (int m = 0; m < members.length; m++) {
- final IConfigurationElement member = members[m];
- String name = null;
- try {
- name = member.getAttribute(NAME_ATTRIBUTE);
- if (name == null) {
- name = member.getAttribute(CLASS_ATTRIBUTE);
+ for (IExtensionDelta d : delta) {
+ switch (d.getKind()) {
+ case IExtensionDelta.ADDED:
+ addNamespaceExtensions(d.getExtension().getConfigurationElements());
+ break;
+ case IExtensionDelta.REMOVED:
+ IConfigurationElement[] members = d.getExtension().getConfigurationElements();
+ for (IConfigurationElement member : members) {
+ String name = null;
+ try {
+ name = member.getAttribute(NAME_ATTRIBUTE);
+ if (name == null) {
+ name = member.getAttribute(CLASS_ATTRIBUTE);
+ }
+ if (name == null)
+ continue;
+ final IIDFactory factory = IDFactory.getDefault();
+ final Namespace n = factory.getNamespaceByName(name);
+ if (n == null || !factory.containsNamespace(n)) {
+ continue;
+ }
+ // remove
+ factory.removeNamespace(n);
+ } catch (final Exception e) {
+ getDefault().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
+ IStatus.ERROR, "Exception removing namespace", e)); //$NON-NLS-1$
}
- if (name == null)
- continue;
- final IIDFactory factory = IDFactory.getDefault();
- final Namespace n = factory.getNamespaceByName(name);
- if (n == null || !factory.containsNamespace(n)) {
- continue;
- }
- // remove
- factory.removeNamespace(n);
- } catch (final Exception e) {
- getDefault().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- IStatus.ERROR, "Exception removing namespace", e)); //$NON-NLS-1$
}
- }
- break;
+ break;
}
}
}
@@ -216,8 +214,7 @@ public class Activator implements BundleActivator {
*/
void addNamespaceExtensions(IConfigurationElement[] members) {
final String bundleName = getDefault().getBundle().getSymbolicName();
- for (int m = 0; m < members.length; m++) {
- final IConfigurationElement member = members[m];
+ for (IConfigurationElement member : members) {
// Get the label of the extender plugin and the ID of the
// extension.
final IExtension extension = member.getDeclaringExtension();
diff --git a/framework/bundles/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF
index 71edeb5bf..aab611824 100644
--- a/framework/bundles/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.ssl
Automatic-Module-Name: org.eclipse.ecf.ssl
-Bundle-Version: 1.2.200.qualifier
+Bundle-Version: 1.2.300.qualifier
Fragment-Host: org.eclipse.ecf
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: javax.net,
diff --git a/framework/bundles/org.eclipse.ecf.ssl/pom.xml b/framework/bundles/org.eclipse.ecf.ssl/pom.xml
index 2d3553907..28313acaa 100644
--- a/framework/bundles/org.eclipse.ecf.ssl/pom.xml
+++ b/framework/bundles/org.eclipse.ecf.ssl/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.ssl</artifactId>
- <version>1.2.200-SNAPSHOT</version>
+ <version>1.2.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFTrustManager.java b/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFTrustManager.java
index 953137c45..f1cb2a3df 100644
--- a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFTrustManager.java
+++ b/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFTrustManager.java
@@ -31,12 +31,12 @@ public class ECFTrustManager implements X509TrustManager, BundleActivator {
final TrustEngine[] engines = getTrustEngines();
Certificate foundCert = null;
- for (int i = 0; i < engines.length; i++) {
+ for (TrustEngine engine : engines) {
try {
- foundCert = engines[i].findTrustAnchor(certs);
+ foundCert = engine.findTrustAnchor(certs);
if (null != foundCert)
return; // cert chain is trust
- } catch (final IOException e) {
+ }catch (final IOException e) {
final CertificateException ce = new ECFCertificateException(
"Error occurs when finding trust anchor in the cert chain", certs, authType); //$NON-NLS-1$
ce.initCause(ce);
diff --git a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/SSLContextHelper.java b/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/SSLContextHelper.java
index 54ac5b434..7f0231951 100644
--- a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/SSLContextHelper.java
+++ b/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/SSLContextHelper.java
@@ -27,9 +27,11 @@ public class SSLContextHelper {
// Now put into defaultProtocolsList in order of jreProtocols
List<String> splitProtocolsList = Arrays.asList(httpsProtocols);
List<String> defaultProtocolsList = new ArrayList();
- for (int i = 0; i < jreProtocols.length; i++)
- if (splitProtocolsList.contains(jreProtocols[i]))
- defaultProtocolsList.add(jreProtocols[i]);
+ for (String jreProtocol : jreProtocols) {
+ if (splitProtocolsList.contains(jreProtocol)) {
+ defaultProtocolsList.add(jreProtocol);
+ }
+ }
// In order of jre protocols, attempt to create and init SSLContext
for (String protocol : defaultProtocolsList) {
try {
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/META-INF/MANIFEST.MF
index 46d7fb893..8137dbd2c 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/META-INF/MANIFEST.MF
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %plugin.name
Bundle-Vendor: %plugin.provider
Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer.httpclient45;singleton:=true
Automatic-Module-Name: org.eclipse.ecf.provider.filetransfer.httpclient45
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
Bundle-Localization: plugin
Bundle-Activator: org.eclipse.ecf.internal.provider.filetransfer.httpclient45.Activator
Bundle-ClassPath: .
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/pom.xml
index 59f3852f0..c00cdbc93 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/pom.xml
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/pom.xml
@@ -10,7 +10,7 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.provider.filetransfer.httpclient45</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/src/org/eclipse/ecf/internal/provider/filetransfer/httpclient45/HttpClientDefaultSSLSocketFactoryModifier.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/src/org/eclipse/ecf/internal/provider/filetransfer/httpclient45/HttpClientDefaultSSLSocketFactoryModifier.java
index 8d3fa7b34..52ff28321 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/src/org/eclipse/ecf/internal/provider/filetransfer/httpclient45/HttpClientDefaultSSLSocketFactoryModifier.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/src/org/eclipse/ecf/internal/provider/filetransfer/httpclient45/HttpClientDefaultSSLSocketFactoryModifier.java
@@ -58,9 +58,11 @@ public class HttpClientDefaultSSLSocketFactoryModifier {
// Now put into defaultProtocolsList in order of jreProtocols
List<String> splitProtocolsList = Arrays.asList(httpsProtocols);
List<String> defaultProtocolsList = new ArrayList();
- for (int i = 0; i < jreProtocols.length; i++)
- if (splitProtocolsList.contains(jreProtocols[i]))
- defaultProtocolsList.add(jreProtocols[i]);
+ for (String jreProtocol : jreProtocols) {
+ if (splitProtocolsList.contains(jreProtocol)) {
+ defaultProtocolsList.add(jreProtocol);
+ }
+ }
// In order of jre protocols, attempt to create and init SSLContext
for (String protocol : defaultProtocolsList) {
try {
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/src/org/eclipse/ecf/provider/filetransfer/httpclient45/HttpClientRetrieveFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/src/org/eclipse/ecf/provider/filetransfer/httpclient45/HttpClientRetrieveFileTransfer.java
index 4fb577732..082a08352 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/src/org/eclipse/ecf/provider/filetransfer/httpclient45/HttpClientRetrieveFileTransfer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/src/org/eclipse/ecf/provider/filetransfer/httpclient45/HttpClientRetrieveFileTransfer.java
@@ -20,7 +20,6 @@ import java.io.InputStream;
import java.net.HttpURLConnection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.http.Header;
import org.apache.http.HttpHeaders;
@@ -330,8 +329,7 @@ public class HttpClientRetrieveFileTransfer extends AbstractRetrieveFileTransfer
Object o = localOptions.get(IRetrieveFileTransferOptions.REQUEST_HEADERS);
if (o != null && o instanceof Map) {
Map<?, ?> requestHeaders = (Map<?, ?>) o;
- for (Iterator<?> i = requestHeaders.keySet().iterator(); i.hasNext();) {
- Object n = i.next();
+ for (Object n : requestHeaders.keySet()) {
Object v = requestHeaders.get(n);
if (n != null && n instanceof String && v != null && v instanceof String) {
getMethod.addHeader((String) n, (String) v);
@@ -636,9 +634,9 @@ public class HttpClientRetrieveFileTransfer extends AbstractRetrieveFileTransfer
Map<String, String> result = null;
if (headers != null && headers.length > 0) {
result = new HashMap<String, String>();
- for (int i = 0; i < headers.length; i++) {
- String name = headers[i].getName();
- String val = headers[i].getValue();
+ for (Header header : headers) {
+ String name = header.getName();
+ String val = header.getValue();
if (name != null && val != null)
result.put(name, val);
}
@@ -738,9 +736,11 @@ public class HttpClientRetrieveFileTransfer extends AbstractRetrieveFileTransfer
* @see org.eclipse.ecf.internal.provider.filetransfer.AbstractRetrieveFileTransfer#supportsProtocol(java.lang.String)
*/
public static boolean supportsProtocol(String protocolString) {
- for (int i = 0; i < supportedProtocols.length; i++)
- if (supportedProtocols[i].equalsIgnoreCase(protocolString))
+ for (String supportedProtocol : supportedProtocols) {
+ if (supportedProtocol.equalsIgnoreCase(protocolString)) {
return true;
+ }
+ }
return false;
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF
index 494429277..48c89636d 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer;singleton:=true
Automatic-Module-Name: org.eclipse.ecf.provider.filetransfer
-Bundle-Version: 3.2.400.qualifier
+Bundle-Version: 3.2.500.qualifier
Bundle-Activator: org.eclipse.ecf.internal.provider.filetransfer.Activator
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer/pom.xml
index 554bf4136..2b9498535 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/pom.xml
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.provider.filetransfer</artifactId>
- <version>3.2.400-SNAPSHOT</version>
+ <version>3.2.500-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/internal/provider/filetransfer/Activator.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/internal/provider/filetransfer/Activator.java
index 9a2038170..131fbe473 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/internal/provider/filetransfer/Activator.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/internal/provider/filetransfer/Activator.java
@@ -125,35 +125,35 @@ public class Activator implements BundleActivator, IFileTransferProtocolToFactor
public void registryChanged(IRegistryChangeEvent event) {
final IExtensionDelta retrieveDelta[] = event.getExtensionDeltas(PLUGIN_ID, RETRIEVE_FILETRANSFER_PROTOCOL_FACTORY_EPOINT_NAME);
- for (int i = 0; i < retrieveDelta.length; i++) {
- switch (retrieveDelta[i].getKind()) {
- case IExtensionDelta.ADDED :
- addRetrieveExtensions(retrieveDelta[i].getExtension().getConfigurationElements());
+ for (IExtensionDelta r : retrieveDelta) {
+ switch (r.getKind()) {
+ case IExtensionDelta.ADDED:
+ addRetrieveExtensions(r.getExtension().getConfigurationElements());
break;
- case IExtensionDelta.REMOVED :
- removeRetrieveExtensions(retrieveDelta[i].getExtension().getConfigurationElements());
+ case IExtensionDelta.REMOVED:
+ removeRetrieveExtensions(r.getExtension().getConfigurationElements());
break;
}
}
final IExtensionDelta sendDelta[] = event.getExtensionDeltas(PLUGIN_ID, SEND_FILETRANSFER_PROTOCOL_FACTORY_EPOINT_NAME);
- for (int i = 0; i < sendDelta.length; i++) {
- switch (sendDelta[i].getKind()) {
- case IExtensionDelta.ADDED :
- addSendExtensions(sendDelta[i].getExtension().getConfigurationElements());
+ for (IExtensionDelta s : sendDelta) {
+ switch (s.getKind()) {
+ case IExtensionDelta.ADDED:
+ addSendExtensions(s.getExtension().getConfigurationElements());
break;
- case IExtensionDelta.REMOVED :
- removeSendExtensions(sendDelta[i].getExtension().getConfigurationElements());
+ case IExtensionDelta.REMOVED:
+ removeSendExtensions(s.getExtension().getConfigurationElements());
break;
}
}
final IExtensionDelta browseDelta[] = event.getExtensionDeltas(PLUGIN_ID, BROWSE_FILETRANSFER_PROTOCOL_FACTORY_EPOINT_NAME);
- for (int i = 0; i < browseDelta.length; i++) {
- switch (browseDelta[i].getKind()) {
- case IExtensionDelta.ADDED :
- addBrowseExtensions(browseDelta[i].getExtension().getConfigurationElements());
+ for (IExtensionDelta b : browseDelta) {
+ switch (b.getKind()) {
+ case IExtensionDelta.ADDED:
+ addBrowseExtensions(b.getExtension().getConfigurationElements());
break;
- case IExtensionDelta.REMOVED :
- removeBrowseExtensions(browseDelta[i].getExtension().getConfigurationElements());
+ case IExtensionDelta.REMOVED:
+ removeBrowseExtensions(b.getExtension().getConfigurationElements());
break;
}
}
@@ -352,19 +352,21 @@ public class Activator implements BundleActivator, IFileTransferProtocolToFactor
final ServiceReference[] refs = handlers.getServiceReferences();
final Set protocols = new HashSet();
if (refs != null)
- for (int i = 0; i < refs.length; i++) {
- final Object protocol = refs[i].getProperty(URL_HANDLER_PROTOCOL_NAME);
- if (protocol instanceof String)
- protocols.add(protocol);
- else if (protocol instanceof String[]) {
- final String[] ps = (String[]) protocol;
- for (int j = 0; j < ps.length; j++)
- protocols.add(ps[j]);
+ for (ServiceReference ref : refs) {
+ final Object protocol = ref.getProperty(URL_HANDLER_PROTOCOL_NAME);
+ if (protocol instanceof String) {
+ protocols.add(protocol);
+ } else if (protocol instanceof String[]) {
+ final String[] ps = (String[]) protocol;
+ for (String p : ps) {
+ protocols.add(p);
}
}
+ }
handlers.close();
- for (int i = 0; i < jvmSchemes.length; i++)
- protocols.add(jvmSchemes[i]);
+ for (String jvmScheme : jvmSchemes) {
+ protocols.add(jvmScheme);
+ }
return (String[]) protocols.toArray(new String[] {});
}
@@ -438,36 +440,36 @@ public class Activator implements BundleActivator, IFileTransferProtocolToFactor
}
void addRetrieveExtensions(IConfigurationElement[] configElements) {
- for (int i = 0; i < configElements.length; i++) {
- final String protocol = configElements[i].getAttribute(PROTOCOL_ATTR);
+ for (IConfigurationElement configElement : configElements) {
+ final String protocol = configElement.getAttribute(PROTOCOL_ATTR);
if (protocol == null || "".equals(protocol)) //$NON-NLS-1$
return;
- String uriStr = configElements[i].getAttribute(URI_ATTR);
+ String uriStr = configElement.getAttribute(URI_ATTR);
boolean uri = (uriStr == null) ? false : Boolean.valueOf(uriStr).booleanValue();
String CONTRIBUTION_WARNING = "File retrieve contribution"; //$NON-NLS-1$
try {
- String pluginId = configElements[i].getDeclaringExtension().getContributor().getName();
+ String pluginId = configElement.getDeclaringExtension().getContributor().getName();
// Only add the factories if the contributor plugin has not been excluded
if (!pluginExcluded(pluginId)) {
- // First create factory clazz
- final IRetrieveFileTransferFactory retrieveFactory = (IRetrieveFileTransferFactory) configElements[i].createExecutableExtension(CLASS_ATTR);
+ // First create factory clazz
+ final IRetrieveFileTransferFactory retrieveFactory = (IRetrieveFileTransferFactory) configElement.createExecutableExtension(CLASS_ATTR);
// Get priority for new entry, if optional priority attribute specified
- int priority = getPriority(configElements[i], CONTRIBUTION_WARNING, protocol);
- String contributorName = configElements[i].getDeclaringExtension().getContributor().getName();
+ int priority = getPriority(configElement, CONTRIBUTION_WARNING, protocol);
+ String contributorName = configElement.getDeclaringExtension().getContributor().getName();
// Now add new ProtocolFactory
setRetrieveFileTransferFactory(protocol, contributorName, retrieveFactory, priority, uri);
} else {
Activator.getDefault().log(new Status(IStatus.WARNING, PLUGIN_ID, IStatus.WARNING, "Plugin " + pluginId + " excluded from contributing retrieve factory", null)); //$NON-NLS-1$ //$NON-NLS-2$
}
- } catch (final CoreException e) {
+ }catch (final CoreException e) {
Activator.getDefault().log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, NLS.bind("Error loading from {0} extension point", RETRIEVE_FILETRANSFER_PROTOCOL_FACTORY_EPOINT), e)); //$NON-NLS-1$
}
}
}
void removeRetrieveExtensions(IConfigurationElement[] configElements) {
- for (int i = 0; i < configElements.length; i++) {
- final String protocol = configElements[i].getAttribute(PROTOCOL_ATTR);
+ for (IConfigurationElement configElement : configElements) {
+ final String protocol = configElement.getAttribute(PROTOCOL_ATTR);
if (protocol == null || "".equals(protocol)) //$NON-NLS-1$
return;
String id = getRetrieveFileTransferFactoryId(protocol);
@@ -477,34 +479,34 @@ public class Activator implements BundleActivator, IFileTransferProtocolToFactor
}
void addSendExtensions(IConfigurationElement[] configElements) {
- for (int i = 0; i < configElements.length; i++) {
- final String protocol = configElements[i].getAttribute(PROTOCOL_ATTR);
+ for (IConfigurationElement configElement : configElements) {
+ final String protocol = configElement.getAttribute(PROTOCOL_ATTR);
if (protocol == null || "".equals(protocol)) //$NON-NLS-1$
return;
- String uriStr = configElements[i].getAttribute(URI_ATTR);
+ String uriStr = configElement.getAttribute(URI_ATTR);
boolean uri = (uriStr == null) ? false : Boolean.valueOf(uriStr).booleanValue();
String CONTRIBUTION_WARNING = "File send contribution"; //$NON-NLS-1$
try {
- String pluginId = configElements[i].getDeclaringExtension().getContributor().getName();
+ String pluginId = configElement.getDeclaringExtension().getContributor().getName();
// Only add the factories if the contributor plugin has not been excluded
if (!pluginExcluded(pluginId)) {
- // First create factory clazz
- final ISendFileTransferFactory clazz = (ISendFileTransferFactory) configElements[i].createExecutableExtension(CLASS_ATTR);
+ // First create factory clazz
+ final ISendFileTransferFactory clazz = (ISendFileTransferFactory) configElement.createExecutableExtension(CLASS_ATTR);
// Get priority for new entry, if optional priority attribute specified
- int priority = getPriority(configElements[i], CONTRIBUTION_WARNING, protocol);
+ int priority = getPriority(configElement, CONTRIBUTION_WARNING, protocol);
setSendFileTransferFactory(protocol, pluginId, clazz, priority, uri);
} else {
Activator.getDefault().log(new Status(IStatus.WARNING, PLUGIN_ID, IStatus.WARNING, "Plugin " + pluginId + " excluded from contributing send factory", null)); //$NON-NLS-1$ //$NON-NLS-2$
}
- } catch (final CoreException e) {
+ }catch (final CoreException e) {
Activator.getDefault().log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, NLS.bind("Error loading from {0} extension point", SEND_FILETRANSFER_PROTOCOL_FACTORY_EPOINT), e)); //$NON-NLS-1$
}
}
}
void removeSendExtensions(IConfigurationElement[] configElements) {
- for (int i = 0; i < configElements.length; i++) {
- final String protocol = configElements[i].getAttribute(PROTOCOL_ATTR);
+ for (IConfigurationElement configElement : configElements) {
+ final String protocol = configElement.getAttribute(PROTOCOL_ATTR);
if (protocol == null || "".equals(protocol)) //$NON-NLS-1$
return;
String id = getSendFileTransferFactoryId(protocol);
@@ -514,34 +516,34 @@ public class Activator implements BundleActivator, IFileTransferProtocolToFactor
}
void addBrowseExtensions(IConfigurationElement[] configElements) {
- for (int i = 0; i < configElements.length; i++) {
- final String protocol = configElements[i].getAttribute(PROTOCOL_ATTR);
+ for (IConfigurationElement configElement : configElements) {
+ final String protocol = configElement.getAttribute(PROTOCOL_ATTR);
if (protocol == null || "".equals(protocol)) //$NON-NLS-1$
return;
- String uriStr = configElements[i].getAttribute(URI_ATTR);
+ String uriStr = configElement.getAttribute(URI_ATTR);
boolean uri = (uriStr == null) ? false : Boolean.valueOf(uriStr).booleanValue();
String CONTRIBUTION_WARNING = "File browse contribution"; //$NON-NLS-1$
try {
- String pluginId = configElements[i].getDeclaringExtension().getContributor().getName();
+ String pluginId = configElement.getDeclaringExtension().getContributor().getName();
// Only add the factories if the contributor plugin has not been excluded
if (!pluginExcluded(pluginId)) {
- // First create factory clazz
- final IRemoteFileSystemBrowserFactory clazz = (IRemoteFileSystemBrowserFactory) configElements[i].createExecutableExtension(CLASS_ATTR);
+ // First create factory clazz
+ final IRemoteFileSystemBrowserFactory clazz = (IRemoteFileSystemBrowserFactory) configElement.createExecutableExtension(CLASS_ATTR);
// Get priority for new entry, if optional priority attribute specified
- int priority = getPriority(configElements[i], CONTRIBUTION_WARNING, protocol);
+ int priority = getPriority(configElement, CONTRIBUTION_WARNING, protocol);
setBrowseFileTransferFactory(protocol, pluginId, clazz, priority, uri);
} else {
Activator.getDefault().log(new Status(IStatus.WARNING, PLUGIN_ID, IStatus.WARNING, "Plugin " + pluginId + " excluded from contributing browse factory", null)); //$NON-NLS-1$ //$NON-NLS-2$
}
- } catch (final CoreException e) {
+ }catch (final CoreException e) {
Activator.getDefault().log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, NLS.bind("Error loading from {0} extension point", BROWSE_FILETRANSFER_PROTOCOL_FACTORY_EPOINT), e)); //$NON-NLS-1$
}
}
}
void removeBrowseExtensions(IConfigurationElement[] configElements) {
- for (int i = 0; i < configElements.length; i++) {
- final String protocol = configElements[i].getAttribute(PROTOCOL_ATTR);
+ for (IConfigurationElement configElement : configElements) {
+ final String protocol = configElement.getAttribute(PROTOCOL_ATTR);
if (protocol == null || "".equals(protocol)) //$NON-NLS-1$
return;
String id = getBrowseFileTransferFactoryId(protocol);
@@ -568,9 +570,10 @@ public class Activator implements BundleActivator, IFileTransferProtocolToFactor
}
private boolean isSchemeRegistered(String protocol, String[] schemes) {
- for (int i = 0; i < schemes.length; i++) {
- if (protocol.equals(schemes[i]))
+ for (String scheme : schemes) {
+ if (protocol.equals(scheme)) {
return true;
+ }
}
return false;
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/identity/FileTransferNamespace.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/identity/FileTransferNamespace.java
index e8c6e0745..1a9429c33 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/identity/FileTransferNamespace.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/identity/FileTransferNamespace.java
@@ -73,8 +73,9 @@ public class FileTransferNamespace extends Namespace {
public String[] getSupportedSchemes() {
Set result = new HashSet();
String[] platformSchemes = Activator.getDefault().getPlatformSupportedSchemes();
- for (int i = 0; i < platformSchemes.length; i++)
- result.add(platformSchemes[i]);
+ for (String platformScheme : platformSchemes) {
+ result.add(platformScheme);
+ }
return (String[]) result.toArray(new String[] {});
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java
index afd9f5270..6afbab462 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java
@@ -385,14 +385,16 @@ public abstract class AbstractOutgoingFileTransfer implements IOutgoingFileTrans
// If more than one proxy is available, then if http/https protocol then look for that
// one...if not found then use first
if (protocol.equalsIgnoreCase("http")) { //$NON-NLS-1$
- for (int i = 0; i < proxies.length; i++) {
- if (proxies[i].getType().equals(IProxyData.HTTP_PROXY_TYPE))
- return proxies[i];
+ for (IProxyData proxie : proxies) {
+ if (proxie.getType().equals(IProxyData.HTTP_PROXY_TYPE)) {
+ return proxie;
+ }
}
} else if (protocol.equalsIgnoreCase("https")) { //$NON-NLS-1$
- for (int i = 0; i < proxies.length; i++) {
- if (proxies[i].getType().equals(IProxyData.HTTPS_PROXY_TYPE))
- return proxies[i];
+ for (IProxyData proxie : proxies) {
+ if (proxie.getType().equals(IProxyData.HTTPS_PROXY_TYPE)) {
+ return proxie;
+ }
}
}
// If we haven't found it yet, then return the first one.
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java
index 8cd2f070e..971ccda7f 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java
@@ -930,14 +930,16 @@ public abstract class AbstractRetrieveFileTransfer implements IIncomingFileTrans
// look for that
// one...if not found then use first
if (protocol.equalsIgnoreCase("http")) { //$NON-NLS-1$
- for (int i = 0; i < proxies.length; i++) {
- if (proxies[i].getType().equals(IProxyData.HTTP_PROXY_TYPE))
- return proxies[i];
+ for (IProxyData proxie : proxies) {
+ if (proxie.getType().equals(IProxyData.HTTP_PROXY_TYPE)) {
+ return proxie;
+ }
}
} else if (protocol.equalsIgnoreCase("https")) { //$NON-NLS-1$
- for (int i = 0; i < proxies.length; i++) {
- if (proxies[i].getType().equals(IProxyData.HTTPS_PROXY_TYPE))
- return proxies[i];
+ for (IProxyData proxie : proxies) {
+ if (proxie.getType().equals(IProxyData.HTTPS_PROXY_TYPE)) {
+ return proxie;
+ }
}
}
// If we haven't found it yet, then return the first one.
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/util/ProxySetupHelper.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/util/ProxySetupHelper.java
index 2fd51786d..725455e88 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/util/ProxySetupHelper.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/util/ProxySetupHelper.java
@@ -84,14 +84,16 @@ public class ProxySetupHelper {
// If more than one proxy is available, then if http/https protocol then look for that
// one...if not found then use first
if (protocol.equalsIgnoreCase("http")) { //$NON-NLS-1$
- for (int i = 0; i < proxies.length; i++) {
- if (proxies[i].getType().equals(IProxyData.HTTP_PROXY_TYPE))
- return proxies[i];
+ for (IProxyData proxie : proxies) {
+ if (proxie.getType().equals(IProxyData.HTTP_PROXY_TYPE)) {
+ return proxie;
+ }
}
} else if (protocol.equalsIgnoreCase("https")) { //$NON-NLS-1$
- for (int i = 0; i < proxies.length; i++) {
- if (proxies[i].getType().equals(IProxyData.HTTPS_PROXY_TYPE))
- return proxies[i];
+ for (IProxyData proxie : proxies) {
+ if (proxie.getType().equals(IProxyData.HTTPS_PROXY_TYPE)) {
+ return proxie;
+ }
}
}
// If we haven't found it yet, then return the first one.
diff --git a/releng/features/org.eclipse.ecf.core.feature/feature.xml b/releng/features/org.eclipse.ecf.core.feature/feature.xml
index c9241b4d5..ea09d8fb4 100644
--- a/releng/features/org.eclipse.ecf.core.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.core.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.core.feature"
label="ECF Core Feature"
- version="1.5.3.qualifier"
+ version="1.5.400.qualifier"
provider-name="Eclipse.org - ECF"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.core.feature/pom.xml b/releng/features/org.eclipse.ecf.core.feature/pom.xml
index 6fd0b7f03..661bbecda 100644
--- a/releng/features/org.eclipse.ecf.core.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.core.feature/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.core.feature</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.400-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/releng/features/org.eclipse.ecf.core.ssl.feature/feature.xml b/releng/features/org.eclipse.ecf.core.ssl.feature/feature.xml
index 9ca7bd75d..ddc4fcd9c 100644
--- a/releng/features/org.eclipse.ecf.core.ssl.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.core.ssl.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.core.ssl.feature"
label="ECF Core SSL Feature"
- version="1.1.200.qualifier"
+ version="1.1.300.qualifier"
provider-name="Eclipse.org - ECF"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.core.ssl.feature/pom.xml b/releng/features/org.eclipse.ecf.core.ssl.feature/pom.xml
index 85579bf4d..b89861d8d 100644
--- a/releng/features/org.eclipse.ecf.core.ssl.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.core.ssl.feature/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.core.ssl.feature</artifactId>
- <version>1.1.200-SNAPSHOT</version>
+ <version>1.1.300-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/releng/features/org.eclipse.ecf.filetransfer.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.feature/feature.xml
index 0502c783f..932a6eb41 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.filetransfer.feature"
label="ECF Filetransfer Feature"
- version="3.14.5.qualifier"
+ version="3.14.600.qualifier"
provider-name="Eclipse.org"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.filetransfer.feature/pom.xml b/releng/features/org.eclipse.ecf.filetransfer.feature/pom.xml
index 31434308a..4f21ce3ef 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.feature/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.filetransfer.feature</artifactId>
- <version>3.14.5-SNAPSHOT</version>
+ <version>3.14.600-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>

Back to the top