Merge branch 'hotfix/3.12.3'
authorjenkins <jenkins-int@bgbm.org>
Wed, 20 Jan 2016 10:25:03 +0000 (11:25 +0100)
committerjenkins <jenkins-int@bgbm.org>
Wed, 20 Jan 2016 10:25:03 +0000 (11:25 +0100)
35 files changed:
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.application/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/pom.xml
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/server/CDMServerUtils.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.feature.jre.linux64/feature.xml
eu.etaxonomy.taxeditor.feature.jre.linux64/pom.xml
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.feature.platform/pom.xml
eu.etaxonomy.taxeditor.feature/feature.xml
eu.etaxonomy.taxeditor.feature/pom.xml
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.help/pom.xml
eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular.lib/pom.xml
eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular/pom.xml
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/pom.xml
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.printpublisher/pom.xml
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/pom.xml
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/dialogs/CdmServerInfoTest.java
eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.webapp/pom.xml
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
eu.etaxonomy.taxeditor/pom.xml
pom.xml

index 1139c7e2be1a6e1c60889075e7c35e6752503605..d8dedfd846335e500ff92a1d40e532f718cbd5c7 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Application
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/plugin
index c01f492c86b2a669ff1d07f6b720c286dde191c1..c88cc0faec06fb38b5b819d2e642abbbf4f7a0ed 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.2</version>
+    <version>3.12.3</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 6512f6cea1494827d2fe63bfdf9ff101bb43daa2..e00c9759454956bef99036e50a9d771b8a312781 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bulkeditor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
index 4bbbf5966f11b4f82295fde44f64f4ec80f394ad..8490a13c68c806987ce0871c6994a0ccdbe982af 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.12.2</version>
+               <version>3.12.3</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 02b11526a123b8c0d5063f94ac5cbc84cf2b6c6f..25237c6771d882c8d54a386e925e7387d5d34608 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDM Library Dependencies Plugin
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
index c261a449bf53223b1a5a039c440627f240b73219..4ed60aeba61940e4c38ad64365a78f8af62f4adc 100644 (file)
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>3.12.2</version>\r
+    <version>3.12.3</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
index 976d2a58b8a65985b4e8f3069b5bd33eb0ac314b..42bd28ba5144b5e9f9acbefaf4bcbe760f1a0c21 100644 (file)
@@ -47,7 +47,7 @@ public class CDMServerUtils {
         configStringBuilder.append(" </bean>" + System.lineSeparator());
 
         for(CdmPersistentDataSource dataSource : CdmPersistentDataSource.getAllDataSources()) {
-            String beanId = dataSource.getName();
+            String beanId = xmlNCNamefrom(dataSource.getName());
             String user = dataSource.getUsername();
             String password = dataSource.getPassword();
             String driverClass = dataSource.getCdmSourceProperty(CdmSourceProperties.DRIVER_CLASS);
@@ -65,6 +65,18 @@ public class CDMServerUtils {
         return configStringBuilder.toString();
     }
 
+    /**
+     * Assures that the datasource name is converted into a valid XML type NCName.
+     *
+     * Prefixes the string and replaces all forbidden characters by '_'.
+     *
+     * @param dataSource
+     * @return
+     */
+    public static String xmlNCNamefrom(String beanName) {
+        return "MGD_" + beanName.replaceAll("[^a-zA-Z0-9]", "_");
+    }
+
     public static File writeManagedServerConfig(String config, String fileName) throws IOException {
         File managedConfigFile = new File(CdmApplicationUtils.getWritableResourceDir(), fileName);
         if(managedConfigFile.exists()) {
index 952ceb9256b0a6a265ab22460e72ee8e886ee18e..ccea9a894aa90b73e6bb3fa84b1da04b7755ba2d 100644 (file)
@@ -38,6 +38,7 @@ import eu.etaxonomy.cdm.database.CdmPersistentDataSource;
 import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.model.metadata.CdmMetaData;
 import eu.etaxonomy.taxeditor.remoting.server.CDMServerException;
+import eu.etaxonomy.taxeditor.remoting.server.CDMServerUtils;
 
 /**
  * @author cmathew
@@ -47,7 +48,7 @@ import eu.etaxonomy.taxeditor.remoting.server.CDMServerException;
 public class CdmServerInfo {
     public static final Logger logger = Logger.getLogger(CdmServerInfo.class);
 
-    private final static String CDMSERVER_PREFIX = "";
+    private final static String CDMSERVER_PREFIX = "cdmserver/";
     private final static String NAME_PRODUCTION = "cybertaxonomy.org";
     private final static String SERVER_PRODUCTION = "api.cybertaxonomy.org";
 
@@ -87,11 +88,17 @@ public class CdmServerInfo {
     private String cdmlibServicesVersion = "";
     private String cdmlibServicesLastModified = "";
 
+    private String prefix = "";
 
-    public CdmServerInfo(String name, String server, int port) {
+    private boolean ignoreCdmLibVersion = false;
+
+
+    public CdmServerInfo(String name, String server, int port, String prefix, boolean ignoreCdmLibVersion) {
         this.name = name;
         this.server = server;
         this.port = port;
+        this.prefix = prefix;
+        this.ignoreCdmLibVersion = ignoreCdmLibVersion;
         instances = new ArrayList<CdmInstanceInfo>();
 
     }
@@ -141,7 +148,7 @@ public class CdmServerInfo {
     }
 
     public void updateInfo() throws CDMServerException {
-        String url = "http://" + server + ":" + String.valueOf(port) + "/" + CDMSERVER_PREFIX + "/info.jsp";
+        String url = "http://" + server + ":" + String.valueOf(port) + "/" + prefix + "info.jsp";
         String responseBody = getResponse(url);
         if(responseBody != null) {
             try {
@@ -156,7 +163,7 @@ public class CdmServerInfo {
 
     public void addInstancesViaHttp() throws CDMServerException {
         updateInfo();
-        String url = "http://" + server + ":" + String.valueOf(port) + "/" + CDMSERVER_PREFIX + "/instances.jsp";
+        String url = "http://" + server + ":" + String.valueOf(port) + "/" + prefix + "instances.jsp";
         String responseBody = getResponse(url);
         if(responseBody != null) {
             try {
@@ -221,8 +228,9 @@ public class CdmServerInfo {
 
     public void addInstancesFromDataSourcesConfig() {
         for(ICdmDataSource dataSource : CdmPersistentDataSource.getAllDataSources()){
-            logger.info("Adding local instance " + dataSource.getName());
-            addInstance(dataSource.getName(), dataSource.getName());
+            String datasourceNCName = CDMServerUtils.xmlNCNamefrom(dataSource.getName());
+            logger.info("Adding local instance " + dataSource.getName() + " as " + datasourceNCName);
+            addInstance(datasourceNCName, datasourceNCName);
         }
     }
 
@@ -308,8 +316,11 @@ public class CdmServerInfo {
 
         String serverVersion = cdmlibServicesVersion;
         String serverCdmlibLastModified = cdmlibServicesLastModified;
-
-        return compareCdmlibServicesVersion(serverVersion, serverCdmlibLastModified);
+        if(ignoreCdmLibVersion) {
+            return 0;
+        } else {
+            return compareCdmlibServicesVersion(serverVersion, serverCdmlibLastModified);
+        }
     }
 
 
@@ -367,14 +378,14 @@ public class CdmServerInfo {
 
     public static List<CdmServerInfo> getCdmServers() {
         if(cdmServerInfoList == null) {
-            cdmServerInfoList = new ArrayList<CdmServerInfo>();
-            cdmServerInfoList.add(new CdmServerInfo(NAME_PRODUCTION, SERVER_PRODUCTION, 80));
-            //cdmServerInfoList.add(new CdmServerInfo(NAME_INTEGRATION, SERVER_INTEGRATION, 80));
-            cdmServerInfoList.add(new CdmServerInfo(NAME_DEMO_1, SERVER_DEMO_1, 80));
-           // cdmServerInfoList.add(new CdmServerInfo(NAME_DEMO_2, SERVER_DEMO_2, 80));
-           //cdmServerInfoList.add(new CdmServerInfo(NAME_TEST, SERVER_TEST, 80));
-           // cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST, SERVER_LOCALHOST, 8080));
-            cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST_MGD, SERVER_LOCALHOST,NULL_PORT));
+           cdmServerInfoList = new ArrayList<CdmServerInfo>();
+           cdmServerInfoList.add(new CdmServerInfo(NAME_PRODUCTION, SERVER_PRODUCTION, 80, "", false));
+           //cdmServerInfoList.add(new CdmServerInfo(NAME_INTEGRATION, SERVER_INTEGRATION, 80, CDMSERVER_PREFIX));
+           cdmServerInfoList.add(new CdmServerInfo(NAME_DEMO_1, SERVER_DEMO_1, 80, CDMSERVER_PREFIX, false));
+           // cdmServerInfoList.add(new CdmServerInfo(NAME_DEMO_2, SERVER_DEMO_2, 80, CDMSERVER_PREFIX));
+           //cdmServerInfoList.add(new CdmServerInfo(NAME_TEST, SERVER_TEST, 80, CDMSERVER_PREFIX, false));
+           cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST, SERVER_LOCALHOST, 8080, CDMSERVER_PREFIX, false));
+           cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST_MGD, SERVER_LOCALHOST, NULL_PORT, CDMSERVER_PREFIX, false));
         }
         return cdmServerInfoList;
     }
@@ -409,7 +420,7 @@ public class CdmServerInfo {
         CdmInstanceInfo devInstance = null;
         if(value != null && !value.isEmpty()) {
             int devPort = Integer.valueOf(value);
-            CdmServerInfo devCii = new CdmServerInfo(NAME_LOCALHOST_DEV, SERVER_LOCALHOST_DEV, devPort);
+            CdmServerInfo devCii = new CdmServerInfo(NAME_LOCALHOST_DEV, SERVER_LOCALHOST_DEV, devPort, "", false);
             try {
                 devInstance = devCii.addInstance(NAME_INSTANCE_LOCALHOST_DEV, BASEPATH_LOCALHOST_DEV);
                 available = devCii.pingInstance(devInstance, devPort);
index 543857970365a94b051996d20d81061c572fdbba..f6602247fa6df59920727422d6975af22fe9b3b6 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: OSGI-INF/l10n/plugin
index 1c9533c66104831e4b025434c6b44a5d651c98e0..4a9fa35f5a2b5d3525351c10cf3868455616faa1 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.2</version>
+    <version>3.12.3</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
index 3c5daa72e0f432102654ca72a3134a81a39b32eb..ac48d767116e14731c2165c492f625cd318aef19 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.jre.linux64"
       label="Taxonomic Editor JRE Linux64"
-      version="3.12.2"
+      version="3.12.3"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux"
index 3d6d431162b0b024bc7dc05aac1198fb67b0290b..3432d29cf606c7f924d33545abe02cc3133f2ae7 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.2</version>
+    <version>3.12.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature.jre.linux64</artifactId>
index d01880694058ca65d8ce1a3a1915fdfde7442e6b..3a64deec5cc99ac6149c283606d66c5641177033 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="3.12.2"
+      version="3.12.3"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
index ceb885f302f8a8a02b9a74ac2de9c72d83332690..4ca7544d95d842c9ed5ab2006376a59ef1dfbf31 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.12.2</version>
+               <version>3.12.3</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
index 3292b2225f6b6aa4864ac04bc06938cc986f8a83..de0cae22b8fa64242b4670b6c4df3fa4f3024aa1 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="3.12.2"
+      version="3.12.3"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
index 5e6f25cafe42ba99ac499b41c64df16ad7c5ad97..2397fdf9fb57ac556359df36e4e7d134b0551574 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.2</version>
+    <version>3.12.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
index 5039c7930deaea6545cb00f0d8d5558cf4a36cb5..01ccbb0bd4170582cade82a54354660599a1d66a 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Help
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
index 26efcfd85e0acddaac741583bc94726c9ffedced..8305d4caa1ca288dc7b8282da54a3609dfd372da 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.12.2</version>
+               <version>3.12.3</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 29e53df2370424569cfe0d6028b4a1d415dbbb0d..5546c133092432fab911ab9541255380a71e0d69 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: eu.etaxonomy.taxeditor.molecular.lib
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
 Bundle-ClassPath: .,
  lib/bioinfweb-commons-bio-2-SNAPSHOT.jar,
  lib/bioinfweb-commons-core-2-SNAPSHOT.jar,
index 2eed6cd2a37e6de23ad4da40e60f460a301ac525..3e18b18e53c141c3a446f5650d2592b8d6a27db3 100644 (file)
@@ -7,7 +7,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.2</version>
+    <version>3.12.3</version>
   </parent>
 
   <build>
index b105c55aaa87c9dc4abf81583057b8a8720e90bd..662b977c1457037db4b3dd8aa76dc5dd35c7ab82 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Molecular Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
 Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
index 5831dff6a32fdc50dbc7743ac7a5334bea7ac6e8..0fe7c7ccc77bc6c4b021360af44d098926c63d76 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.2</version>
+    <version>3.12.3</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index c311a31fc69da46f70eb14da85a8d3f292d77960..a4cb8734ef44309c8af5468e535fd9c0728637aa 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Navigation Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,
index 5fedf05ddd9bac29d26ae19104860539634bd0a5..23bac0ea23508dd77a391fbb65e4515d69a470d0 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.12.2</version>
+               <version>3.12.3</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 703f32dfd1a4da63b302f865921774ed0d39bf78..87cc0eb814879439aa79cd5e34b960d28d46b1c7 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Printpublisher Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,
index d70a27335d0712c7b9a03946990be078daf41929..d0b303d98603e5c7e56f40153113883510cb5732 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>3.12.2</version>
+               <version>3.12.3</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 18e1aa84271c4b41663a579b1e665249f6d9c6ce..c4224dd3fd1c6e20131dfd8492e63a8ecc40f601 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
index ee576be60f8f40e08ce8c25fa88d05b4d7384b5c..f47a7c93a2b6ce28ccfce7d2998f4554c15b31d5 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>3.12.2</version>
+       <version>3.12.3</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index d968fe56471e8ad3c7d520f34c2096b908c557d4..d1eb71224b53c4e9a6fd04adada6e3ddf63e5c58 100644 (file)
@@ -42,7 +42,7 @@ public class CdmServerInfoTest extends UnitilsJUnit4 {
     @Ignore // this should be targetting integration or production
     @Test
     public void pingInstancesTest() {
-        CdmServerInfo csii = new CdmServerInfo("edit-test", "test.e-taxonomy.eu", 8080);
+        CdmServerInfo csii = new CdmServerInfo("edit-test", "test.e-taxonomy.eu", 8080, "cdmserver/", false);
         try {
             csii.refreshInstances();
             List<CdmInstanceInfo> instances = csii.getInstances();
@@ -56,7 +56,7 @@ public class CdmServerInfoTest extends UnitilsJUnit4 {
 
     @Test
     public void refreshWrongInstancesTest() {
-        CdmServerInfo wrongCsii = new CdmServerInfo("local", "local", 8080);
+        CdmServerInfo wrongCsii = new CdmServerInfo("local", "local", 8080, "noserver", false);
         try {
             wrongCsii.refreshInstances();
             List<CdmInstanceInfo> instances = wrongCsii.getInstances();
@@ -69,7 +69,7 @@ public class CdmServerInfoTest extends UnitilsJUnit4 {
     @Ignore // this should be targetting integration or production
     @Test
     public void refreshInstancesTest() throws CDMServerException {
-        CdmServerInfo cdmServerInfo = new CdmServerInfo("edit-test", "test.e-taxonomy.eu", 8080);
+        CdmServerInfo cdmServerInfo = new CdmServerInfo("edit-test", "test.e-taxonomy.eu", 8080, "cdmserver/", false);
         cdmServerInfo.refreshInstances();
         List<CdmInstanceInfo> instances = cdmServerInfo.getInstances();
         Assert.assertTrue(instances != null && !instances.isEmpty());
index 638f230d45ca99fb013a522b1b304bc0a3c99cc6..7145d1bb8b803279341111786f392b981ed66146 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Webapp
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.webapp;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.12.3
 Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
index f066186c70d0abdf00a3ba00559f6f510e346962..e613c23b3c99dbd5e477220d31dffb0e58140bf3 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.2</version>
+    <version>3.12.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.webapp</artifactId>
index e9c12f963beb749c3eae4f417fba9e364d9ead65..23f925e63b3840bf75be3d40fc53233e042dc698 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="3.12.2">
+<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="3.12.3">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>
index bdb8b695c961e07af93217a1732096c7aa600b9c..7cec83f34f0d5c102d9e42597be2c60482b08bfc 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.12.2" useFeatures="true" includeLaunchers="true">
+<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.12.3" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
index 2f8383507689dad7c141a88ff8c5cf34a6b77252..e0875af6bb2450ef46662fb716cb441af06a14af 100644 (file)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.2</version>
+    <version>3.12.3</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 3c20df4e11155185d8bd57b1505c8541a1699278..09d882f5a61e16327d7260775df886c1460fca1f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>3.12.2</version>
+  <version>3.12.3</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy