cleanup javadoc

diff --git a/cdmlib-commons/README.TXT b/cdmlib-commons/README.TXT
index f881329e9605d06245e780131a299ce894099fc3..3e31f27ec970a993dffe36969f82427e2632d935 100644 (file)
--- a/cdmlib-commons/README.TXT
+++ b/cdmlib-commons/README.TXT
@@ -1,3 +1,3 @@
-The project uses Maven2 and AspectJ.\r
+The project uses Maven3 and AspectJ.\r
 \r
-Please see http://dev.e-taxonomy.eu/trac/wiki/CdmLibrary for details on installation and usage\r
+Please see https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/CdmLibrary for details on installation and usage\r

diff --git a/cdmlib-db/README.TXT b/cdmlib-db/README.TXT
index 5653372e883e90cb9d3929ee6b716f80569317b0..2f9ca120b644d1a375ef0defc22bc1ade4f948c4 100644 (file)
--- a/cdmlib-db/README.TXT
+++ b/cdmlib-db/README.TXT
@@ -1,3 +1,3 @@
 The project uses Maven3.
 
-Please see http://dev.e-taxonomy.eu/trac/wiki/CdmLibrary for details on installation and usage
+Please see https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/CdmLibrary for details on installation and usage

diff --git a/cdmlib-ext/README.TXT b/cdmlib-ext/README.TXT
index f881329e9605d06245e780131a299ce894099fc3..3e31f27ec970a993dffe36969f82427e2632d935 100644 (file)
--- a/cdmlib-ext/README.TXT
+++ b/cdmlib-ext/README.TXT
@@ -1,3 +1,3 @@
-The project uses Maven2 and AspectJ.\r
+The project uses Maven3 and AspectJ.\r
 \r
-Please see http://dev.e-taxonomy.eu/trac/wiki/CdmLibrary for details on installation and usage\r
+Please see https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/CdmLibrary for details on installation and usage\r

diff --git a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/CondensedDistributionRecipe.java b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/CondensedDistributionRecipe.java
index 8a6b4007f0daee76134243dfc849763fb7cbf267..f850bff79a2dfd1d5a791e7be320387206d4362a 100644 (file)
--- a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/CondensedDistributionRecipe.java
+++ b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/CondensedDistributionRecipe.java
@@ -26,7 +26,7 @@ public enum CondensedDistributionRecipe implements IKeyLabel{
      * For reference see:
      * <ul>
      *   <li>{@link http://ww2.bgbm.org/EuroPlusMed/explanations.asp}</li>
-     *   <li>{@link http://dev.e-taxonomy.eu/trac/ticket/3907}</li>
+     *   <li>{@link https://dev.e-taxonomy.eu/redmine/issues/3907}</li>
      * </ul>
      */
     EuroPlusMed("EuroPlusMed", "Euro + Med"),

diff --git a/cdmlib-io/README.TXT b/cdmlib-io/README.TXT
index f881329e9605d06245e780131a299ce894099fc3..3e31f27ec970a993dffe36969f82427e2632d935 100644 (file)
--- a/cdmlib-io/README.TXT
+++ b/cdmlib-io/README.TXT
@@ -1,3 +1,3 @@
-The project uses Maven2 and AspectJ.\r
+The project uses Maven3 and AspectJ.\r
 \r
-Please see http://dev.e-taxonomy.eu/trac/wiki/CdmLibrary for details on installation and usage\r
+Please see https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/CdmLibrary for details on installation and usage\r

diff --git a/cdmlib-model/README.TXT b/cdmlib-model/README.TXT
index f881329e9605d06245e780131a299ce894099fc3..5c8be24c5d7eb57269c3809acb356993a45b8436 100644 (file)
--- a/cdmlib-model/README.TXT
+++ b/cdmlib-model/README.TXT
@@ -1,3 +1,3 @@
 The project uses Maven2 and AspectJ.\r
 \r
-Please see http://dev.e-taxonomy.eu/trac/wiki/CdmLibrary for details on installation and usage\r
+Please see https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/CdmLibrary for details on installation and usage\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/overview.html b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/overview.html
index 2e9665e785ea74292f66aae5124e61ca2cb520e5..9ee17c869b1d54dc46cbf13514eac6d89afb9868 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/overview.html
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/overview.html
@@ -35,7 +35,7 @@ Classes contain EJB3 &amp; Hibernate annotations for the <a href="http://wp5.e-t
 <h2>Related Documentation</h2>\r
 \r
 <ul>\r
-  <li><a href="http://dev.e-taxonomy.eu/trac/wiki/CommonDataModel">EDIT Developer Wiki</a></li>\r
+  <li><a href="https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/CommonDataModel">EDIT Developer Wiki</a></li>\r
 </ul>\r
 \r
 <a name="uml_diagrams"/>\r

diff --git a/cdmlib-model/src/main/resources/terms/PreservationMethod.csv b/cdmlib-model/src/main/resources/terms/PreservationMethod.csv
index 00c6b0c6d7c5d278649b8c0974f9c83a1175d766..4a2b1f5d978ae115ba08a63d3a95c12fdffb34c0 100644 (file)
--- a/cdmlib-model/src/main/resources/terms/PreservationMethod.csv
+++ b/cdmlib-model/src/main/resources/terms/PreservationMethod.csv
@@ -2,5 +2,5 @@
 \r
 TODO use TDWG Vocabulary instead: http://rs.tdwg.org/ontology/voc/Collection.rdf#SpecimenPreservationMethodTypeTerm\r
 \r
-https://dev.e-taxonomy.eu/trac/ticket/3715\r
+https://dev.e-taxonomy.eu/redmine/issues/3715\r
 \r

diff --git a/cdmlib-persistence/README.TXT b/cdmlib-persistence/README.TXT
index f881329e9605d06245e780131a299ce894099fc3..3e31f27ec970a993dffe36969f82427e2632d935 100644 (file)
--- a/cdmlib-persistence/README.TXT
+++ b/cdmlib-persistence/README.TXT
@@ -1,3 +1,3 @@
-The project uses Maven2 and AspectJ.\r
+The project uses Maven3 and AspectJ.\r
 \r
-Please see http://dev.e-taxonomy.eu/trac/wiki/CdmLibrary for details on installation and usage\r
+Please see https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/CdmLibrary for details on installation and usage\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/UpdatableRoutingDataSource.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/UpdatableRoutingDataSource.java
index 8a7aeb2f26130b6ba5f5471389c5d4206b8a041b..28eeeaa11cac90f0688cd3ea9b6b73304e8ca9ea 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/UpdatableRoutingDataSource.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/UpdatableRoutingDataSource.java
@@ -5,7 +5,7 @@
 *\r
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
-*/ \r
+*/\r
 \r
 package eu.etaxonomy.cdm.database;\r
 \r
@@ -23,9 +23,9 @@ import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
 \r
 /**\r
  * A simple RoutingDataSource.\r
- * Bean definitions must set the key of the default datasource to "default" \r
+ * Bean definitions must set the key of the default datasource to "default"\r
  * This String is defined in the contant <code>DEFAULT_DATASOURCE_KEY</code> and will\r
- * be used when the RoutingDataSource is beeing updated with a new <code>Map</code> \r
+ * be used when the RoutingDataSource is beeing updated with a new <code>Map</code>\r
  * of data sources.\r
  * <p>\r
  * <b>Example of bean definition:</b>\r
@@ -39,20 +39,20 @@ import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
                &lt;property name="defaultTargetDataSource" ref="defaultDataSource"/&gt;\r
    &lt;/bean&gt;\r
    </pre>\r
- * \r
+ *\r
  * @author a.kohlbecker\r
- * @deprecated<b>NOTICE:</b> \r
- * <em>This class is related to the switchable database infrastructure which allows to serve \r
- * multiple databases with only a single instance of the cdm-remote-webapp. \r
+ * @deprecated<b>NOTICE:</b>\r
+ * <em>This class is related to the switchable database infrastructure which allows to serve\r
+ * multiple databases with only a single instance of the cdm-remote-webapp.\r
  * This concept however is deprecated due to several problems of which the most severe is the term loading issue.\r
- * This class should however not deleted since we once might wish to switch back to this concept when we are \r
- * able to deal with the implicated issues. \r
- * \r
- * See http://dev.e-taxonomy.eu/trac/wiki/CdmServerSwitchableDataSources for more information.</em>\r
+ * This class should however not deleted since we once might wish to switch back to this concept when we are\r
+ * able to deal with the implicated issues.\r
+ *\r
+ * See https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/CdmServerSwitchableDataSources for more information.</em>\r
  */\r
 @Deprecated\r
 public class UpdatableRoutingDataSource extends AbstractRoutingDataSource {\r
-       \r
+\r
 \r
        private String defaultDatasourceName = "default";\r
 \r
@@ -60,26 +60,26 @@ public class UpdatableRoutingDataSource extends AbstractRoutingDataSource {
        protected Object determineCurrentLookupKey() {\r
                return NamedContextHolder.getContextKey();\r
        }\r
-       \r
+\r
        @Override\r
        public void afterPropertiesSet() {\r
                updateDataSources();\r
                // super.afterPropertiesSet() is called by updateRoutingDataSource()\r
        }\r
-       \r
+\r
        public void setDefaultDatasourceName(String name){\r
                this.defaultDatasourceName = name;\r
        }\r
-       \r
-       \r
 \r
-       \r
+\r
+\r
+\r
        public Map<String, DataSourceInfo> updateDataSources() {\r
-               \r
+\r
                logger.info("loading & testing datasources .. ");\r
                Map<String,SimpleDriverDataSource> dataSources = loadDataSources();\r
                Map<String, DataSourceInfo> dataSourceInfos = testDataSources(dataSources);\r
-               \r
+\r
                setTargetDataSources((Map)dataSources);\r
                DataSource defaultDatasource = dataSources.get(defaultDatasourceName);\r
                if(defaultDatasource == null) {\r
@@ -87,10 +87,10 @@ public class UpdatableRoutingDataSource extends AbstractRoutingDataSource {
                }\r
                setDefaultTargetDataSource(defaultDatasource);\r
                super.afterPropertiesSet();\r
-               \r
+\r
                return dataSourceInfos;\r
        }\r
-       \r
+\r
        protected Map<String, SimpleDriverDataSource> loadDataSources(){\r
                return DataSourceBeanLoader.loadDataSources(SimpleDriverDataSource.class);\r
        }\r
@@ -100,7 +100,7 @@ public class UpdatableRoutingDataSource extends AbstractRoutingDataSource {
         * @return\r
         */\r
        protected Map<String, DataSourceInfo> testDataSources(Map<String, SimpleDriverDataSource> dataSources) {\r
-               \r
+\r
                Map<String, DataSourceInfo> dataSourceInfos = new HashMap<String, DataSourceInfo>();\r
 \r
                for(String key : dataSources.keySet()){\r
@@ -121,12 +121,13 @@ public class UpdatableRoutingDataSource extends AbstractRoutingDataSource {
                        logger.info("    /" + key + " => "+ datasource.getUrl() + "[ "+(sqlerror == null ? "OK" : "ERROR: " + sqlerror) + " ]");\r
                        dataSourceInfos.put(key, dsi);\r
                }\r
-               \r
+\r
                return dataSourceInfos;\r
        }\r
 \r
        // added for compatibility with Java 7\r
-       public Logger getParentLogger() /* throws SQLFeatureNotSupportedException (is not compatibel with parent class in Java 6)*/  {\r
+       @Override\r
+    public Logger getParentLogger() /* throws SQLFeatureNotSupportedException (is not compatibel with parent class in Java 6)*/  {\r
                // TODO Auto-generated method stub\r
                return null;\r
        }\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/ClassificationDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/ClassificationDaoHibernateImpl.java
index 999b1d5d2bde49a2ec94599c7c492b17c5436800..8708b29697d566a36c8927c6dea01ad3befe45d3 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/ClassificationDaoHibernateImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/ClassificationDaoHibernateImpl.java
@@ -98,8 +98,8 @@ public class ClassificationDaoHibernateImpl
     }\r
 \r
     /**\r
-     * See <a href="http://dev.e-taxonomy.eu/trac/wiki/CdmClassificationRankSpecificRootnodes">\r
-     * http://dev.e-taxonomy.eu/trac/wiki/CdmClassificationRankSpecificRootnodes</a>\r
+     * See <a href="https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/CdmClassificationRankSpecificRootnodes">\r
+     * https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/CdmClassificationRankSpecificRootnodes</a>\r
      *\r
      * @param classification\r
      * @param rank\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/IClassificationDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/IClassificationDao.java
index 8654616e46757cf87e10b2fce8ae2fa946e1559f..db362f7b1bef250a39b423f5c7acad6dc63fd653 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/IClassificationDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/IClassificationDao.java
@@ -36,7 +36,7 @@ public interface IClassificationDao extends IIdentifiableDao<Classification> {
      * associated with the next lower Rank is taken as root node. If the\r
      * <code>rank</code> is null the absolute root nodes will be returned.\r
      * <p>\r
-     * See <a href="http://dev.e-taxonomy.eu/trac/wiki/CdmClassificationRankSpecificRootnodes">http://dev.e-taxonomy.eu/trac/wiki/CdmClassificationRankSpecificRootnodes</a>\r
+     * See <a href="https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/CdmClassificationRankSpecificRootnodes">https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/CdmClassificationRankSpecificRootnodes</a>\r
      * <p>\r
      * Since this method is using two queries which need to be run sequentially\r
      * the handling of limit and start is more complex and requires the total\r

diff --git a/cdmlib-persistence/src/test/resources/c3p0-config.xml b/cdmlib-persistence/src/test/resources/c3p0-config.xml
index 4e7e3d9cf81a6497d92889753c842c3cd1880bfd..1e6d56c4cfa7654379276a9f2ed88e757cc3aaa3 100644 (file)
--- a/cdmlib-persistence/src/test/resources/c3p0-config.xml
+++ b/cdmlib-persistence/src/test/resources/c3p0-config.xml
@@ -6,7 +6,7 @@
        This property causes problems in tests as the table\r
        is not found in the test database. Maybe we can fix \r
        this one day.\r
-       see also http://dev.e-taxonomy.eu/trac/ticket/3344\r
+       see also https://dev.e-taxonomy.eu/redmine/issues/3344\r
         -->\r
        \r
        <!--\r

diff --git a/cdmlib-remote-webapp/pom.xml b/cdmlib-remote-webapp/pom.xml
index da93fd77f22ceac00ac7b5a6fe2218121dd4b1d8..e6c0a8a389bc654e0fb945dffe3e299ad0e0530d 100755 (executable)
--- a/cdmlib-remote-webapp/pom.xml
+++ b/cdmlib-remote-webapp/pom.xml
@@ -133,7 +133,7 @@
       <artifactId>cdmlib-remote</artifactId>
       <exclusions>
         <!-- exclude all jdbc drivers from the war. Jdbc drivers must only 
-          be added to {APPLICATION_CONTAINER}/lib see http://dev.e-taxonomy.eu/trac/ticket/4955 
+          be added to {APPLICATION_CONTAINER}/lib see https://dev.e-taxonomy.eu/redmine/issues/4955 
           and http://stackoverflow.com/questions/6981564/why-must-the-jdbc-driver-be-put-in-tomcat-home-lib-folder -->
         <exclusion>
           <groupId>eu.etaxonomy</groupId>

diff --git a/cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/config/CdmSpringMVCConfig.java b/cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/config/CdmSpringMVCConfig.java
index 07ce131f6461d97d1f7f65a45eaa8c1ef4728709..069d9f2cc1a655ae120f5fa0e85a33ed0fe40fc1 100644 (file)
--- a/cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/config/CdmSpringMVCConfig.java
+++ b/cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/config/CdmSpringMVCConfig.java
@@ -45,7 +45,7 @@ import eu.etaxonomy.cdm.remote.view.PatternViewResolver;
  * <h3>NOTE:</h3>
  *  For a detailed overview on the spring MVC and application context configuration and
  *  bootstrapping of this web application see:
- *  {@link http://dev.e-taxonomy.eu/trac/wiki/cdmlib-remote-webappConfigurationAndBootstrapping}
+ *  {@link https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/cdmlib-remote-webappConfigurationAndBootstrapping}
  *
  *
  * @author a.kohlbecker

diff --git a/cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/staticSwagger/StaticSwaggerApiDoc.java b/cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/staticSwagger/StaticSwaggerApiDoc.java
index e4271e64726cbdc64f611f296e1ad2bf607838b5..1e8fa296f480dedbf5055e39fd41fd5d6afe2ef8 100644 (file)
--- a/cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/staticSwagger/StaticSwaggerApiDoc.java
+++ b/cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/staticSwagger/StaticSwaggerApiDoc.java
@@ -33,20 +33,16 @@ import eu.etaxonomy.cdm.remote.controller.HttpStatusMessage;
  * <p>
  * The static api doc files are created by the integration test class <code>SwaggerStaticIT</code>.
  * <p>
- * For more details see {@link http://dev.e-taxonomy.eu/trac/wiki/cdmlib-remote-webappConfigurationAndBootstrapping}
+ * For more details see {@link https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/cdmlib-remote-webappConfigurationAndBootstrapping}
  *
  * @author a.kohlbecker
  * @since Feb 22, 2016
- *
  */
-
 @Controller
 public class StaticSwaggerApiDoc {
 
-
     public static final Logger logger = Logger.getLogger(StaticSwaggerApiDoc.class);
 
-
     public static final String SWAGGER_STATIC = "swagger-static";
     public static final String JSON = ".json";
     public static final String HOST = "{HOST}";
@@ -128,5 +124,4 @@ public class StaticSwaggerApiDoc {
             }
         }
     }
-
-}
+}
\ No newline at end of file

diff --git a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 9a6e4c5e640c1dc415bc060a3d78b7450ab534e8..9b88c2bdcca246d839367f3d8e6425b2ae60c8ff 100644 (file)
--- a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -12,7 +12,7 @@
     NOTE: 
     For a detailed overview on the spring MVC and application context configuration and 
     bootstrapping of this web application see: 
-    http://dev.e-taxonomy.eu/trac/wiki/cdmlib-remote-webappConfigurationAndBootstrapping
+    https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/cdmlib-remote-webappConfigurationAndBootstrapping
   -->
   
   <context:annotation-config />

diff --git a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/cdmlib-remote-servlet.xml b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/cdmlib-remote-servlet.xml
index 70db6e15f428c721edad964ba8099c78e28ddf7e..a8791158caf63890e27318b9c129bd8db7993fef 100644 (file)
--- a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/cdmlib-remote-servlet.xml
+++ b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/cdmlib-remote-servlet.xml
@@ -11,7 +11,7 @@
     NOTE: 
     For a detailed overview on the spring MVC and application context configuration and 
     bootstrapping of this web application see: 
-    http://dev.e-taxonomy.eu/trac/wiki/cdmlib-remote-webappConfigurationAndBootstrapping
+    https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/cdmlib-remote-webappConfigurationAndBootstrapping
    -->
   <!-- 
     Initialize SpringMVCConfig and its dependency SpringSwaggerConfig.

diff --git a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/web.xml b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/web.xml
index d1049ee5ad100ca5d602a3082df9e7cbf43d48b2..93c3d40e03ba059e46dc13c660764c8abcad1f18 100644 (file)
--- a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/web.xml
@@ -6,7 +6,7 @@
   <!-- 
        NOTE: For a detailed overview on the spring MVC and application context 
        configuration and bootstrapping of this web application 
-       see: http://dev.e-taxonomy.eu/trac/wiki/cdmlib-remote-webappConfigurationAndBootstrapping 
+       see: https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/cdmlib-remote-webappConfigurationAndBootstrapping 
   -->
 
   <description>cdmlib-remote web-application instance</description>

diff --git a/cdmlib-remote-webapp/src/test/java/eu/etaxonomy/cdm/remote/config/CdmSwaggerConfig.java b/cdmlib-remote-webapp/src/test/java/eu/etaxonomy/cdm/remote/config/CdmSwaggerConfig.java
index c61e7700200f41aa3a73df352b7d9719c546502f..6d961618f0b87242b71aa7d9e933e2aaab26c979 100644 (file)
--- a/cdmlib-remote-webapp/src/test/java/eu/etaxonomy/cdm/remote/config/CdmSwaggerConfig.java
+++ b/cdmlib-remote-webapp/src/test/java/eu/etaxonomy/cdm/remote/config/CdmSwaggerConfig.java
@@ -23,19 +23,19 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 
+import eu.etaxonomy.cdm.model.CdmAssignableTypeFilter;
+import eu.etaxonomy.cdm.model.CdmTypeScanner;
+import eu.etaxonomy.cdm.model.common.CdmBase;
 import springfox.documentation.service.ApiInfo;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
-import eu.etaxonomy.cdm.model.CdmAssignableTypeFilter;
-import eu.etaxonomy.cdm.model.CdmTypeScanner;
-import eu.etaxonomy.cdm.model.common.CdmBase;
 
 /**
  * <h3>NOTE:</h3>
  *  For a detailed overview on the spring MVC and application context configuration and
  *  bootstrapping of this web application see:
- *  {@link http://dev.e-taxonomy.eu/trac/wiki/cdmlib-remote-webappConfigurationAndBootstrapping}
+ *  {@link https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/cdmlib-remote-webappConfigurationAndBootstrapping}
  *
  *
  */

diff --git a/cdmlib-remote/README.TXT b/cdmlib-remote/README.TXT
index ac2c9bc2c6fd28d295b90ea0834c8b0207823c18..d5525acaa16fdbe14c36ea6618c026fb497044cb 100644 (file)
--- a/cdmlib-remote/README.TXT
+++ b/cdmlib-remote/README.TXT
@@ -1,6 +1,6 @@
-The project uses Maven2 and AspectJ.\r
+The project uses Maven3 and AspectJ.\r
 \r
-Please see http://dev.e-taxonomy.eu/trac/wiki/CdmLibrary for details on installation and usage\r
+Please see https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/CdmLibrary for details on installation and usage\r
 \r
 ***Deploying to Application Server***\r
 The POM contains deployment plugins for TOMCAT and also JETTY.\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/interceptor/DatasourceContextHandlerInterceptor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/interceptor/DatasourceContextHandlerInterceptor.java
index 56ace9089061b2b73a88d45ba1e42d61f988ecaf..9bd094ef8ad35fe1e8fe15e11508f069f4c729f1 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/interceptor/DatasourceContextHandlerInterceptor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/interceptor/DatasourceContextHandlerInterceptor.java
@@ -1,8 +1,8 @@
 /**\r
 * Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
 * http://www.e-taxonomy.eu\r
-* \r
+*\r
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
@@ -22,21 +22,21 @@ import eu.etaxonomy.cdm.database.NamedContextHolder;
 \r
 /**\r
  * @author a.kohlbecker\r
- * @deprecated<b>NOTICE:</b> \r
- * <em>This class is related to the switchable database infrastructure which allows to serve \r
- * multiple databases with only a single instance of the cdm-remote-webapp. \r
+ * @deprecated<b>NOTICE:</b>\r
+ * <em>This class is related to the switchable database infrastructure which allows to serve\r
+ * multiple databases with only a single instance of the cdm-remote-webapp.\r
  * This concept however is deprecated due to several problems of which the most severe is the term loading issue.\r
- * This class should however not deleted since we once might wish to switch back to this concept when we are \r
- * able to deal with the implicated issues. \r
- * \r
- * See http://dev.e-taxonomy.eu/trac/wiki/CdmServerSwitchableDataSources for more information.</em>\r
+ * This class should however not deleted since we once might wish to switch back to this concept when we are\r
+ * able to deal with the implicated issues.\r
+ *\r
+ * See https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/CdmServerSwitchableDataSources for more information.</em>\r
  */\r
 @Deprecated\r
 public class DatasourceContextHandlerInterceptor extends HandlerInterceptorAdapter {\r
        private static final Logger logger = Logger.getLogger(DatasourceContextHandlerInterceptor.class);\r
-       \r
+\r
        private final static Pattern basepathPattern = Pattern.compile("^/([^/]+)/.*");\r
-       \r
+\r
        @Override\r
        public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {\r
                Matcher matcher = basepathPattern.matcher(request.getServletPath());\r
@@ -55,6 +55,6 @@ public class DatasourceContextHandlerInterceptor extends HandlerInterceptorAdapt
        public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {\r
                NamedContextHolder.clearContextKey();\r
                logger.info("datasource context cleared");\r
-               \r
+\r
        }\r
 }\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/JsonConfigFactoryBean.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/JsonConfigFactoryBean.java
index 8bdcc6c832cbaea12b9fe0d74f9550fdc46fe19b..67724eaf553b294cfc60227606a41396ece526af 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/JsonConfigFactoryBean.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/JsonConfigFactoryBean.java
@@ -17,6 +17,7 @@ import java.util.Map;
 import org.apache.log4j.Logger;\r
 import org.springframework.beans.factory.FactoryBean;\r
 \r
+import eu.etaxonomy.cdm.remote.json.processor.bean.AbstractCdmBeanProcessor;\r
 import net.sf.json.JsonConfig;\r
 import net.sf.json.processors.DefaultValueProcessor;\r
 import net.sf.json.processors.DefaultValueProcessorMatcher;\r
@@ -90,7 +91,7 @@ public class JsonConfigFactoryBean implements FactoryBean<JsonConfig> {
         *             retrieve the object graph in question with an appropriate\r
         *             initialization strategy.</li>\r
         *             </ol>\r
-        * <strong>please see also http://dev.e-taxonomy.eu/trac/wiki/CdmEntityInitalization</strong>\r
+        * <strong>please see also https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/CdmEntityInitalization</strong>\r
         *\r
         * @param ignoreJPATransient\r
         */\r

diff --git a/cdmlib-services/README.TXT b/cdmlib-services/README.TXT
index f881329e9605d06245e780131a299ce894099fc3..3e31f27ec970a993dffe36969f82427e2632d935 100644 (file)
--- a/cdmlib-services/README.TXT
+++ b/cdmlib-services/README.TXT
@@ -1,3 +1,3 @@
-The project uses Maven2 and AspectJ.\r
+The project uses Maven3 and AspectJ.\r
 \r
-Please see http://dev.e-taxonomy.eu/trac/wiki/CdmLibrary for details on installation and usage\r
+Please see https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/CdmLibrary for details on installation and usage\r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
index ec766c4eba60fb95dc00fac25319e9de9e609633..1bf72967371333f9b436e297fd4ab0f36032079d 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
@@ -1771,7 +1771,7 @@ public class TaxonServiceImpl
      * Uses org.apache.lucene.search.join.JoinUtil for query time joining, alternatively
      * the BlockJoinQuery could be used. The latter might be more memory save but has the
      * drawback of requiring to do the join an indexing time.
-     * see  http://dev.e-taxonomy.eu/trac/wiki/LuceneNotes#JoinsinLucene for more information on this.
+     * see  https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/LuceneNotes#JoinsinLucene for more information on this.
      *
      * Joins TaxonRelationShip with Taxon depending on the direction of the given edge:
      * <ul>

diff --git a/cdmlib-test/README.TXT b/cdmlib-test/README.TXT
index 5653372e883e90cb9d3929ee6b716f80569317b0..2f9ca120b644d1a375ef0defc22bc1ade4f948c4 100644 (file)
--- a/cdmlib-test/README.TXT
+++ b/cdmlib-test/README.TXT
@@ -1,3 +1,3 @@
 The project uses Maven3.
 
-Please see http://dev.e-taxonomy.eu/trac/wiki/CdmLibrary for details on installation and usage
+Please see https://dev.e-taxonomy.eu/redmine/projects/edit/wiki/CdmLibrary for details on installation and usage

diff --git a/cdmlib-test/src/main/resources/c3p0-config.xml b/cdmlib-test/src/main/resources/c3p0-config.xml
index 97bb3dc5653c5a3aefb8316bfe8cdc1af40e6035..96010866795980d3a40a5cb9d20dc4afd3d7a611 100644 (file)
--- a/cdmlib-test/src/main/resources/c3p0-config.xml
+++ b/cdmlib-test/src/main/resources/c3p0-config.xml
@@ -6,7 +6,7 @@
        This property causes problems in tests as the table
        is not found in the test database. Maybe we can fix 
        this one day.
-       see also http://dev.e-taxonomy.eu/trac/ticket/3344
+       see also https://dev.e-taxonomy.eu/redmine/issues/3344
         -->
        
        <!--