Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2019-10-25 06:04:46 +0000
committerslewis2019-10-25 06:04:46 +0000
commit26c5f5d915d02796dab00d399f6cdf6c8c9062b1 (patch)
tree929072702518339374b129b7c5d6efc0407de19c
parent0c9b357f80d2effbd6aa2ad9979365f04b3c5d33 (diff)
downloadorg.eclipse.ecf-26c5f5d915d02796dab00d399f6cdf6c8c9062b1.tar.gz
org.eclipse.ecf-26c5f5d915d02796dab00d399f6cdf6c8c9062b1.tar.xz
org.eclipse.ecf-26c5f5d915d02796dab00d399f6cdf6c8c9062b1.zip
Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=552397
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.browser/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.browser/plugin.xml46
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.browser/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.userinput/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.userinput/plugin.xml20
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.userinput/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.xml53
7 files changed, 4 insertions, 123 deletions
diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/META-INF/MANIFEST.MF
index 6a9f37fbd..32060eb18 100644
--- a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ecf.discovery.ui.browser;singleton:=true
Automatic-Module-Name: org.eclipse.ecf.discovery.ui.browser
-Bundle-Version: 1.0.101.qualifier
+Bundle-Version: 1.0.102.qualifier
Bundle-Activator: org.eclipse.ecf.discovery.ui.browser.Activator
Bundle-Vendor: %pluginProvider
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/plugin.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/plugin.xml
index d5d2bf8cd..5c4e64bd6 100644
--- a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/plugin.xml
+++ b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/plugin.xml
@@ -2,52 +2,6 @@
<?eclipse version="3.0"?>
<plugin>
<extension
- point="org.eclipse.ui.menus">
- <menuContribution
- locationURI="popup:org.eclipse.ecf.discovery.ui.DiscoveryView?after=additions">
- <command
- commandId="org.eclipse.ecf.discovery.ui.browser.command.open"
- mnemonic="S"
- style="push">
- <visibleWhen
- checkEnabled="false">
- <with
- variable="activeMenuSelection">
- <iterate
- ifEmpty="false">
- <test
- args="http"
- property="org.eclipse.ecf.discovery.isServiceType"
- value="true">
- </test></iterate>
- </with>
- </visibleWhen>
- </command>
- </menuContribution>
- <menuContribution
- locationURI="popup:org.eclipse.ecf.discovery.ui.DiscoveryView?after=additions">
- <command
- commandId="org.eclipse.ecf.discovery.ui.browser.command.open"
- mnemonic="S"
- style="push">
- <visibleWhen
- checkEnabled="false">
- <with
- variable="activeMenuSelection">
- <iterate
- ifEmpty="false">
- <test
- args="https"
- property="org.eclipse.ecf.discovery.isServiceType"
- value="true">
- </test>
- </iterate>
- </with>
- </visibleWhen>
- </command>
- </menuContribution>
- </extension>
- <extension
point="org.eclipse.ui.commands">
<command
defaultHandler="org.eclipse.ecf.discovery.ui.browser.OpenBrowserCommand"
diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/pom.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/pom.xml
index 871200d49..72d1e0713 100644
--- a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/pom.xml
+++ b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.discovery.ui.browser</artifactId>
- <version>1.0.101-SNAPSHOT</version>
+ <version>1.0.102-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/META-INF/MANIFEST.MF
index 04f169b4c..4a72d0034 100644
--- a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.discovery.ui.userinput;singleton:=true
Automatic-Module-Name: org.eclipse.ecf.discovery.ui.userinput
-Bundle-Version: 1.0.101.qualifier
+Bundle-Version: 1.0.102.qualifier
Bundle-Activator: org.eclipse.ecf.discovery.ui.userinput.Activator
Bundle-Vendor: %plugin.provider
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/plugin.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/plugin.xml
index 72657b5a5..095abfc54 100644
--- a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/plugin.xml
+++ b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/plugin.xml
@@ -29,26 +29,6 @@
sequence="M1+L">
</key>
</extension>
- <extension
- point="org.eclipse.ui.menus">
- <menuContribution
- locationURI="menu:org.eclipse.ecf.discovery.ui.DiscoveryView?after=additions">
- <command
- commandId="org.eclipse.ecf.discovery.ui.userinput.commands.manualLookupCommand"
- id="org.eclipse.ecf.discovery.ui.userinput.menus.manualLookupCommand"
- mnemonic="S">
- </command>
- </menuContribution>
- <menuContribution
- locationURI="toolbar:org.eclipse.ecf.discovery.ui.DiscoveryView?after=additions">
- <command
- commandId="org.eclipse.ecf.discovery.ui.userinput.commands.manualLookupCommand"
- icon="icons/manual.png"
- id="org.eclipse.ecf.discovery.ui.userinput.toolbars.manualLookupCommand"
- tooltip="%lookup.tooltip">
- </command>
- </menuContribution>
- </extension>
<extension
point="org.eclipse.ecf.containerFactory">
<containerFactory
diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/pom.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/pom.xml
index 08e8027fd..72064cb6f 100644
--- a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/pom.xml
+++ b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.discovery.ui.userinput</artifactId>
- <version>1.0.101-SNAPSHOT</version>
+ <version>1.0.102-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.xml b/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.xml
index e17f18ee0..629b8976d 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.xml
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.xml
@@ -25,59 +25,6 @@
name="Disconnect Command">
</command>
</extension>
- <extension
- point="org.eclipse.ui.menus">
- <menuContribution
- locationURI="popup:org.eclipse.ecf.discovery.ui.DiscoveryView?after=additions">
- <command
- commandId="org.eclipse.ecf.remoteservices.ui.commands.connectCommand"
- id="org.eclipse.ecf.remoteservices.ui.menus.connectCommand"
- mnemonic="S">
- <visibleWhen>
- <with
- variable="activeMenuSelection">
- <iterate
- ifEmpty="false"
- operator="and">
- <test
- property="org.eclipse.ecf.remoteservices.isConnected"
- value="false">
- </test>
- <test
- args="remotesvcs"
- property="org.eclipse.ecf.discovery.isServiceType"
- value="true">
- </test>
- </iterate>
- </with>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.ecf.remoteservices.ui.commands.disconnectCommand"
- id="org.eclipse.ecf.remoteservices.ui.menus.disconnectCommand"
- mnemonic="S"
- style="push">
- <visibleWhen
- checkEnabled="false">
- <with
- variable="activeMenuSelection">
- <iterate
- ifEmpty="false"
- operator="and">
- <test
- property="org.eclipse.ecf.remoteservices.isConnected"
- value="true">
- </test>
- <test
- args="remotesvcs"
- property="org.eclipse.ecf.discovery.isServiceType"
- value="true">
- </test></iterate>
- </with>
- </visibleWhen>
- </command>
- </menuContribution>
- </extension>
<extension
point="org.eclipse.core.expressions.propertyTesters">

Back to the top