Merge pull request #175 from scottslewis/master

Added system properties for configuring ECFSSLContextFactory
eclipse-ecf · Mar 4, 2025 · f513fb3 · f513fb3
2 parents 1135a0f + bd01575
commit f513fb3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf;singleton:=true
 Automatic-Module-Name: org.eclipse.ecf
-Bundle-Version: 3.12.1.qualifier
+Bundle-Version: 3.13.0.qualifier
 Bundle-Activator: org.eclipse.ecf.internal.core.ECFPlugin
 Bundle-Vendor: %plugin.provider
 Bundle-Localization: plugin

diff --git a/framework/bundles/org.eclipse.ecf/pom.xml b/framework/bundles/org.eclipse.ecf/pom.xml
@@ -10,6 +10,6 @@
   </parent>
 
   <artifactId>org.eclipse.ecf</artifactId>
-  <version>3.12.1-SNAPSHOT</version>
+  <version>3.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java
@@ -228,7 +228,10 @@ public void ungetService(Bundle bundle, ServiceRegistration registration, Object
 		containerManagerServiceRegistration = ctxt.registerService(IContainerManager.class.getName(), sf, null);
 
 		// Register SSLContextFactory
-		ecfSSLContextFactory = new ECFSSLContextFactory(ctxt);
+		String defaultProtocol = System.getProperty("org.eclipse.ecf.core.security.sslcontextfactory.defaultProtocol"); //$NON-NLS-1$
+		String defaultProvider = System.getProperty("org.eclipse.ecf.core.security.sslcontextfactory.defaultProvider"); //$NON-NLS-1$
+
+		ecfSSLContextFactory = new ECFSSLContextFactory(ctxt, defaultProtocol, defaultProvider);
 		sslContextFactoryRegistration = ctxt.registerService(SSLContextFactory.class, ecfSSLContextFactory, null);
 
 		SafeRunner.run(new ExtensionRegistryRunnable(this.context) {