Merge branch '2.6.1' into develop

bioclipse · Sep 30, 2013 · 7b8f0d9 · 7b8f0d9
2 parents 40f69d5 + 85ecb3e
commit 7b8f0d9
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 8 deletions.
diff --git a/features/net.bioclipse.social_feature/feature.xml b/features/net.bioclipse.social_feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="net.bioclipse.social_feature"
       label="Bioclipse Social Feature"
-      version="2.6.0.vqualifier"
+      version="2.6.1.qualifier"
       provider-name="bioclipse.net"
       plugin="net.bioclipse.myexperiment">
 

diff --git a/net.bioclipse.social_releng/buckminster.cspec b/net.bioclipse.social_releng/buckminster.cspec
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cspec xmlns="http://www.eclipse.org/buckminster/CSpec-1.0" name="net.bioclipse.social_releng" componentType="buckminster" version="2.6.1">
+    <dependencies>
+        <dependency name="net.bioclipse.social_site" componentType="eclipse.feature" />
+        <dependency name="org.slf4j.api" componentType="osgi.bundle"/>
+        <dependency name="log4j.over.slf4j" componentType="osgi.bundle"/>
+        <dependency name="org.eclipse.rcp" componentType="eclipse.feature"/>
+        <!--
+        <dependency name="slf4j.api" componentType="osgi.bundle"/>
+        <dependency name="jcl.over.slf4j" componentType="osgi.bundle"/>
+        <dependency name="log4j.over.slf4j" componentType="osgi.bundle"/>
+        -->
+    </dependencies>
+    <actions>
+      <public name="site.mirror.p2" actor="p2SiteMirror">
+        <prerequisites>
+          <attribute name="site.p2" alias="site"/>
+        </prerequisites>
+        <products base="${bioclipse.mirror}/${bioclipse.mirror.name}" upToDatePolicy="ACTOR" />
+      </public>
+    </actions>
+    <groups>
+        <public name="site.p2">
+            <attribute name="site.p2" component="net.bioclipse.social_site"/>
+        </public>
+    </groups>
+</cspec>
diff --git a/plugins/net.bioclipse.myexperiment.tests/META-INF/MANIFEST.MF b/plugins/net.bioclipse.myexperiment.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: net.bioclipse.myexperiment Tests
 Bundle-SymbolicName: net.bioclipse.myexperiment.tests;singleton:=true
-Bundle-Version: 2.6.0.vqualifier
+Bundle-Version: 2.6.1.qualifier
 Bundle-Activator: net.bioclipse.myexperiment.tests.Activator
 Bundle-Vendor: The Bioclipse Team
 Require-Bundle: org.eclipse.ui,

diff --git a/plugins/net.bioclipse.myexperiment/META-INF/MANIFEST.MF b/plugins/net.bioclipse.myexperiment/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: net.bioclipse.myexperiment
 Bundle-SymbolicName: net.bioclipse.myexperiment;singleton:=true
-Bundle-Version: 2.6.0.vqualifier
+Bundle-Version: 2.6.1.qualifier
 Bundle-Activator: net.bioclipse.myexperiment.Activator
 Bundle-Vendor: The Bioclipse Team
 Require-Bundle: 

diff --git a/plugins/net.bioclipse.myexperiment/build.properties b/plugins/net.bioclipse.myexperiment/build.properties
@@ -2,4 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
-               .
+               .,\
+               toc.xml,\
+               html/
diff --git a/...t.bioclipse.myexperiment/src/net/bioclipse/myexperiment/business/MyExperimentManager.java b/...t.bioclipse.myexperiment/src/net/bioclipse/myexperiment/business/MyExperimentManager.java
@@ -161,6 +161,7 @@ public IFile downloadWorkflow(Integer workflowNumber,
     }
 
     private String removeType(String filename) {
+    	if (!filename.contains("^^")) return filename;
         StringBuffer result = new StringBuffer();
         boolean typeSeparatorFound = false;
         for (int i=filename.length()-1; i>=0; i--) {
@@ -171,7 +172,11 @@ private String removeType(String filename) {
                 typeSeparatorFound = true;
             }
         }
-        return result.reverse().toString();
+
+        if (!typeSeparatorFound)
+            return filename;
+        else
+            return result.reverse().toString();
     }
 
     private IProject getProjectDirectory(IProgressMonitor monitor)

diff --git a/plugins/net.bioclipse.twitter.tests/META-INF/MANIFEST.MF b/plugins/net.bioclipse.twitter.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: net.bioclipse.twitter Tests
 Bundle-SymbolicName: net.bioclipse.twitter.tests;singleton:=true
-Bundle-Version: 2.6.0.vqualifier
+Bundle-Version: 2.6.1.qualifier
 Bundle-Activator: net.bioclipse.twitter.tests.Activator
 Bundle-Vendor: The Bioclipse Team
 Require-Bundle: org.eclipse.ui,

diff --git a/plugins/net.bioclipse.twitter/META-INF/MANIFEST.MF b/plugins/net.bioclipse.twitter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: net.bioclipse.twitter
 Bundle-SymbolicName: net.bioclipse.twitter;singleton:=true
-Bundle-Version: 2.6.0.vqualifier
+Bundle-Version: 2.6.1.qualifier
 Bundle-Activator: net.bioclipse.twitter.Activator
 Bundle-Vendor: The Bioclipse Team
 Require-Bundle: 

diff --git a/plugins/net.bioclipse.twitter/build.properties b/plugins/net.bioclipse.twitter/build.properties
@@ -2,4 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
-               .
+               .,\
+               html/,\
+               toc.xml