From ff13d277f53b93453792b5fc2df59f5d13183a74 Mon Sep 17 00:00:00 2001
From: Andreas Kohlbecker <a.kohlbecker@bgbm.org>
Date: Wed, 16 Jan 2013 11:45:38 +0000
Subject: [PATCH 1/1] removing init strategies which are replaces by
 MediaAutoInitializer

---
 .../DerivedUnitFacadeController.java          |  4 +-
 .../DerivedUnitFacadePortalController.java    | 44 +++++++++----------
 .../controller/DescriptionController.java     |  3 +-
 .../DescriptionPortalController.java          |  2 +-
 .../controller/NamePortalController.java      |  5 +--
 .../controller/TaxonPortalController.java     | 18 +++-----
 6 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadeController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadeController.java
index 4857c0f8ca..81bf9fc11e 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadeController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadeController.java
@@ -76,7 +76,7 @@ public class DerivedUnitFacadeController extends AbstractController{
         logger.info("doGetDerivedUnitMedia() - " + request.getServletPath());
         ModelAndView mv = new ModelAndView();
         DerivedUnitFacade duf = newFacadeFrom(occurrenceUuid, response,Arrays.asList(new String []{
-                "derivedUnitMedia.representations.parts", "derivedUnitMedia.title"}));
+                "derivedUnitMedia", "derivedUnitMedia.title"}));
         if(duf != null){
             mv.addObject(duf.getDerivedUnitMedia());
         }
@@ -92,7 +92,7 @@ public class DerivedUnitFacadeController extends AbstractController{
         logger.info("doGetFieldObjectMedia() - " + request.getServletPath());
         ModelAndView mv = new ModelAndView();
         DerivedUnitFacade duf = newFacadeFrom(occurrenceUuid, response,Arrays.asList(new String []{
-                "fieldObjectMedia.representations.parts", "fieldObjectMedia.title"}));
+                "fieldObjectMedia", "fieldObjectMedia.title"}));
         mv.addObject(duf.getFieldObjectMedia());
         return mv;
     }
diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadePortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadePortalController.java
index fac72a6712..629a73aaf1 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadePortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadePortalController.java
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2009 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -22,28 +22,28 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @Controller
 @RequestMapping(value = {"/portal/derivedUnitFacade/{uuid}"})
 public class DerivedUnitFacadePortalController extends
-		DerivedUnitFacadeController {
-	
-	public DerivedUnitFacadePortalController(){
-		super();
-		setInitializationStrategy(Arrays.asList(new String []{
-			"*",
-			"titleCache",
+        DerivedUnitFacadeController {
+
+    public DerivedUnitFacadePortalController(){
+        super();
+        setInitializationStrategy(Arrays.asList(new String []{
+            "*",
+            "titleCache",
 //			"gatheringEvent.*",
-			"ecologyAll",
-			"plantDescriptionAll",
-			
+            "ecologyAll",
+            "plantDescriptionAll",
+
 //			"fieldObservation.*",
-			"fieldObjectMedia.representations.parts",
-			
+            "fieldObjectMedia",
+
 //			"derivedUnit.*",
-			"derivedUnitMedia.representations.parts",
-			"derivedUnitDefinitions",
-			
-			"exactLocation.referenceSystem"
-			
-			
-		}));
-	}
+            "derivedUnitMedia",
+            "derivedUnitDefinitions",
+
+            "exactLocation.referenceSystem"
+
+
+        }));
+    }
 
 }
diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java
index 30d22c86fb..bcaf226a26 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java
@@ -85,8 +85,7 @@ public class DescriptionController extends BaseController<DescriptionBase, IDesc
             "elements.sources.citation.authorTeam",
             "elements.sources.nameUsedInSource.originalNameString",
             "elements.multilanguageText",
-            "elements.media.representations.parts",
-            "elements.media.title",
+            "elements.media",
     });
 
     @InitBinder
diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java
index d7fefdf429..babed91bf2 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java
@@ -84,7 +84,7 @@ public class DescriptionPortalController extends BaseController<DescriptionBase,
             "elements.area.level",
             "elements.modifyingText",
             "elements.states.*",
-            "elements.media.representations.parts", // TODO "elements.media" should be sufficient since we have the  MediaAutoInitializer
+            "elements.media",
     });
 
 
diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NamePortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NamePortalController.java
index 70f3046d00..8fb4af30bb 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NamePortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NamePortalController.java
@@ -65,7 +65,7 @@ public class NamePortalController extends BaseController<TaxonNameBase, INameSer
             "typeStatus.representations",
             "typifiedNames",
             "citation.authorTeam.$",
-            "typeSpecimen.media.representations.parts"
+            "typeSpecimen.media"
     });
 
 
@@ -74,8 +74,7 @@ public class NamePortalController extends BaseController<TaxonNameBase, INameSer
             "feature",
             "elements.$",
             "elements.multilanguageText",
-            "elements.media.representations.parts",
-            "elements.media.title",
+            "elements.media",
     });
 
 
diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
index 3727d182d6..926fadfaaf 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
@@ -150,8 +150,7 @@ public class TaxonPortalController extends BaseController<TaxonBase, ITaxonServi
             // taxon descriptions
             "descriptions.elements.area.$",
             "descriptions.elements.multilanguageText",
-            "descriptions.elements.media.representations.parts",
-            "descriptions.elements.media.title",
+            "descriptions.elements.media",
 
             });
 
@@ -250,8 +249,7 @@ public class TaxonPortalController extends BaseController<TaxonBase, ITaxonServi
             "elements.sources.citation.authorTeam",
             "elements.sources.nameUsedInSource.originalNameString",
             "elements.multilanguageText",
-            "elements.media.representations.parts",
-            "elements.media.title",
+            "elements.media",
     });
 
     protected static final List<String> TAXONUSEDESCRIPTION_INIT_STRATEGY = Arrays.asList(new String []{
@@ -265,8 +263,7 @@ public class TaxonPortalController extends BaseController<TaxonBase, ITaxonServi
             "elements.sources.citation.authorTeam",
             "elements.sources.nameUsedInSource.originalNameString",
             "elements.multilanguageText",
-            "elements.media.representations.parts",
-            "elements.media.title",
+            "elements.media",
     });
 
     protected static final List<String> DESCRIPTION_ELEMENT_INIT_STRATEGY = Arrays.asList(new String []{
@@ -274,8 +271,7 @@ public class TaxonPortalController extends BaseController<TaxonBase, ITaxonServi
             "sources.citation.authorTeam",
             "sources.nameUsedInSource.originalNameString",
             "multilanguageText",
-            "media.representations.parts",
-            "media.title",
+            "media",
     });
 
 
@@ -284,13 +280,11 @@ public class TaxonPortalController extends BaseController<TaxonBase, ITaxonServi
 //			"feature",
 //			"elements.$",
 //			"elements.multilanguageText",
-//			"elements.media.representations.parts",
-//			"elements.media.title",
+//			"elements.media",
 //	});
 
     protected static final List<String> TAXONDESCRIPTION_MEDIA_INIT_STRATEGY = Arrays.asList(new String []{
-            "elements.media.representations.parts",
-            "elements.media.title"
+            "elements.media"
 
     });
 
-- 
2.34.1