replace cybertaxonomy.eu by cybertaxonomy.org in taxeditor

diff --git a/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin.properties b/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin.properties
index 25c5979651f3b9f41f8d795ea78af0650dbcd588..4ea77b4e696a9e780e55775f8baad3b41404ba1c 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin.properties
+++ b/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin.properties
@@ -1,7 +1,7 @@
 productName=EDIT Taxonomic Editor\r
 productBlurb=EDIT Taxonomic Editor\n\Version: {0}\nBuild Date: {1} CET\n\n\\r
 Copyright (C) 2009-2018 EDIT\n\European Distributed Institute of Taxonomy \n\\r
-http://cybertaxonomy.eu/ \n\n\\r
+https://cybertaxonomy.org/ \n\n\\r
 The contents of this product are subject to the Mozilla Public License Version 1.1,  \n\\r
 You may not use this product except in compliance with the License. \n\\r
 You may obtain a copy of the License at http://www.mozilla.org/MPL/ \n\\r

diff --git a/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin_de.properties b/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin_de.properties
index cd8799999c01eaa00c9976f42fcf445cdfc8b3e3..76b905e12d2b4561600e73433d18c3260ed8e03e 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin_de.properties
+++ b/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin_de.properties
@@ -1,7 +1,7 @@
 productName=EDIT Taxonomischer Editor
 productBlurb=EDIT Taxonomischer Editor\n\Version: {0}\nBuild Date: {1} CET\n\n\
 Copyright (C) 2009-2014 EDIT\n\European Distributed Institute of Taxonomy \n\
-http://cybertaxonomy.eu/ \n\n\
+https://cybertaxonomy.org/ \n\n\
 The contents of this product are subject to the Mozilla Public License Version 1.1  \n\
 You may not use this product except in compliance with the License. \n\
 You may obtain a copy of the License at http://www.mozilla.org/MPL/ \n\

diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
index 9c838afab10724aed3bf968f0bc75362897b3f93..a3c9d9caaf807b39a69e0278c9c4b6dc9c233944 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
@@ -8,7 +8,7 @@
       arch="x86,x86_64">\r
 \r
    <url>\r
-      <update label="EDIT Taxonomic Editor" url="https://cybertaxonomy.eu/taxeditor/update"/>\r
+      <update label="EDIT Taxonomic Editor" url="https://cybertaxonomy.org/taxeditor/update"/>\r
    </url>\r
 \r
    <includes\r

diff --git a/eu.etaxonomy.taxeditor.feature/feature.xml b/eu.etaxonomy.taxeditor.feature/feature.xml
index 492772a1974f9a13e6785f0a855f195a722496e0..4f04a30777c2f06ec13b4eb27b94a1f8197e8ae2 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature/feature.xml
@@ -18,7 +18,7 @@
    </copyright>\r
 \r
    <url>\r
-      <update label="EDIT Taxonomic Editor" url="http://cybertaxonomy.eu/download/taxeditor/update/"/>\r
+      <update label="EDIT Taxonomic Editor" url="http://cybertaxonomy.org/download/taxeditor/update/"/>\r
    </url>\r
 \r
    <includes\r

diff --git a/eu.etaxonomy.taxeditor.help/html/gettingstarted/downloading_the_taxonomic_editor.html b/eu.etaxonomy.taxeditor.help/html/gettingstarted/downloading_the_taxonomic_editor.html
index 66628ef453a9d210bb1dbcb1cdde752aecbe6be0..66a4ccd10bd9b63e59d9b9941e96d73afd8d01d5 100644 (file)
--- a/eu.etaxonomy.taxeditor.help/html/gettingstarted/downloading_the_taxonomic_editor.html
+++ b/eu.etaxonomy.taxeditor.help/html/gettingstarted/downloading_the_taxonomic_editor.html
@@ -9,7 +9,7 @@
                        <img src="../img/cybergate.jpg" alt="Platform Cybergate" />
                </p>
                <p>You will be taken to the Taxonomic Editor Download Site.</p>
-               <p>Alternatively, you can access the download site directly by entering <a href="https://cybertaxonomy.eu/downlaod/taxeditor">https://cybertaxonomy.eu/downlaod/taxeditor</a> into the address bar of your browser.</p>
+               <p>Alternatively, you can access the download site directly by entering <a href="https://cybertaxonomy.org/download/taxeditor">https://cybertaxonomy.org/download/taxeditor</a> into the address bar of your browser.</p>
        </li>
        <li>Click on the download link and then navigate to the latest version of the Taxonomic Editor 
        

diff --git a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/handler/ExportSequenceToFileHandlerE4.java b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/handler/ExportSequenceToFileHandlerE4.java
index 204bd1f7c953171e8b408c67ba57fdd115ade542..2a987471015a8c59ad913a9739e459d18e59b738 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/handler/ExportSequenceToFileHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/handler/ExportSequenceToFileHandlerE4.java
@@ -67,7 +67,7 @@ public class ExportSequenceToFileHandlerE4 {
             ReadWriteParameterMap parameters = new ReadWriteParameterMap();
             parameters.put(ReadWriteParameterNames.KEY_APPLICATION_NAME, ApplicationUtil.getTitle());
             //parameters.put(ReadWriteParameterNames.KEY_APPLICATION_VERSION, ApplicationUtil.getVersion());  // Setting the version unnecessary, since its already contained in the title.
-            parameters.put(ReadWriteParameterNames.KEY_APPLICATION_URL, "http://cybertaxonomy.eu/taxeditor/");  //TODO Specify URL obtained from a central class? //$NON-NLS-1$
+            parameters.put(ReadWriteParameterNames.KEY_APPLICATION_URL, "https://cybertaxonomy.org/taxeditor/");  //TODO Specify URL obtained from a central class? //$NON-NLS-1$
             parameters.put(ReadWriteParameterNames.KEY_SEQUENCE_EXTENSION_TOKEN, wizard.getModel().getElongationToken());
 
             // Create and register object translator for writing pherogram alignment shifts:

diff --git a/eu.etaxonomy.taxeditor.printpublisher/pom.xml b/eu.etaxonomy.taxeditor.printpublisher/pom.xml
index 0b1ede88da786ada2b77906342f70e895bb4231e..dbc5fb32af0fb0483a3885748eb5ec269f0a1a62 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/pom.xml
+++ b/eu.etaxonomy.taxeditor.printpublisher/pom.xml
@@ -12,7 +12,7 @@
        
        <name>Printpublisher Bundle</name>
        <description />
-       <url>http://cybertaxonomy.eu/printpublisher</url>
+       <url>http://cybertaxonomy.org/printpublisher</url>
        <build>
                <plugins>
              <plugin>

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/update/P2Util.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/update/P2Util.java
index 1cd9530e4a252721a082afcde439c0841391dee2..320b7a31c5f8b39eedc2b96518442ee1fb2a4c1c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/update/P2Util.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/update/P2Util.java
@@ -32,10 +32,10 @@ import eu.etaxonomy.taxeditor.util.ApplicationUtil;
  */
 public class P2Util {
 
-    private static String EDIT_NIGHTLY_UPDATE_SITE = "https://cybertaxonomy.eu/download/taxeditor/update/nightly/";
+    private static String EDIT_NIGHTLY_UPDATE_SITE = "https://cybertaxonomy.org/download/taxeditor/update/nightly/";
     private static String EDIT_NIGHTLY_UPDATE_SITE_NAME = "Taxonomic Editor Nightly";
 
-    private static String EDIT_STABLE_UPDATE_SITE = "https://cybertaxonomy.eu/download/taxeditor/update/stable/";
+    private static String EDIT_STABLE_UPDATE_SITE = "https://cybertaxonomy.org/download/taxeditor/update/stable/";
     private static String EDIT_STABLE_UPDATE_SITE_NAME = "Taxonomic Editor Stable";
 
     /**

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/GoogleLanguageApiWrapper.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/GoogleLanguageApiWrapper.java
index 36da017d110c9b9b5980dc81eebf092701f877d7..5b884034055597fd58d1537865ff4660d148f299 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/GoogleLanguageApiWrapper.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/GoogleLanguageApiWrapper.java
@@ -14,9 +14,9 @@ package eu.etaxonomy.taxeditor.ui.translation;
 
 /**
  * <p>GoogleLanguageApiWrapper class.</p>
- * 
+ *
  * NOTE: This class was commented to be able to remove google-api-translate-java-xxx.jar from classpath
- * 
+ *
  * @author n.hoffmann
  * @created Oct 21, 2010
  * @deprecated Should not be used as the Google translation service is not free anymore
@@ -27,7 +27,7 @@ public class GoogleLanguageApiWrapper /* implements ITranslationServiceWrapper *
 //     @Override
 //     public String translate(String text, Language source, Language target) throws LanguageNotSupportedException {
 //             // TODO make this configurable in preferences
-//             Translate.setHttpReferrer("http://cybertaxonomy.eu");
+//             Translate.setHttpReferrer("https://cybertaxonomy.org");
 //
 //             String translated;
 //             try {

diff --git a/eu.etaxonomy.taxeditor.test/src/test/resources/imports/SDD.xml b/eu.etaxonomy.taxeditor.test/src/test/resources/imports/SDD.xml
index 4154c284054dd75ddc488a0398e06769ff80890a..b2c59b184cf0bac6bf8a790ac97dba5259cf2440 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/resources/imports/SDD.xml
+++ b/eu.etaxonomy.taxeditor.test/src/test/resources/imports/SDD.xml
@@ -966,7 +966,7 @@
                     <Detail role="Caption">Dolichoderinae</Detail>
                 </Representation>
                 <Type>Image</Type>
-                <Source href="http://cybertaxonomy.eu/sites/wp5.e-taxonomy.eu/files/cybergate.PNG"/>
+                <Source href="https://cybertaxonomy.org/sites/wp5.e-taxonomy.eu/files/cybergate.PNG"/>
             </MediaObject>
             <MediaObject id="m2">
                 <Representation>
@@ -974,7 +974,7 @@
                     <Detail role="Caption">Dolichoderinae</Detail>
                 </Representation>
                 <Type>Image</Type>
-                <Source href="http://cybertaxonomy.eu/sites/wp5.e-taxonomy.eu/files/cybergate.PNG"/>
+                <Source href="https://cybertaxonomy.org/sites/wp5.e-taxonomy.eu/files/cybergate.PNG"/>
             </MediaObject>
         </MediaObjects>
     </Dataset>

diff --git a/eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/OpenExternalAboutPlatformHandler.java b/eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/OpenExternalAboutPlatformHandler.java
index a95f20481a1a5dca1ee189ef33f2ab3839622de1..acc46179b2483efc5de85414341aef7c77e48e3b 100644 (file)
--- a/eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/OpenExternalAboutPlatformHandler.java
+++ b/eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/OpenExternalAboutPlatformHandler.java
@@ -23,7 +23,7 @@ public class OpenExternalAboutPlatformHandler {
 
        @Execute
        public Object execute() {
-               String url = "https://cybertaxonomy.eu/";
+               String url = "https://cybertaxonomy.org/";
 
                try {
             WorkbenchUtility.openWebpage(new URL(url));

diff --git a/eu.etaxonomy.taxeditor/deploy_nightly.sh b/eu.etaxonomy.taxeditor/deploy_nightly.sh
index 0b1fa5b54707a8326f672cb8d742a2ad5a0ca0c3..99fdcb6dfb249cdb12c6bf0e49711bf910119d57 100755 (executable)
--- a/eu.etaxonomy.taxeditor/deploy_nightly.sh
+++ b/eu.etaxonomy.taxeditor/deploy_nightly.sh
@@ -5,7 +5,7 @@
 
 PRODUCT_DIR="$WORKSPACE/eu.etaxonomy.taxeditor/target/products"
 
-DEPLOYMENT_SERVER="cybertaxonomy.eu"
+DEPLOYMENT_SERVER="cybertaxonomy.org"
 DEPLOYMENT_DIR="/var/www/download/taxeditor/nightly"
 
 # bash check if directory exists

diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
index 2f7a0a7e5d533a167db5615bf0eebfa2db52fb36..3f42702773c14ebe8fedcff07345e90c0f1ae8fb 100644 (file)
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -11,7 +11,7 @@
 
   <name>EDIT Taxonomic Editor Product</name>
   <description>The EDIT Taxonomic Desktop Editor</description>
-  <url>https://cybertaxonomy.eu/taxeditor</url>
+  <url>https://cybertaxonomy.org/taxeditor</url>
   <properties>
     <product.id>eu.etaxonomy.taxeditor.product</product.id>
   </properties>
@@ -119,7 +119,7 @@
                 <goal>sshexec</goal>
               </goals>
               <configuration>
-                <url>scp://cybertaxonomy.eu</url>
+                <url>scp://cybertaxonomy.org</url>
                 <commands>
                   <command>rm -r /var/www/download/taxeditor/update/${update.dir}/*</command>
                 </commands>
@@ -135,14 +135,14 @@
             </executions>
             <configuration>
               <fromDir>${project.build.directory}/repository</fromDir>
-              <url>scpexe://cybertaxonomy.eu/var/www/download/taxeditor/update/${update.dir}</url>
+              <url>scpexe://cybertaxonomy.org/var/www/download/taxeditor/update/${update.dir}</url>
 <!--               <includes> -->
 <!--                 binary/*,content.jar,artifacts.jar,**/eu.etaxonomy.*.jar -->
 <!--               </includes> -->
               <!-- Comment out the above and uncomment the below to upload 
                 all jars -->
               <includes>**/*</includes>
-              <serverId>cybertaxonomy.eu</serverId>
+              <serverId>cybertaxonomy.org</serverId>
             </configuration>
           </plugin>
         </plugins>

diff --git a/pom.xml b/pom.xml
index 529132907b9458a4f6a2ae12fe61dedbef2eb548..79e4980d7ef0977de99b1ff96dfe73ad1aea90ec 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy
   </description>
-  <url>https://cybertaxonomy.eu/taxeditor
+  <url>https://cybertaxonomy.org/taxeditor
   </url>
   <inceptionYear>2007</inceptionYear>
   <packaging>pom</packaging>
@@ -168,7 +168,7 @@
     <!-- the cdm internal repository -->
     <repository>
       <id>EditRepository</id>
-      <url>https://cybertaxonomy.eu/mavenrepo/</url>
+      <url>https://cybertaxonomy.org/mavenrepo/</url>
     </repository>
     <repository>
       <id>eclipse-indigo</id>
@@ -195,7 +195,7 @@
     <pluginRepository>
       <!-- required for the plugin dependency cdmlib-db of the jetty-maven-plugin -->
       <id>EditRepository</id>
-      <url>https://cybertaxonomy.eu/mavenrepo/</url>
+      <url>https://cybertaxonomy.org/mavenrepo/</url>
     </pluginRepository>
   </pluginRepositories>
   <build>
@@ -270,7 +270,7 @@
         <artifactId>wagon-maven-plugin</artifactId>
         <version>2.0.2</version>
         <configuration>
-          <url>scpexe://cybertaxonomy.eu</url>
+          <url>scpexe://cybertaxonomy.org</url>
           <serverId>cybertaxonomy.eu</serverId>
         </configuration>
         <executions>
@@ -493,14 +493,14 @@
     <site>
       <id>cybertaxonomy.eu</id>
       <name>EDIT Taxonomic Editor</name>
-      <url>scpexe://cybertaxonomy.eu/var/www/wp5.e-taxonomy.eu/taxeditor/
+      <url>scpexe://cybertaxonomy.org/var/www/wp5.e-taxonomy.eu/taxeditor/
       </url>
     </site>
     <repository>
       <uniqueVersion>false</uniqueVersion>
       <id>cybertaxonomy.eu</id>
       <name>Edit Maven Repository</name>
-      <url>scpexe://cybertaxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/
+      <url>scpexe://cybertaxonomy.org/var/www/wp5.e-taxonomy.eu/mavenrepo/
       </url>
     </repository>
   </distributionManagement>

diff --git a/src/site/apt/getting-started.apt b/src/site/apt/getting-started.apt
index 67e374d800d6dd711b395d5eb97d8d7090fb6a1f..2330106b955200a6cb04f32bd838e71c6e60aba0 100644 (file)
--- a/src/site/apt/getting-started.apt
+++ b/src/site/apt/getting-started.apt
@@ -120,7 +120,7 @@ $ mvn validate
 
 ** <eu.etaxonomy.taxeditor.printpublisher>
 
-    This plugin is a frontend and GUI for the <cdmlib-print> module. Please see the {{{http://cybertaxonomy.eu/printpublisher/}according documentation}} for further information.
+    This plugin is a frontend and GUI for the <cdmlib-print> module. Please see the {{{http://cybertaxonomy.org/printpublisher/}according documentation}} for further information.
 
 ** <eu.etaxonomy.taxeditor.application>
 

diff --git a/src/site/site.xml b/src/site/site.xml
index 1c45234b2278d982ad391ac374680f9535c4f25b..b04907cadb25923c01ff3ae991a317c8256ad03e 100644 (file)
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -12,7 +12,7 @@
                        <item name="Manual" href="manual.html"/>
                        <!--item name="FAQ" href="faq.html"/-->
                        <item name="Releases" href="https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/CdmPlatformRoadmap"/>
-                       <item name="Download" href="https://cybertaxonomy.eu/download/taxeditor/stable"/>
+                       <item name="Download" href="https://cybertaxonomy.org/download/taxeditor/stable"/>
                </menu>
                <menu name="Developer">
                        <item name="Getting started" href="getting-started.html"/>