From: Cherian Mathew Date: Wed, 20 May 2015 17:16:46 +0000 (+0200) Subject: dependency changes to move to e4 X-Git-Tag: 3.6.0~6^2~3 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/e1f2a0653013ceda7ad8cde03f1e1bcbc19a59ed dependency changes to move to e4 --- diff --git a/eu.etaxonomy.taxeditor.application/.classpath b/eu.etaxonomy.taxeditor.application/.classpath index bfb7a7aeb..4c7e96f59 100644 --- a/eu.etaxonomy.taxeditor.application/.classpath +++ b/eu.etaxonomy.taxeditor.application/.classpath @@ -1,9 +1,8 @@ - - - - - - - - - + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath index f26461277..390956d2a 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/.classpath +++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath @@ -1,219 +1,218 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF index a1f584654..30d09f9e0 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF @@ -257,6 +257,7 @@ Export-Package: com.google.api, org.apache.lucene.util, org.apache.sanselan;uses:="org.apache.sanselan.common,org.apache.sanselan.common.byteSources", org.apache.xerces.dom, + org.eclipse.osgi.internal.loader, org.eclipse.osgi.util, org.h2.jdbc, org.hamcrest, @@ -301,6 +302,7 @@ Export-Package: com.google.api, org.joda.time.format;uses:="org.joda.time", org.joda.time.tz;uses:="org.joda.time", org.junit;uses:="org.hamcrest", + org.junit.runner, org.odftoolkit.odfdom, org.odftoolkit.odfdom.doc, org.odftoolkit.odfdom.doc.office, diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml index 411530651..44db5e63b 100644 --- a/eu.etaxonomy.taxeditor.feature.platform/feature.xml +++ b/eu.etaxonomy.taxeditor.feature.platform/feature.xml @@ -248,7 +248,7 @@ id="org.eclipse.ui.ide" download-size="0" install-size="0" - version="0.0.0" + version="3.7.0" unpack="false"/> - - - - - - - + + + + + + + diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF index d52b5b196..0d1b3e820 100644 --- a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF @@ -9,17 +9,17 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.apache.log4j, org.eclipse.ui;bundle-version="3.6.2", org.eclipse.core.runtime;bundle-version="3.6.0", - org.eclipse.swtbot.eclipse.core;bundle-version="2.0.5", + org.eclipse.swtbot.eclipse.core, org.eclipse.swtbot.eclipse.finder, org.eclipse.swtbot.junit4_x, org.eclipse.ui.ide, - org.junit4, eu.etaxonomy.taxeditor.application;bundle-version="3.0.6", - eu.etaxonomy.taxeditor.bulkeditor;bundle-version="3.0.6", - eu.etaxonomy.taxeditor.cdmlib;bundle-version="3.0.6", - eu.etaxonomy.taxeditor.editor;bundle-version="3.0.6", - eu.etaxonomy.taxeditor.help;bundle-version="3.0.6", - eu.etaxonomy.taxeditor.navigation;bundle-version="3.0.6", - eu.etaxonomy.taxeditor.printpublisher;bundle-version="3.0.6", - eu.etaxonomy.taxeditor.store;bundle-version="3.0.6" + eu.etaxonomy.taxeditor.bulkeditor, + eu.etaxonomy.taxeditor.cdmlib, + eu.etaxonomy.taxeditor.editor, + eu.etaxonomy.taxeditor.help, + eu.etaxonomy.taxeditor.navigation, + eu.etaxonomy.taxeditor.printpublisher, + eu.etaxonomy.taxeditor.store, + org.junit;bundle-version="4.11.0" Eclipse-RegisterBuddy: org.apache.log4j diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/AbstractEditorTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/AbstractEditorTest.java index 78a24ab76..7cc4c0b90 100644 --- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/AbstractEditorTest.java +++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/AbstractEditorTest.java @@ -1,52 +1,51 @@ /** - * + * */ package eu.etaxonomy.taxeditor.test; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; import org.eclipse.swtbot.eclipse.finder.waits.Conditions; -import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner; import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences; import org.junit.Before; -import org.junit.runner.RunWith; + /** * @author n.hoffmann * */ -@RunWith(SWTBotJunit4ClassRunner.class) +//@RunWith(SWTBotJunit4ClassRunner.class) public abstract class AbstractEditorTest { - + protected SWTWorkbenchBot bot; - + public SwtBotUtils utils; - + @Before public void setup() { bot = new SWTWorkbenchBot(); SWTBotPreferences.TIMEOUT = 300000; utils = new SwtBotUtils(bot); - + // unfortunately swt bot is not available at the time this is set up // if("Choose a nomenclatural code".equals(getActiveShellHeadline())){ // ok(); // bot.waitUntil(Conditions.shellIsActive("Nomenclatural code set")); // ok(); // } - + if("Connecting to datasource: cdm".equals(utils.getActiveShellHeadline())){ performLogin(); } } - + private void performLogin(){ bot.waitUntil(Conditions.shellIsActive("Login")); bot.textWithLabel("Username").setText("admin"); bot.textWithLabel("Password").setText("00000"); bot.button("OK").click(); } - - + + } diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/SwtBotUtils.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/SwtBotUtils.java index b2d7c455a..1c01bc0a7 100644 --- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/SwtBotUtils.java +++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/SwtBotUtils.java @@ -2,7 +2,6 @@ package eu.etaxonomy.taxeditor.test; import java.util.List; -import org.eclipse.osgi.internal.loader.FilteredSourcePackage; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.Widget; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; @@ -15,27 +14,28 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; public class SwtBotUtils { - + private SWTWorkbenchBot bot; - + public SwtBotUtils(SWTWorkbenchBot bot) { this.bot = bot; } - + /** * @return * @throws WidgetNotFoundException */ public SWTBotTree tree(Widget widget) throws WidgetNotFoundException { List controls = new ChildrenControlFinder(widget).findControls(WidgetMatcherFactory.widgetOfType(Tree.class)); - if (controls.isEmpty()) - throw new WidgetNotFoundException("Could not find any tree"); - SWTBotTree tree = new SWTBotTree((Tree) controls.get(0)); + if (controls.isEmpty()) { + throw new WidgetNotFoundException("Could not find any tree"); + } + SWTBotTree tree = new SWTBotTree(controls.get(0)); return tree; } - + /** - * + * * @param index the index of the SelectionElement * @param dialogName the title of the expected dialog */ @@ -52,23 +52,23 @@ public class SwtBotUtils { public SWTBotView view(String title) throws WidgetNotFoundException { return getBot().viewByTitle(title); } - + public void cancel() { clickButton("Cancel"); } - + public void ok() { clickButton("OK"); } - + public void finish() { clickButton("Finish"); } - + public void clickButton(String label) { getBot().button(label).click(); } - + public String getActiveShellHeadline(){ return getBot().activeShell().getText(); }