Project

General

Profile

« Previous | Next » 

Revision 892efc69

Added by Andreas Kohlbecker almost 14 years ago

merging /branches/cdmlib/SPRINT-Chichorieae1/ to trunk

View differences:

cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/MediaPortalController.java
34 34
 */
35 35

  
36 36
@Controller
37
@RequestMapping(value = {"/*/portal/media/*","/*/portal/media/*/annotation"})
37
@RequestMapping(value = {"/portal/media/*","/portal/media/*/annotation"})
38 38
public class MediaPortalController extends AnnotatableController<Media, IMediaService>
39 39
{
40 40

  
......
48 48
	public MediaPortalController(){
49 49
		super();
50 50
		setInitializationStrategy(MEDIA_INIT_STRATEGY);
51
		setUuidParameterPattern("^/(?:[^/]+)/portal/media/([^/?#&\\.]+).*");
51
		setUuidParameterPattern("^/portal/media/([^/?#&\\.]+).*");
52 52
	}
53 53
	
54 54
	/* (non-Javadoc)

Also available in: Unified diff