Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Release 2.6.0
Merge from branch '2.5.x'
  • Loading branch information
goglepox committed Jan 29, 2013
2 parents 27afe0b + 1f943ec commit dff12b1
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 37 deletions.
2 changes: 1 addition & 1 deletion externals/net.sf.xws4j/META-INF/MANIFEST.MF
Expand Up @@ -4,7 +4,7 @@ Created-By: 19.1-b02-334 (Apple Inc.)
Bundle-ManifestVersion: 2
Bundle-Name: xws4j Eclipse Plug-in
Bundle-SymbolicName: net.sf.xws4j;singleton:=true
Bundle-Version: 2.0.0.2
Bundle-Version: 2.6.0.vqualifier
Bundle-Activator: net.sf.xws4j.Activator
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.eclipse.ui
.console,org.eclipse.core.resources,org.eclipse.ui.ide
Expand Down
31 changes: 2 additions & 29 deletions features/net.bioclipse.xws4j_feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="net.bioclipse.xws4j_feature"
label="XMPP Web Services"
version="2.5.0.qualifier"
version="2.6.0.vqualifier"
provider-name="The Bioclipse Project"
plugin="net.bioclipse.xws4j">

Expand Down Expand Up @@ -34,6 +34,7 @@ is available at http://www.eclipse.org/legal/epl-v10.html

<requires>
<import feature="net.bioclipse.core_feature" version="2.2.0.v20100127" match="greaterOrEqual"/>
<import plugin="slf4j.api"/>
</requires>

<plugin
Expand All @@ -43,38 +44,10 @@ is available at http://www.eclipse.org/legal/epl-v10.html
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.ui.console"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.core.variables"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="net.sf.xws4j"
download-size="0"
install-size="0"
version="0.0.0"/>

<plugin
id="slf4j.api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="net.bioclipse.scripting"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
2 changes: 1 addition & 1 deletion plugins/net.bioclipse.xws4j/META-INF/MANIFEST.MF
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Xws4j
Bundle-SymbolicName: net.bioclipse.xws4j;singleton:=true
Bundle-Version: 2.5.0.qualifier
Bundle-Version: 2.6.0.vqualifier
Bundle-Activator: net.bioclipse.xws4j.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
4 changes: 2 additions & 2 deletions plugins/net.bioclipse.xws4j/cheatsheets/tutorial.xml
Expand Up @@ -114,12 +114,12 @@ Try the following commands in the Javascript Console, they print the functions o
<description>
There are several gists (scripts) available that demonstrates calling XMPP services, see:<br/><br/>

<b>http://delicious.com/tag/bioclipse+xmpp+gist</b><br/><br/>
<b>http://www.diigo.com/user/Chemblaics/bioclipse&#37;20gist&#37;20xmpp/b><br/><br/>
</description>

<command
required="false"
serialization="org.eclipse.ui.browser.openBrowser(url=http://delicious.com/tag/bioclipse+xmpp+gist)"/>
serialization="org.eclipse.ui.browser.openBrowser(url=http://www.diigo.com/user/Chemblaics/bioclipse gist xmpp)"/>

</item>

Expand Down
8 changes: 4 additions & 4 deletions plugins/net.bioclipse.xws4j/cheatsheets/xmppgists.xml
Expand Up @@ -4,7 +4,7 @@
<intro>
<description>
This tutorial shows a number of scripts for XMPP + IO Data.
When &quot;Click to perform&quot; is clicked, Bioclipse downloads the script from http://gist.github.com and opens it in the Javascript Editor.<br/><br/>
When &quot;Click to perform&quot; is clicked, Bioclipse downloads the script from http://gist.github.com and opens it in the JavaScript Editor.<br/><br/>
The toolbar of this editor has a run button that should be used to execute the script.<br/><br/>
</description>
</intro>
Expand Down Expand Up @@ -56,7 +56,7 @@
skip="true"
title="Gist 106665: Do asynchronous discovery on an XMPP item">
<description>
Do asynchronous discovery on an XMPP item. Must be run from the Javascript Editor.
Do asynchronous discovery on an XMPP item. Must be run from the JavaScript Editor.

</description>
<action
Expand All @@ -70,7 +70,7 @@
skip="true"
title="Gist 106019: Synchronous service invocation + using binding (Bioschemata)">
<description>
Synchronous service invocation + using an autogenerated binding (Bioschemata service).
Synchronous service invocation + using an auto-generated binding (Bioschemata service).

</description>
<action
Expand All @@ -84,7 +84,7 @@
skip="true"
title="Gist 106022: Asynchronous service invocation (+ using binding)">
<description>
Asynchronous service invocation + using an autogenerated binding (blast service).
Asynchronous service invocation + using an auto-generated binding (blast service).

</description>
<action
Expand Down

0 comments on commit dff12b1

Please sign in to comment.