Merge branch 'move-to-luna' of wp5.e-taxonomy.eu:/var/git/taxeditor into develop

Conflicts:
	eu.etaxonomy.taxeditor.cdmlib/.classpath

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index fe9dcabdeae9bdc263656fe2f6f222bb301d219d..b94a8b1d0ac6645b45ad8aa6adaed6e91bb09f8a 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -193,22 +193,6 @@
        <classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.0.jar" sourcepath="lib/cdmlib-io-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.0.jar" sourcepath="lib/cdmlib-model-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.0.jar" sourcepath="lib/cdmlib-persistence-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.0.jar" sourcepath="lib/cdmlib-services-3.6.0-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/poi-3.10-FINAL.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10-FINAL.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 584d38d72fe8ce0db43ff4d5ba1d7cd1c97b3cf1..d1ac59def13ca9fdbe27be1fd5a353afff2eb151 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -258,6 +258,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,
@@ -302,6 +303,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.editor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
index 3905f99b4ce9ce0071e54ea6c541a51d257c806c..2553e6492bc6456b11bd78dc80dbb2e03848bf46 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.zest.core,
  org.eclipse.zest.layouts,
  eu.etaxonomy.taxeditor.cdmlib,
- org.eclipse.ui.ide;bundle-version="3.7.0"
+ org.eclipse.ui.ide
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.databinding.beans,

diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
index d52b5b19652facf363dc8d581834fb310a3ac39e..4444e369c811d9af329c8aeedb234464c155c8dd 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
@@ -7,19 +7,18 @@ Bundle-ActivationPolicy: lazy
 Bundle-Vendor: EDIT
 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.ui,
+ org.eclipse.core.runtime,
+ 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.application,
+ 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
 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 78a24ab76e8d9819c9f9ab75e063755b84fc4751..7cc4c0b90305af5081261f455972792de3d66705 100644 (file)
--- 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 @@
 /**\r
- * \r
+ *\r
  */\r
 package eu.etaxonomy.taxeditor.test;\r
 \r
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;\r
 import org.eclipse.swtbot.eclipse.finder.waits.Conditions;\r
-import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;\r
 import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences;\r
 import org.junit.Before;\r
-import org.junit.runner.RunWith;\r
+\r
 \r
 /**\r
  * @author n.hoffmann\r
  *\r
  */\r
-@RunWith(SWTBotJunit4ClassRunner.class)\r
+//@RunWith(SWTBotJunit4ClassRunner.class)\r
 public abstract class AbstractEditorTest {\r
-       \r
+\r
        protected SWTWorkbenchBot bot;\r
-       \r
+\r
        public SwtBotUtils utils;\r
-       \r
+\r
        @Before\r
        public void setup() {\r
                bot = new SWTWorkbenchBot();\r
                SWTBotPreferences.TIMEOUT = 300000;\r
                utils = new SwtBotUtils(bot);\r
-               \r
+\r
                // unfortunately swt bot is not available at the time this is set up\r
 //             if("Choose a nomenclatural code".equals(getActiveShellHeadline())){\r
 //                     ok();\r
 //                     bot.waitUntil(Conditions.shellIsActive("Nomenclatural code set"));\r
 //                     ok();\r
 //             }\r
-               \r
+\r
                if("Connecting to datasource: cdm".equals(utils.getActiveShellHeadline())){\r
                        performLogin();\r
                }\r
        }\r
-       \r
+\r
        private void performLogin(){\r
                bot.waitUntil(Conditions.shellIsActive("Login"));\r
                bot.textWithLabel("Username").setText("admin");\r
                bot.textWithLabel("Password").setText("00000");\r
                bot.button("OK").click();\r
        }\r
-       \r
 \r
-       \r
+\r
+\r
 \r
 }\r

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 b2d7c455ab2a37c25b970c31f420c8e36d100f08..1c01bc0a71f8e556c44d56a97301d5f9621437a8 100644 (file)
--- 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;
 \r
 import java.util.List;\r
 \r
-import org.eclipse.osgi.internal.loader.FilteredSourcePackage;\r
 import org.eclipse.swt.widgets.Tree;\r
 import org.eclipse.swt.widgets.Widget;\r
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;\r
@@ -15,27 +14,28 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;\r
 \r
 public class SwtBotUtils {\r
-       \r
+\r
        private SWTWorkbenchBot bot;\r
-       \r
+\r
        public SwtBotUtils(SWTWorkbenchBot bot) {\r
                this.bot = bot;\r
        }\r
-       \r
+\r
        /**\r
         * @return\r
         * @throws WidgetNotFoundException\r
         */\r
        public SWTBotTree tree(Widget widget) throws WidgetNotFoundException {\r
                List<Tree> controls = new ChildrenControlFinder(widget).findControls(WidgetMatcherFactory.widgetOfType(Tree.class));\r
-               if (controls.isEmpty())\r
-                       throw new WidgetNotFoundException("Could not find any tree");\r
-               SWTBotTree tree = new SWTBotTree((Tree) controls.get(0));\r
+               if (controls.isEmpty()) {\r
+            throw new WidgetNotFoundException("Could not find any tree");\r
+        }\r
+               SWTBotTree tree = new SWTBotTree(controls.get(0));\r
                return tree;\r
        }\r
-       \r
+\r
        /**\r
-        * \r
+        *\r
         * @param index the index of the SelectionElement\r
         * @param dialogName the title of the expected dialog\r
         */\r
@@ -52,23 +52,23 @@ public class SwtBotUtils {
        public SWTBotView view(String title) throws WidgetNotFoundException {\r
                return getBot().viewByTitle(title);\r
        }\r
-       \r
+\r
        public void cancel() {\r
                clickButton("Cancel");\r
        }\r
-       \r
+\r
        public void ok() {\r
                clickButton("OK");\r
        }\r
-       \r
+\r
        public void finish() {\r
                clickButton("Finish");\r
        }\r
-       \r
+\r
        public void clickButton(String label) {\r
                getBot().button(label).click();\r
        }\r
-       \r
+\r
        public String getActiveShellHeadline(){\r
                return getBot().activeShell().getText();\r
        }\r

diff --git a/eu.etaxonomy.taxeditor/rcp.target b/eu.etaxonomy.taxeditor/rcp.target
index c929cd0de4fb7d2936c32700d5795d171d85e50f..7bc180fdf6541bda55d6eeb8f0094faef67a076a 100644 (file)
--- a/eu.etaxonomy.taxeditor/rcp.target
+++ b/eu.etaxonomy.taxeditor/rcp.target
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Eclipse Indigo Target" sequenceNumber="5">
+<?pde version="3.8"?><target name="Eclipse Indigo Target" sequenceNumber="28">
 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
-<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
-<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
-<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
-<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site"/>
-</location>
-<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jdt.feature.group" version="3.7.1.r371_v20110810-0800-7z8gFcoFMLfTabvKsR5Qm9rBGEBK"/>
-<unit id="org.eclipse.pde.source.feature.group" version="3.7.1.r37x_v20110810-0800-7b7qFVtFEx2XnmZ4jlM5mjM"/>
-<unit id="org.eclipse.platform.feature.group" version="3.7.1.r37x_v20110729-9gF7UHOxFtniV7mI3T556iZN9AU8bEZ1lHMcVK"/>
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20110530-7P7NFUFFLWUl76mart"/>
-<unit id="org.eclipse.platform.source.feature.group" version="3.7.1.r37x_v20110729-9gF7UHOxFtniV7mI3T556iZN9AU8bEZ1lHMcVK"/>
-<unit id="org.eclipse.platform.sdk" version="3.7.1.M20110909-1335"/>
-<unit id="org.eclipse.rcp.feature.group" version="3.7.1.r37x_v20110729-9DB5FmNFnFLSFCtLxnRfMqt15A4A"/>
-<unit id="org.eclipse.rcp.source.feature.group" version="3.7.1.r37x_v20110729-9DB5FmNFnFLSFCtLxnRfMqt15A4A"/>
-<unit id="org.eclipse.rcp.sdk.id" version="3.7.1.M20110909-1335"/>
-<unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.1.R37x_v20110907-7M7W8h8eNV4Vrz-hz01A7SL_MhZP"/>
-<unit id="org.eclipse.zest.sdk.feature.group" version="1.3.0.v20110425-2050-67C08COMOGAKRUKGP_ULXbePP8ZT"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.7.2.v20120120-1414-7z8gFcuFMP7BW5XTz0jLTnz0l9B1"/>
+<unit id="org.eclipse.pde.source.feature.group" version="3.7.2.v20120120-1420-7b7rFUOFEx2Xnqafnpz0E--0"/>
+<unit id="org.eclipse.platform.feature.group" version="3.7.2.v20120207-1839-9gF7UHPDFxGjd-PqDr2jX_4yKaumkoHTz04_q-q"/>
+<unit id="org.eclipse.equinox.executable.feature.group" version="3.5.1.v20111216-1653-7P7NFUIFIbaUcU77s0KQWHw5HZTZ"/>
+<unit id="org.eclipse.platform.source.feature.group" version="3.7.2.v20120207-1839-9gF7UHPDFxGjd-PqDr2jX_4yKaumkoHTz04_q-q"/>
+<unit id="org.eclipse.platform.sdk" version="3.7.2.M20120208-0800"/>
+<unit id="org.eclipse.rcp.feature.group" version="3.7.2.v20120120-1424-9DB5FmnFq5JCf1UA38R-kz0S0272"/>
+<unit id="org.eclipse.rcp.source.feature.group" version="3.7.2.v20120120-1424-9DB5FmnFq5JCf1UA38R-kz0S0272"/>
+<unit id="org.eclipse.rcp.sdk.id" version="3.7.2.M20120208-0800"/>
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.1.R37x_v20110907-7M7W8i8eNV4WsRkue-4Vq4J6pCyW"/>
+<unit id="org.eclipse.zest.sdk.feature.group" version="1.3.0.v20110425-2050-67C18COMPIAKSVKGQaRTQTiSN8WP"/>
 <repository location="http://download.eclipse.org/releases/indigo"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.nebula.widgets.compositetable.feature" version="1.0.0.201409040043"/>
+<unit id="org.eclipse.nebula.widgets.compositetable.feature.feature.group" version="1.0.0.201409040043"/>
 <repository location="http://download.eclipse.org/technology/nebula/archives/Q32014/release/"/>
 </location>
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
+<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site"/>
+</location>
 </locations>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_60"/>
+<launcherArgs>
+<vmArgs>-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx512m</vmArgs>
+</launcherArgs>
 </target>