[186525][api] Move keystoreProviders extension point to org.eclipse.rse.core
|
@ -11,16 +11,16 @@
|
||||||
<p>The following extension points can be used to extend the capabilities of the
|
<p>The following extension points can be used to extend the capabilities of the
|
||||||
RSE infrastructure: </p>
|
RSE infrastructure: </p>
|
||||||
<ul>
|
<ul>
|
||||||
|
<li><a href="org_eclipse_rse_core_keystoreProviders.html">org.eclipse.rse.core.keystoreProviders</a></li>
|
||||||
|
<li><a href="org_eclipse_rse_core_persistenceProviders.html">org.eclipse.rse.core.persistenceProviders</a></li>
|
||||||
<li><a href="org_eclipse_rse_core_systemTypes.html">org.eclipse.rse.core.systemTypes</a></li>
|
<li><a href="org_eclipse_rse_core_systemTypes.html">org.eclipse.rse.core.systemTypes</a></li>
|
||||||
<li><a href="org_eclipse_rse_core_systemTypeProviders.html">org.eclipse.rse.core.systemTypeProviders</a></li>
|
<li><a href="org_eclipse_rse_core_systemTypeProviders.html">org.eclipse.rse.core.systemTypeProviders</a></li>
|
||||||
<li><a href="org_eclipse_rse_services_archivehandlers.html">org.eclipse.rse.services.archivehandlers</a></li>
|
<li><a href="org_eclipse_rse_services_archivehandlers.html">org.eclipse.rse.services.archivehandlers</a></li>
|
||||||
<!-- TODODeferred after RSE 1.0
|
<!-- TODODeferred after RSE 1.0
|
||||||
<li><a href="org_eclipse_rse_ui_compile.html">org.eclipse.rse.ui.compile</a></li>
|
<li><a href="org_eclipse_rse_ui_compile.html">org.eclipse.rse.ui.compile</a></li>
|
||||||
-->
|
-->
|
||||||
<li><a href="org_eclipse_rse_ui_keystoreProviders.html">org.eclipse.rse.ui.keystoreProviders</a></li>
|
|
||||||
<li><a href="org_eclipse_rse_ui_mountPathMappers.html">org.eclipse.rse.ui.mountPathMappers</a></li>
|
<li><a href="org_eclipse_rse_ui_mountPathMappers.html">org.eclipse.rse.ui.mountPathMappers</a></li>
|
||||||
<li><a href="org_eclipse_rse_ui_newConnectionWizards.html">org.eclipse.rse.ui.newConnectionWizards</a></li>
|
<li><a href="org_eclipse_rse_ui_newConnectionWizards.html">org.eclipse.rse.ui.newConnectionWizards</a></li>
|
||||||
<li><a href="org_eclipse_rse_ui_persistenceProviders.html">org.eclipse.rse.ui.persistenceProviders</a></li>
|
|
||||||
<li><a href="org_eclipse_rse_ui_remoteSystemsViewPreferencesActions.html">org.eclipse.rse.ui.remoteSystemsViewPreferencesActions</a></li>
|
<li><a href="org_eclipse_rse_ui_remoteSystemsViewPreferencesActions.html">org.eclipse.rse.ui.remoteSystemsViewPreferencesActions</a></li>
|
||||||
<li><a href="org_eclipse_rse_ui_subsystemConfigurations.html">org.eclipse.rse.ui.subsystemConfigurations</a></li>
|
<li><a href="org_eclipse_rse_ui_subsystemConfigurations.html">org.eclipse.rse.ui.subsystemConfigurations</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
@ -6,16 +6,16 @@
|
||||||
<toc label="Reference">
|
<toc label="Reference">
|
||||||
|
|
||||||
<topic label="Extension Points Reference" href="provisional_api.html">
|
<topic label="Extension Points Reference" href="provisional_api.html">
|
||||||
|
<topic label="org.eclipse.rse.core.keystoreProviders" href="reference/extension-points/org_eclipse_rse_core_keystoreProviders.html" />
|
||||||
|
<topic label="org.eclipse.rse.core.persistenceProviders" href="reference/extension-points/org_eclipse_rse_core_persistenceProviders.html" />
|
||||||
<topic label="org.eclipse.rse.core.systemTypes" href="reference/extension-points/org_eclipse_rse_core_systemTypes.html" />
|
<topic label="org.eclipse.rse.core.systemTypes" href="reference/extension-points/org_eclipse_rse_core_systemTypes.html" />
|
||||||
<topic label="org.eclipse.rse.core.systemTypeProviders" href="reference/extension-points/org_eclipse_rse_core_systemTypeProviders.html" />
|
<topic label="org.eclipse.rse.core.systemTypeProviders" href="reference/extension-points/org_eclipse_rse_core_systemTypeProviders.html" />
|
||||||
<topic label="org.eclipse.rse.services.archivehandlers" href="reference/extension-points/org_eclipse_rse_services_archivehandlers.html" />
|
<topic label="org.eclipse.rse.services.archivehandlers" href="reference/extension-points/org_eclipse_rse_services_archivehandlers.html" />
|
||||||
<!-- TODODeferred after RSE 1.0
|
<!-- TODODeferred after RSE 1.0
|
||||||
<topic label="org.eclipse.rse.ui.compile" href="reference/extension-points/org_eclipse_rse_ui_compile.html" />
|
<topic label="org.eclipse.rse.ui.compile" href="reference/extension-points/org_eclipse_rse_ui_compile.html" />
|
||||||
-->
|
-->
|
||||||
<topic label="org.eclipse.rse.ui.keystoreProviders" href="reference/extension-points/org_eclipse_rse_ui_keystoreProviders.html" />
|
|
||||||
<topic label="org.eclipse.rse.ui.mountPathMappers" href="reference/extension-points/org_eclipse_rse_ui_mountPathMappers.html" />
|
<topic label="org.eclipse.rse.ui.mountPathMappers" href="reference/extension-points/org_eclipse_rse_ui_mountPathMappers.html" />
|
||||||
<topic label="org.eclipse.rse.ui.newConnectionWizards" href="reference/extension-points/org_eclipse_rse_ui_newConnectionWizards.html" />
|
<topic label="org.eclipse.rse.ui.newConnectionWizards" href="reference/extension-points/org_eclipse_rse_ui_newConnectionWizards.html" />
|
||||||
<topic label="org.eclipse.rse.ui.persistenceProviders" href="reference/extension-points/org_eclipse_rse_ui_persistenceProviders.html" />
|
|
||||||
<topic label="org.eclipse.rse.ui.remoteSystemsViewPreferencesActions" href="reference/extension-points/org_eclipse_rse_ui_remoteSystemsViewPreferencesActions.html" />
|
<topic label="org.eclipse.rse.ui.remoteSystemsViewPreferencesActions" href="reference/extension-points/org_eclipse_rse_ui_remoteSystemsViewPreferencesActions.html" />
|
||||||
<topic label="org.eclipse.rse.ui.subsystemConfigurations" href="reference/extension-points/org_eclipse_rse_ui_subsystemConfigurations.html" />
|
<topic label="org.eclipse.rse.ui.subsystemConfigurations" href="reference/extension-points/org_eclipse_rse_ui_subsystemConfigurations.html" />
|
||||||
<anchor id="rse-extension-points-ref" />
|
<anchor id="rse-extension-points-ref" />
|
||||||
|
|
|
@ -10,6 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
|
||||||
org.eclipse.rse.services
|
org.eclipse.rse.services
|
||||||
Eclipse-LazyStart: true
|
Eclipse-LazyStart: true
|
||||||
Export-Package: org.eclipse.rse.core,
|
Export-Package: org.eclipse.rse.core,
|
||||||
|
org.eclipse.rse.core.comm,
|
||||||
org.eclipse.rse.core.events,
|
org.eclipse.rse.core.events,
|
||||||
org.eclipse.rse.core.filters,
|
org.eclipse.rse.core.filters,
|
||||||
org.eclipse.rse.core.model,
|
org.eclipse.rse.core.model,
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# Copyright (c) 2001, 2006 IBM Corporation and others.
|
# Copyright (c) 2001, 2007 IBM Corporation and others.
|
||||||
# All rights reserved. This program and the accompanying materials
|
# All rights reserved. This program and the accompanying materials
|
||||||
# are made available under the terms of the Eclipse Public License v1.0
|
# are made available under the terms of the Eclipse Public License v1.0
|
||||||
# which accompanies this distribution, and is available at
|
# which accompanies this distribution, and is available at
|
||||||
|
@ -7,6 +7,7 @@
|
||||||
#
|
#
|
||||||
# Contributors:
|
# Contributors:
|
||||||
# IBM Corporation - initial API and implementation
|
# IBM Corporation - initial API and implementation
|
||||||
|
# Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core
|
||||||
###############################################################################
|
###############################################################################
|
||||||
bin.includes = META-INF/,\
|
bin.includes = META-INF/,\
|
||||||
plugin.xml,\
|
plugin.xml,\
|
||||||
|
@ -16,7 +17,8 @@ bin.includes = META-INF/,\
|
||||||
.,\
|
.,\
|
||||||
about.ini,\
|
about.ini,\
|
||||||
about.mappings,\
|
about.mappings,\
|
||||||
eclipse32.png
|
eclipse32.png,\
|
||||||
|
icons/
|
||||||
source.. = src/
|
source.. = src/
|
||||||
output.. = bin/
|
output.. = bin/
|
||||||
|
|
||||||
|
|
Before Width: | Height: | Size: 569 B After Width: | Height: | Size: 569 B |
Before Width: | Height: | Size: 591 B After Width: | Height: | Size: 591 B |
Before Width: | Height: | Size: 580 B After Width: | Height: | Size: 580 B |
Before Width: | Height: | Size: 592 B After Width: | Height: | Size: 592 B |
Before Width: | Height: | Size: 98 B After Width: | Height: | Size: 98 B |
Before Width: | Height: | Size: 145 B After Width: | Height: | Size: 145 B |
Before Width: | Height: | Size: 997 B After Width: | Height: | Size: 997 B |
Before Width: | Height: | Size: 1,007 B After Width: | Height: | Size: 1,007 B |
|
@ -7,6 +7,7 @@
|
||||||
#
|
#
|
||||||
# Contributors:
|
# Contributors:
|
||||||
# IBM Corporation - initial API and implementation
|
# IBM Corporation - initial API and implementation
|
||||||
|
# Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
# NLS_MESSAGEFORMAT_NONE
|
# NLS_MESSAGEFORMAT_NONE
|
||||||
|
@ -15,6 +16,23 @@
|
||||||
pluginName = Remote System Explorer Core
|
pluginName = Remote System Explorer Core
|
||||||
providerName = Eclipse.org
|
providerName = Eclipse.org
|
||||||
|
|
||||||
extPoint.systemTypes=RSE System Types
|
extPoint.keystoreProviders = Keystore Providers
|
||||||
extPoint.persistenceProviders=RSE Persistence Providers
|
extPoint.persistenceProviders=RSE Persistence Providers
|
||||||
|
extPoint.systemTypes=RSE System Types
|
||||||
extPoint.systemTypeProviders=RSE System Type Providers
|
extPoint.systemTypeProviders=RSE System Type Providers
|
||||||
|
|
||||||
|
systemType.windows.label=Windows
|
||||||
|
systemType.unix.label=Unix
|
||||||
|
systemType.linux.label=Linux
|
||||||
|
systemType.local.label=Local
|
||||||
|
|
||||||
|
#systemType.iseries.description = iSeries native operating system (OS/400 or i5/OS)
|
||||||
|
#systemType.iseries.PASE.description = PASE on iSeries
|
||||||
|
#systemType.zseries.description = zSeries native operating system (z/OS)
|
||||||
|
systemType.windows.description = Any version of Microsoft Windows
|
||||||
|
systemType.unix.description = Any distribution of Unix
|
||||||
|
#systemType.aix.description = IBM AIX operating system
|
||||||
|
systemType.linux.description = Any distribution of Linux
|
||||||
|
#systemType.powerlinux.description = Linux running on PowerPC hardware
|
||||||
|
#systemType.zlinux.description = Linux running on zSeries hardware
|
||||||
|
systemType.local.description = Local file system on this computer
|
||||||
|
|
|
@ -1,21 +1,16 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<?eclipse version="3.0"?>
|
<?eclipse version="3.0"?>
|
||||||
<plugin>
|
<plugin>
|
||||||
<extension-point id="systemTypes" name="%extPoint.systemTypes" schema="schema/systemTypes.exsd"/>
|
<!-- ================================================================= -->
|
||||||
|
<!-- Define keystoreProviders extension point -->
|
||||||
|
<!-- ================================================================= -->
|
||||||
|
<extension-point id="keystoreProviders" name="%extPoint.keystoreProviders" schema="schema/keystoreProviders.exsd"/>
|
||||||
|
|
||||||
<!-- ================================================================= -->
|
<!-- ================================================================= -->
|
||||||
<!-- Define Persistence Provider extension point -->
|
<!-- Define Persistence Provider extension point -->
|
||||||
<!-- ================================================================= -->
|
<!-- ================================================================= -->
|
||||||
<extension-point id="persistenceProviders" name="%extPoint.persistenceProviders" schema="schema/persistenceProviders.exsd"/>
|
<extension-point id="persistenceProviders" name="%extPoint.persistenceProviders" schema="schema/persistenceProviders.exsd"/>
|
||||||
<extension-point id="systemTypeProviders"
|
<!-- Pre-defined Persistence Providers -->
|
||||||
name="%extPoint.systemTypeProviders"
|
|
||||||
schema="schema/systemTypeProviders.exsd"/>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ========================================================================= -->
|
|
||||||
<!-- Persistence Providers -->
|
|
||||||
<!-- ========================================================================= -->
|
|
||||||
<extension
|
<extension
|
||||||
point="org.eclipse.rse.core.persistenceProviders">
|
point="org.eclipse.rse.core.persistenceProviders">
|
||||||
<persistenceProvider
|
<persistenceProvider
|
||||||
|
@ -29,11 +24,60 @@
|
||||||
id="org.eclipse.rse.persistence.PropertyFileProvider"
|
id="org.eclipse.rse.persistence.PropertyFileProvider"
|
||||||
name="Property File Persistence Provider"/>
|
name="Property File Persistence Provider"/>
|
||||||
</extension>
|
</extension>
|
||||||
|
|
||||||
|
<!-- ================================================================= -->
|
||||||
|
<!-- Define systemTypes extension point -->
|
||||||
|
<!-- ================================================================= -->
|
||||||
|
<extension-point id="systemTypes" name="%extPoint.systemTypes" schema="schema/systemTypes.exsd"/>
|
||||||
|
<extension-point id="systemTypeProviders"
|
||||||
|
name="%extPoint.systemTypeProviders"
|
||||||
|
schema="schema/systemTypeProviders.exsd"/>
|
||||||
|
<!-- Pre-defined system types -->
|
||||||
|
<extension
|
||||||
|
point="org.eclipse.rse.core.systemTypes">
|
||||||
|
<systemType
|
||||||
|
description="%systemType.windows.description"
|
||||||
|
icon="icons/full/obj16/systemwin_obj.gif"
|
||||||
|
iconLive="icons/full/obj16/systemwinlive_obj.gif"
|
||||||
|
id="org.eclipse.rse.systemtype.windows"
|
||||||
|
label="%systemType.windows.label"
|
||||||
|
name="Windows"/>
|
||||||
|
<systemType
|
||||||
|
description="%systemType.linux.description"
|
||||||
|
icon="icons/full/obj16/systemlinux_obj.gif"
|
||||||
|
iconLive="icons/full/obj16/systemlinuxlive_obj.gif"
|
||||||
|
id="org.eclipse.rse.systemtype.linux"
|
||||||
|
label="%systemType.linux.label"
|
||||||
|
name="Linux"/>
|
||||||
|
<!--
|
||||||
|
<systemType id="org.eclipse.rse.systemtype.linux.power"
|
||||||
|
name="Power Linux"
|
||||||
|
description="%systemType.powerlinux.description"
|
||||||
|
icon="icons/full/obj16/systemlinux_obj.gif"
|
||||||
|
iconLive="icons/full/obj16/systemlinuxlive_obj.gif"/>
|
||||||
|
-->
|
||||||
|
<systemType
|
||||||
|
description="%systemType.unix.description"
|
||||||
|
icon="icons/full/obj16/systemunix_obj.gif"
|
||||||
|
iconLive="icons/full/obj16/systemunixlive_obj.gif"
|
||||||
|
id="org.eclipse.rse.systemtype.unix"
|
||||||
|
label="%systemType.unix.label"
|
||||||
|
name="Unix"/>
|
||||||
|
<systemType
|
||||||
|
description="%systemType.local.description"
|
||||||
|
icon="icons/full/obj16/systemlocal_obj.gif"
|
||||||
|
iconLive="icons/full/obj16/systemlocallive_obj.gif"
|
||||||
|
id="org.eclipse.rse.systemtype.local"
|
||||||
|
label="%systemType.local.label"
|
||||||
|
name="Local"/>
|
||||||
|
</extension>
|
||||||
|
|
||||||
|
<!-- ================================================================= -->
|
||||||
|
<!-- PreferencesInitializers -->
|
||||||
|
<!-- ================================================================= -->
|
||||||
<extension
|
<extension
|
||||||
point="org.eclipse.core.runtime.preferences">
|
point="org.eclipse.core.runtime.preferences">
|
||||||
<initializer
|
<initializer class="org.eclipse.rse.internal.core.RSEPreferenceInitializer"/>
|
||||||
class="org.eclipse.rse.internal.core.RSEPreferenceInitializer">
|
|
||||||
</initializer>
|
|
||||||
<initializer class="org.eclipse.rse.internal.logging.LoggingPreferenceInitializer"/>
|
<initializer class="org.eclipse.rse.internal.logging.LoggingPreferenceInitializer"/>
|
||||||
</extension>
|
</extension>
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<schema targetNamespace="org.eclipse.rse.ui">
|
<schema targetNamespace="org.eclipse.rse.ui">
|
||||||
<annotation>
|
<annotation>
|
||||||
<appInfo>
|
<appInfo>
|
||||||
<meta.schema plugin="org.eclipse.rse.ui" id="keystoreProviders" name="Keystore Providers"/>
|
<meta.schema plugin="org.eclipse.rse.core" id="keystoreProviders" name="Keystore Providers"/>
|
||||||
</appInfo>
|
</appInfo>
|
||||||
<documentation>
|
<documentation>
|
||||||
This extension point is used to allow the delegation of client keystores to vendors where needed.
|
This extension point is used to allow the delegation of client keystores to vendors where needed.
|
||||||
|
@ -87,7 +87,7 @@
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<pre>
|
<pre>
|
||||||
<extension point="org.eclipse.rse.ui.keystoreProviders">
|
<extension point="org.eclipse.rse.core.keystoreProviders">
|
||||||
<keystoreProvider
|
<keystoreProvider
|
||||||
id="com.xyz.universal.security.UniversalKeystoreProvider"
|
id="com.xyz.universal.security.UniversalKeystoreProvider"
|
||||||
name="Universal Keystore Provider"
|
name="Universal Keystore Provider"
|
||||||
|
@ -123,13 +123,14 @@ in <samp>org.eclipse.rse.dstore.security.UniversalKeystoreProvider</sam
|
||||||
<meta.section type="copyright"/>
|
<meta.section type="copyright"/>
|
||||||
</appInfo>
|
</appInfo>
|
||||||
<documentation>
|
<documentation>
|
||||||
Copyright (c) 2002, 2006 IBM Corporation. All Rights Reserved.
|
Copyright (c) 2002, 2007 IBM Corporation and others. All Rights Reserved.
|
||||||
This program and the accompanying materials are made available under the terms
|
This program and the accompanying materials are made available under the terms
|
||||||
of the Eclipse Public License v1.0 which accompanies this distribution, and is
|
of the Eclipse Public License v1.0 which accompanies this distribution, and is
|
||||||
available at http://www.eclipse.org/legal/epl-v10.html
|
available at http://www.eclipse.org/legal/epl-v10.html
|
||||||
|
|
||||||
Contributors:
|
Contributors:
|
||||||
IBM Corporation - initial API and implementation
|
IBM Corporation - initial API and implementation
|
||||||
|
Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core
|
||||||
</documentation>
|
</documentation>
|
||||||
</annotation>
|
</annotation>
|
||||||
|
|
|
@ -13,19 +13,26 @@
|
||||||
* Contributors:
|
* Contributors:
|
||||||
* David Dykstal (IBM) - added utility method for finding qualifiedHostNames
|
* David Dykstal (IBM) - added utility method for finding qualifiedHostNames
|
||||||
* Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
|
* Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
|
||||||
|
* Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
package org.eclipse.rse.core;
|
package org.eclipse.rse.core;
|
||||||
|
|
||||||
import java.net.InetAddress;
|
import java.net.InetAddress;
|
||||||
import java.net.UnknownHostException;
|
import java.net.UnknownHostException;
|
||||||
|
|
||||||
|
import org.eclipse.core.runtime.IConfigurationElement;
|
||||||
|
import org.eclipse.core.runtime.IExtensionRegistry;
|
||||||
|
import org.eclipse.core.runtime.Platform;
|
||||||
import org.eclipse.core.runtime.Plugin;
|
import org.eclipse.core.runtime.Plugin;
|
||||||
|
import org.eclipse.rse.core.comm.ISystemKeystoreProvider;
|
||||||
|
import org.eclipse.rse.core.comm.SystemKeystoreProviderManager;
|
||||||
import org.eclipse.rse.core.model.ISystemRegistry;
|
import org.eclipse.rse.core.model.ISystemRegistry;
|
||||||
import org.eclipse.rse.internal.core.RSECoreRegistry;
|
import org.eclipse.rse.internal.core.RSECoreRegistry;
|
||||||
import org.eclipse.rse.internal.persistence.RSEPersistenceManager;
|
import org.eclipse.rse.internal.persistence.RSEPersistenceManager;
|
||||||
import org.eclipse.rse.logging.Logger;
|
import org.eclipse.rse.logging.Logger;
|
||||||
import org.eclipse.rse.logging.LoggerFactory;
|
import org.eclipse.rse.logging.LoggerFactory;
|
||||||
import org.eclipse.rse.persistence.IRSEPersistenceManager;
|
import org.eclipse.rse.persistence.IRSEPersistenceManager;
|
||||||
|
import org.osgi.framework.Bundle;
|
||||||
import org.osgi.framework.BundleContext;
|
import org.osgi.framework.BundleContext;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -137,6 +144,7 @@ public class RSECorePlugin extends Plugin {
|
||||||
public void start(BundleContext context) throws Exception {
|
public void start(BundleContext context) throws Exception {
|
||||||
super.start(context);
|
super.start(context);
|
||||||
logger = LoggerFactory.getLogger(this);
|
logger = LoggerFactory.getLogger(this);
|
||||||
|
registerKeystoreProviders();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -212,4 +220,40 @@ public class RSECorePlugin extends Plugin {
|
||||||
private void log(Throwable t) {
|
private void log(Throwable t) {
|
||||||
getLogger().logError("Unexpected Exception", t); //$NON-NLS-1$
|
getLogger().logError("Unexpected Exception", t); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected void registerKeystoreProviders()
|
||||||
|
{
|
||||||
|
// Get reference to the plug-in registry
|
||||||
|
IExtensionRegistry registry = Platform.getExtensionRegistry();
|
||||||
|
|
||||||
|
// Get configured extenders
|
||||||
|
IConfigurationElement[] systemTypeExtensions = registry.getConfigurationElementsFor("org.eclipse.rse.core", "keystoreProviders"); //$NON-NLS-1$ //$NON-NLS-2$
|
||||||
|
|
||||||
|
for (int i = 0; i < systemTypeExtensions.length; i++)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// get the name space of the declaring extension
|
||||||
|
String nameSpace = systemTypeExtensions[i].getDeclaringExtension().getNamespaceIdentifier();
|
||||||
|
|
||||||
|
String keystoreProviderType = systemTypeExtensions[i].getAttribute("class"); //$NON-NLS-1$
|
||||||
|
|
||||||
|
// use the name space to get the bundle
|
||||||
|
Bundle bundle = Platform.getBundle(nameSpace);
|
||||||
|
|
||||||
|
if (bundle.getState() != Bundle.UNINSTALLED)
|
||||||
|
{
|
||||||
|
Class keystoreProvider = bundle.loadClass(keystoreProviderType);
|
||||||
|
|
||||||
|
ISystemKeystoreProvider extension = (ISystemKeystoreProvider)keystoreProvider.getConstructors()[0].newInstance(null);
|
||||||
|
SystemKeystoreProviderManager.getInstance().registerKeystoreProvider(extension);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -1,5 +1,5 @@
|
||||||
/********************************************************************************
|
/********************************************************************************
|
||||||
* Copyright (c) 2006 IBM Corporation. All rights reserved.
|
* Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
|
||||||
* This program and the accompanying materials are made available under the terms
|
* This program and the accompanying materials are made available under the terms
|
||||||
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
|
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
|
||||||
* available at http://www.eclipse.org/legal/epl-v10.html
|
* available at http://www.eclipse.org/legal/epl-v10.html
|
||||||
|
@ -11,16 +11,13 @@
|
||||||
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
|
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
|
||||||
*
|
*
|
||||||
* Contributors:
|
* Contributors:
|
||||||
* {Name} (company) - description of contribution.
|
* Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.core.comm;
|
package org.eclipse.rse.core.comm;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Interface for the keystoreProviders extension point.
|
* Interface for the keystoreProviders extension point.
|
||||||
* Implementors must provide a keystore and it's password.
|
* Implementors must provide a keystore and it's password.
|
|
@ -1,5 +1,5 @@
|
||||||
/********************************************************************************
|
/********************************************************************************
|
||||||
* Copyright (c) 2006 IBM Corporation. All rights reserved.
|
* Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
|
||||||
* This program and the accompanying materials are made available under the terms
|
* This program and the accompanying materials are made available under the terms
|
||||||
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
|
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
|
||||||
* available at http://www.eclipse.org/legal/epl-v10.html
|
* available at http://www.eclipse.org/legal/epl-v10.html
|
||||||
|
@ -11,7 +11,7 @@
|
||||||
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
|
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
|
||||||
*
|
*
|
||||||
* Contributors:
|
* Contributors:
|
||||||
* {Name} (company) - description of contribution.
|
* Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.core.comm;
|
package org.eclipse.rse.core.comm;
|
|
@ -10,6 +10,7 @@ Require-Bundle: org.eclipse.ui,
|
||||||
org.eclipse.rse.services,
|
org.eclipse.rse.services,
|
||||||
org.eclipse.dstore.core,
|
org.eclipse.dstore.core,
|
||||||
org.eclipse.core.resources,
|
org.eclipse.core.resources,
|
||||||
|
org.eclipse.rse.core,
|
||||||
org.eclipse.rse.subsystems.files.dstore,
|
org.eclipse.rse.subsystems.files.dstore,
|
||||||
org.eclipse.rse.subsystems.shells.dstore,
|
org.eclipse.rse.subsystems.shells.dstore,
|
||||||
org.eclipse.rse.subsystems.processes.dstore,
|
org.eclipse.rse.subsystems.processes.dstore,
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!--
|
<!--
|
||||||
Copyright (c) 2006 IBM Corporation. All rights reserved.
|
Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
|
||||||
This program and the accompanying materials are made available under the terms
|
This program and the accompanying materials are made available under the terms
|
||||||
of the Eclipse Public License v1.0 which accompanies this distribution, and is
|
of the Eclipse Public License v1.0 which accompanies this distribution, and is
|
||||||
available at http://www.eclipse.org/legal/epl-v10.html
|
available at http://www.eclipse.org/legal/epl-v10.html
|
||||||
|
@ -12,7 +12,7 @@ Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
|
||||||
Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
|
Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
|
||||||
|
|
||||||
Contributors:
|
Contributors:
|
||||||
{Name} (company) - description of contribution.
|
Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core
|
||||||
-->
|
-->
|
||||||
<?eclipse version="3.1"?>
|
<?eclipse version="3.1"?>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
@ -27,7 +27,7 @@ Contributors:
|
||||||
</page>
|
</page>
|
||||||
</extension>
|
</extension>
|
||||||
|
|
||||||
<extension point="org.eclipse.rse.ui.keystoreProviders">
|
<extension point="org.eclipse.rse.core.keystoreProviders">
|
||||||
<keystoreProvider
|
<keystoreProvider
|
||||||
id="org.eclipse.rse.dstore.security.UniversalKeystoreProvider"
|
id="org.eclipse.rse.dstore.security.UniversalKeystoreProvider"
|
||||||
name="%KeystoreProviderName"
|
name="%KeystoreProviderName"
|
||||||
|
|
|
@ -18,7 +18,6 @@ Require-Bundle: org.eclipse.ui,
|
||||||
Import-Package: com.ibm.icu.text
|
Import-Package: com.ibm.icu.text
|
||||||
Eclipse-LazyStart: true
|
Eclipse-LazyStart: true
|
||||||
Export-Package: org.eclipse.rse.core,
|
Export-Package: org.eclipse.rse.core,
|
||||||
org.eclipse.rse.core.comm,
|
|
||||||
org.eclipse.rse.core.internal.subsystems;x-internal:=true,
|
org.eclipse.rse.core.internal.subsystems;x-internal:=true,
|
||||||
org.eclipse.rse.core.servicesubsystem,
|
org.eclipse.rse.core.servicesubsystem,
|
||||||
org.eclipse.rse.core.subsystems,
|
org.eclipse.rse.core.subsystems,
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
* Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
|
* Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
|
||||||
* Martin Oberhuber (Wind River) - [185554] Remove dynamicPopupMenuExtensions extension point
|
* Martin Oberhuber (Wind River) - [185554] Remove dynamicPopupMenuExtensions extension point
|
||||||
* Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui
|
* Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui
|
||||||
|
* Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.ui;
|
package org.eclipse.rse.ui;
|
||||||
|
@ -41,8 +42,6 @@ import org.eclipse.rse.core.RSECorePlugin;
|
||||||
import org.eclipse.rse.core.SystemBasePlugin;
|
import org.eclipse.rse.core.SystemBasePlugin;
|
||||||
import org.eclipse.rse.core.SystemResourceListener;
|
import org.eclipse.rse.core.SystemResourceListener;
|
||||||
import org.eclipse.rse.core.SystemResourceManager;
|
import org.eclipse.rse.core.SystemResourceManager;
|
||||||
import org.eclipse.rse.core.comm.ISystemKeystoreProvider;
|
|
||||||
import org.eclipse.rse.core.comm.SystemKeystoreProviderManager;
|
|
||||||
import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
|
import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
|
||||||
import org.eclipse.rse.core.events.SystemResourceChangeEvent;
|
import org.eclipse.rse.core.events.SystemResourceChangeEvent;
|
||||||
import org.eclipse.rse.core.model.ISystemProfile;
|
import org.eclipse.rse.core.model.ISystemProfile;
|
||||||
|
@ -107,8 +106,6 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
|
||||||
SystemResourceListener listener = SystemResourceListener.getListener(remoteSystemsProject);
|
SystemResourceListener listener = SystemResourceListener.getListener(remoteSystemsProject);
|
||||||
SystemResourceManager.startResourceEventListening(listener);
|
SystemResourceManager.startResourceEventListening(listener);
|
||||||
|
|
||||||
registerKeystoreProviders();
|
|
||||||
|
|
||||||
// new support to allow products to not pre-create a local connection
|
// new support to allow products to not pre-create a local connection
|
||||||
if (SystemResourceManager.isFirstTime() && SystemPreferencesManager.getShowLocalConnection()) {
|
if (SystemResourceManager.isFirstTime() && SystemPreferencesManager.getShowLocalConnection()) {
|
||||||
// create the connection only if the local system type is enabled!
|
// create the connection only if the local system type is enabled!
|
||||||
|
@ -951,39 +948,4 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
|
||||||
viewSuppliers.remove(vs);
|
viewSuppliers.remove(vs);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void registerKeystoreProviders()
|
|
||||||
{
|
|
||||||
// Get reference to the plug-in registry
|
|
||||||
IExtensionRegistry registry = Platform.getExtensionRegistry();
|
|
||||||
|
|
||||||
// Get configured extenders
|
|
||||||
IConfigurationElement[] systemTypeExtensions = registry.getConfigurationElementsFor("org.eclipse.rse.ui", "keystoreProviders"); //$NON-NLS-1$ //$NON-NLS-2$
|
|
||||||
|
|
||||||
for (int i = 0; i < systemTypeExtensions.length; i++)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// get the name space of the declaring extension
|
|
||||||
String nameSpace = systemTypeExtensions[i].getDeclaringExtension().getNamespaceIdentifier();
|
|
||||||
|
|
||||||
String keystoreProviderType = systemTypeExtensions[i].getAttribute("class"); //$NON-NLS-1$
|
|
||||||
|
|
||||||
// use the name space to get the bundle
|
|
||||||
Bundle bundle = Platform.getBundle(nameSpace);
|
|
||||||
|
|
||||||
|
|
||||||
if (bundle.getState() != Bundle.UNINSTALLED)
|
|
||||||
{
|
|
||||||
Class keystoreProvider = bundle.loadClass(keystoreProviderType);
|
|
||||||
|
|
||||||
ISystemKeystoreProvider extension = (ISystemKeystoreProvider)keystoreProvider.getConstructors()[0].newInstance(null);
|
|
||||||
SystemKeystoreProviderManager.getInstance().registerKeystoreProvider(extension);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
|
@ -13,6 +13,7 @@
|
||||||
# Contributors:
|
# Contributors:
|
||||||
# Uwe Stieber (Wind River) - [174966] IRSESystemType should have a getLabel()
|
# Uwe Stieber (Wind River) - [174966] IRSESystemType should have a getLabel()
|
||||||
# method for translatable label.
|
# method for translatable label.
|
||||||
|
# Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
# NLS_MESSAGEFORMAT_NONE
|
# NLS_MESSAGEFORMAT_NONE
|
||||||
|
@ -27,22 +28,6 @@ extPoint.remoteSystemsViewPreferencesActions = Remote Systems View Preferences A
|
||||||
#extPoint.compile = Remote Compile Commands
|
#extPoint.compile = Remote Compile Commands
|
||||||
extPoint.mountPathMappers = Mount Path Mappers
|
extPoint.mountPathMappers = Mount Path Mappers
|
||||||
|
|
||||||
systemType.windows.label=Windows
|
|
||||||
systemType.unix.label=Unix
|
|
||||||
systemType.linux.label=Linux
|
|
||||||
systemType.local.label=Local
|
|
||||||
|
|
||||||
#systemType.iseries.description = iSeries native operating system (OS/400 or i5/OS)
|
|
||||||
#systemType.iseries.PASE.description = PASE on iSeries
|
|
||||||
#systemType.zseries.description = zSeries native operating system (z/OS)
|
|
||||||
systemType.windows.description = Any version of Microsoft Windows
|
|
||||||
systemType.unix.description = Any distribution of Unix
|
|
||||||
#systemType.aix.description = IBM AIX operating system
|
|
||||||
systemType.linux.description = Any distribution of Linux
|
|
||||||
#systemType.powerlinux.description = Linux running on PowerPC hardware
|
|
||||||
#systemType.zlinux.description = Linux running on zSeries hardware
|
|
||||||
systemType.local.description = Local file system on this computer
|
|
||||||
|
|
||||||
#PropertyPage.Info = Info
|
#PropertyPage.Info = Info
|
||||||
#PropertyPage.Team = Team
|
#PropertyPage.Team = Team
|
||||||
PropertyPage.Connection = Host
|
PropertyPage.Connection = Host
|
||||||
|
|
|
@ -13,6 +13,7 @@ Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
|
||||||
|
|
||||||
Contributors:
|
Contributors:
|
||||||
Martin Oberhuber (Wind River) - [185554] Remove dynamicPopupMenuExtensions extension point
|
Martin Oberhuber (Wind River) - [185554] Remove dynamicPopupMenuExtensions extension point
|
||||||
|
Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core
|
||||||
-->
|
-->
|
||||||
<?eclipse version="3.1"?>
|
<?eclipse version="3.1"?>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
@ -171,47 +172,6 @@ Martin Oberhuber (Wind River) - [185554] Remove dynamicPopupMenuExtensions exten
|
||||||
<initializer class="org.eclipse.rse.internal.ui.propertypages.SystemPreferenceInitializer"/>
|
<initializer class="org.eclipse.rse.internal.ui.propertypages.SystemPreferenceInitializer"/>
|
||||||
</extension>
|
</extension>
|
||||||
|
|
||||||
<!-- predefine known system types -->
|
|
||||||
<extension
|
|
||||||
point="org.eclipse.rse.core.systemTypes">
|
|
||||||
<systemType
|
|
||||||
description="%systemType.windows.description"
|
|
||||||
icon="icons/full/obj16/systemwin_obj.gif"
|
|
||||||
iconLive="icons/full/obj16/systemwinlive_obj.gif"
|
|
||||||
id="org.eclipse.rse.systemtype.windows"
|
|
||||||
label="%systemType.windows.label"
|
|
||||||
name="Windows"/>
|
|
||||||
<systemType
|
|
||||||
description="%systemType.linux.description"
|
|
||||||
icon="icons/full/obj16/systemlinux_obj.gif"
|
|
||||||
iconLive="icons/full/obj16/systemlinuxlive_obj.gif"
|
|
||||||
id="org.eclipse.rse.systemtype.linux"
|
|
||||||
label="%systemType.linux.label"
|
|
||||||
name="Linux"/>
|
|
||||||
<!--
|
|
||||||
<systemType id="org.eclipse.rse.systemtype.linux.power"
|
|
||||||
name="Power Linux"
|
|
||||||
description="%systemType.powerlinux.description"
|
|
||||||
icon="icons/full/obj16/systemlinux_obj.gif"
|
|
||||||
iconLive="icons/full/obj16/systemlinuxlive_obj.gif"/>
|
|
||||||
-->
|
|
||||||
<systemType
|
|
||||||
description="%systemType.unix.description"
|
|
||||||
icon="icons/full/obj16/systemunix_obj.gif"
|
|
||||||
iconLive="icons/full/obj16/systemunixlive_obj.gif"
|
|
||||||
id="org.eclipse.rse.systemtype.unix"
|
|
||||||
label="%systemType.unix.label"
|
|
||||||
name="Unix"/>
|
|
||||||
<systemType
|
|
||||||
description="%systemType.local.description"
|
|
||||||
icon="icons/full/obj16/systemlocal_obj.gif"
|
|
||||||
iconLive="icons/full/obj16/systemlocallive_obj.gif"
|
|
||||||
id="org.eclipse.rse.systemtype.local"
|
|
||||||
label="%systemType.local.label"
|
|
||||||
name="Local"/>
|
|
||||||
</extension>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ============================================ -->
|
<!-- ============================================ -->
|
||||||
<!-- Define Workbench Properties Pages -->
|
<!-- Define Workbench Properties Pages -->
|
||||||
<!-- ============================================ -->
|
<!-- ============================================ -->
|
||||||
|
@ -435,24 +395,16 @@ Martin Oberhuber (Wind River) - [185554] Remove dynamicPopupMenuExtensions exten
|
||||||
</factory>
|
</factory>
|
||||||
</extension>
|
</extension>
|
||||||
|
|
||||||
<!-- ================================================================= -->
|
|
||||||
<!-- Define Archive Handlers extension point -->
|
|
||||||
<!-- ================================================================= -->
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ================================================================= -->
|
<!-- ================================================================= -->
|
||||||
<!-- Define Mount Path Mappers extension point -->
|
<!-- Define Mount Path Mappers extension point -->
|
||||||
<!-- ================================================================= -->
|
<!-- ================================================================= -->
|
||||||
<extension-point id="mountPathMappers" name="%extPoint.mountPathMappers" schema="schema/mountPathMappers.exsd"/>
|
<extension-point id="mountPathMappers" name="%extPoint.mountPathMappers" schema="schema/mountPathMappers.exsd"/>
|
||||||
|
|
||||||
<!-- ================================================================= -->
|
<!-- ================================================================= -->
|
||||||
<!-- Define Keystore Provider extension point -->
|
<!-- Define newConnectionWizards extension point -->
|
||||||
<!-- ================================================================= -->
|
<!-- ================================================================= -->
|
||||||
<extension-point id="keystoreProviders" name="%extPoint.keystoreProviders" schema="schema/keystoreProviders.exsd"/>
|
|
||||||
|
|
||||||
<extension-point id="newConnectionWizards" name="%extPoint.newConnectionWizard" schema="schema/newConnectionWizards.exsd"/>
|
<extension-point id="newConnectionWizards" name="%extPoint.newConnectionWizard" schema="schema/newConnectionWizards.exsd"/>
|
||||||
|
|
||||||
|
|
||||||
<!-- ================================================================= -->
|
<!-- ================================================================= -->
|
||||||
<!-- Define the Drop Actions -->
|
<!-- Define the Drop Actions -->
|
||||||
<!-- ================================================================= -->
|
<!-- ================================================================= -->
|
||||||
|
|