BGBM BDI Projects
/
cdmlib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
dd4c21b
)
removing init strategies which are replaces by MediaAutoInitializer
author
Andreas Kohlbecker
<a.kohlbecker@bgbm.org>
Wed, 16 Jan 2013 11:45:38 +0000
(11:45 +0000)
committer
Andreas Kohlbecker
<a.kohlbecker@bgbm.org>
Wed, 16 Jan 2013 11:45:38 +0000
(11:45 +0000)
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadeController.java
patch
|
blob
|
history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadePortalController.java
patch
|
blob
|
history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java
patch
|
blob
|
history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java
patch
|
blob
|
history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NamePortalController.java
patch
|
blob
|
history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
patch
|
blob
|
history
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 4857c0f8cafa489c6274d5dd5bb6a7d63ed905dd..81bf9fc11e49086fb5bd3e8d255db828930d7e7b 100644
(file)
--- 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());
\r
ModelAndView mv = new ModelAndView();
\r
DerivedUnitFacade duf = newFacadeFrom(occurrenceUuid, response,Arrays.asList(new String []{
\r
logger.info("doGetDerivedUnitMedia() - " + request.getServletPath());
\r
ModelAndView mv = new ModelAndView();
\r
DerivedUnitFacade duf = newFacadeFrom(occurrenceUuid, response,Arrays.asList(new String []{
\r
- "derivedUnitMedia
.representations.parts
", "derivedUnitMedia.title"}));
\r
+ "derivedUnitMedia", "derivedUnitMedia.title"}));
\r
if(duf != null){
\r
mv.addObject(duf.getDerivedUnitMedia());
\r
}
\r
if(duf != null){
\r
mv.addObject(duf.getDerivedUnitMedia());
\r
}
\r
@@
-92,7
+92,7
@@
public class DerivedUnitFacadeController extends AbstractController{
logger.info("doGetFieldObjectMedia() - " + request.getServletPath());
\r
ModelAndView mv = new ModelAndView();
\r
DerivedUnitFacade duf = newFacadeFrom(occurrenceUuid, response,Arrays.asList(new String []{
\r
logger.info("doGetFieldObjectMedia() - " + request.getServletPath());
\r
ModelAndView mv = new ModelAndView();
\r
DerivedUnitFacade duf = newFacadeFrom(occurrenceUuid, response,Arrays.asList(new String []{
\r
- "fieldObjectMedia
.representations.parts
", "fieldObjectMedia.title"}));
\r
+ "fieldObjectMedia", "fieldObjectMedia.title"}));
\r
mv.addObject(duf.getFieldObjectMedia());
\r
return mv;
\r
}
\r
mv.addObject(duf.getFieldObjectMedia());
\r
return mv;
\r
}
\r
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 fac72a6712dadd19d5e9f458ceab55fbba4e7b66..629a73aaf149033e7fe42e8f047d1f89463d314f 100644
(file)
--- 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$
\r
/**
\r
* Copyright (C) 2009 EDIT
\r
// $Id$
\r
/**
\r
* Copyright (C) 2009 EDIT
\r
-* European Distributed Institute of Taxonomy
\r
+* European Distributed Institute of Taxonomy
\r
* http://www.e-taxonomy.eu
\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
* 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,28
+22,28
@@
import org.springframework.web.bind.annotation.RequestMapping;
@Controller
\r
@RequestMapping(value = {"/portal/derivedUnitFacade/{uuid}"})
\r
public class DerivedUnitFacadePortalController extends
\r
@Controller
\r
@RequestMapping(value = {"/portal/derivedUnitFacade/{uuid}"})
\r
public class DerivedUnitFacadePortalController extends
\r
-
DerivedUnitFacadeController {
\r
-
\r
-
public DerivedUnitFacadePortalController(){
\r
-
super();
\r
-
setInitializationStrategy(Arrays.asList(new String []{
\r
-
"*",
\r
-
"titleCache",
\r
+ DerivedUnitFacadeController {
\r
+
\r
+ public DerivedUnitFacadePortalController(){
\r
+ super();
\r
+ setInitializationStrategy(Arrays.asList(new String []{
\r
+ "*",
\r
+ "titleCache",
\r
// "gatheringEvent.*",
\r
// "gatheringEvent.*",
\r
-
"ecologyAll",
\r
-
"plantDescriptionAll",
\r
-
\r
+ "ecologyAll",
\r
+ "plantDescriptionAll",
\r
+
\r
// "fieldObservation.*",
\r
// "fieldObservation.*",
\r
-
"fieldObjectMedia.representations.parts
",
\r
-
\r
+
"fieldObjectMedia
",
\r
+
\r
// "derivedUnit.*",
\r
// "derivedUnit.*",
\r
-
"derivedUnitMedia.representations.parts
",
\r
-
"derivedUnitDefinitions",
\r
-
\r
-
"exactLocation.referenceSystem"
\r
-
\r
-
\r
-
}));
\r
-
}
\r
+
"derivedUnitMedia
",
\r
+ "derivedUnitDefinitions",
\r
+
\r
+ "exactLocation.referenceSystem"
\r
+
\r
+
\r
+ }));
\r
+ }
\r
\r
}
\r
\r
}
\r
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 30d22c86fbc75e22323611cdeec67427a12c86ee..bcaf226a2618e03ed161a5ccd10f826a949e8175 100644
(file)
--- 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.sources.citation.authorTeam",
"elements.sources.nameUsedInSource.originalNameString",
"elements.multilanguageText",
- "elements.media.representations.parts",
- "elements.media.title",
+ "elements.media",
});
@InitBinder
});
@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 d7fefdf4293985a559fa86f50b2495db2544b28c..babed91bf27c73e1f63aef3dbc7ae4ec9b1c0647 100644
(file)
--- 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",
\r
"elements.modifyingText",
\r
"elements.states.*",
\r
"elements.area.level",
\r
"elements.modifyingText",
\r
"elements.states.*",
\r
- "elements.media
.representations.parts", // TODO "elements.media" should be sufficient since we have the MediaAutoInitializer
\r
+ "elements.media
",
\r
});
\r
\r
\r
});
\r
\r
\r
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 70f3046d00bc6e959319cf9c3747e897fd58810c..8fb4af30bbb0bfe2d8c0c27fdb7d204cdf8c8261 100644
(file)
--- 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",
\r
"typifiedNames",
\r
"citation.authorTeam.$",
\r
"typeStatus.representations",
\r
"typifiedNames",
\r
"citation.authorTeam.$",
\r
- "typeSpecimen.media
.representations.parts
"
\r
+ "typeSpecimen.media"
\r
});
\r
\r
\r
});
\r
\r
\r
@@
-74,8
+74,7
@@
public class NamePortalController extends BaseController<TaxonNameBase, INameSer
"feature",
\r
"elements.$",
\r
"elements.multilanguageText",
\r
"feature",
\r
"elements.$",
\r
"elements.multilanguageText",
\r
- "elements.media.representations.parts",
\r
- "elements.media.title",
\r
+ "elements.media",
\r
});
\r
\r
\r
});
\r
\r
\r
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 3727d182d69d90c587fee9584510bbbd0980739a..926fadfaaf141d40e5381c890076cf79723fa5e0 100644
(file)
--- 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
\r
"descriptions.elements.area.$",
\r
"descriptions.elements.multilanguageText",
\r
// taxon descriptions
\r
"descriptions.elements.area.$",
\r
"descriptions.elements.multilanguageText",
\r
- "descriptions.elements.media.representations.parts",
\r
- "descriptions.elements.media.title",
\r
+ "descriptions.elements.media",
\r
\r
});
\r
\r
\r
});
\r
\r
@@
-250,8
+249,7
@@
public class TaxonPortalController extends BaseController<TaxonBase, ITaxonServi
"elements.sources.citation.authorTeam",
\r
"elements.sources.nameUsedInSource.originalNameString",
\r
"elements.multilanguageText",
\r
"elements.sources.citation.authorTeam",
\r
"elements.sources.nameUsedInSource.originalNameString",
\r
"elements.multilanguageText",
\r
- "elements.media.representations.parts",
\r
- "elements.media.title",
\r
+ "elements.media",
\r
});
\r
\r
protected static final List<String> TAXONUSEDESCRIPTION_INIT_STRATEGY = Arrays.asList(new String []{
\r
});
\r
\r
protected static final List<String> TAXONUSEDESCRIPTION_INIT_STRATEGY = Arrays.asList(new String []{
\r
@@
-265,8
+263,7
@@
public class TaxonPortalController extends BaseController<TaxonBase, ITaxonServi
"elements.sources.citation.authorTeam",
\r
"elements.sources.nameUsedInSource.originalNameString",
\r
"elements.multilanguageText",
\r
"elements.sources.citation.authorTeam",
\r
"elements.sources.nameUsedInSource.originalNameString",
\r
"elements.multilanguageText",
\r
- "elements.media.representations.parts",
\r
- "elements.media.title",
\r
+ "elements.media",
\r
});
\r
\r
protected static final List<String> DESCRIPTION_ELEMENT_INIT_STRATEGY = Arrays.asList(new String []{
\r
});
\r
\r
protected static final List<String> DESCRIPTION_ELEMENT_INIT_STRATEGY = Arrays.asList(new String []{
\r
@@
-274,8
+271,7
@@
public class TaxonPortalController extends BaseController<TaxonBase, ITaxonServi
"sources.citation.authorTeam",
\r
"sources.nameUsedInSource.originalNameString",
\r
"multilanguageText",
\r
"sources.citation.authorTeam",
\r
"sources.nameUsedInSource.originalNameString",
\r
"multilanguageText",
\r
- "media.representations.parts",
\r
- "media.title",
\r
+ "media",
\r
});
\r
\r
\r
});
\r
\r
\r
@@
-284,13
+280,11
@@
public class TaxonPortalController extends BaseController<TaxonBase, ITaxonServi
// "feature",
\r
// "elements.$",
\r
// "elements.multilanguageText",
\r
// "feature",
\r
// "elements.$",
\r
// "elements.multilanguageText",
\r
-// "elements.media.representations.parts",
\r
-// "elements.media.title",
\r
+// "elements.media",
\r
// });
\r
\r
protected static final List<String> TAXONDESCRIPTION_MEDIA_INIT_STRATEGY = Arrays.asList(new String []{
\r
// });
\r
\r
protected static final List<String> TAXONDESCRIPTION_MEDIA_INIT_STRATEGY = Arrays.asList(new String []{
\r
- "elements.media.representations.parts",
\r
- "elements.media.title"
\r
+ "elements.media"
\r
\r
});
\r
\r
\r
});
\r
\r