Project

General

Profile

« Previous | Next » 

Revision 60762

removed properties that should be unused if we go for the relative URIs

View differences:

modules/dnet-vocabulary-publisher/trunk/src/main/java/eu/dnetlib/vocabularies/publisher/controller/VocabularyPublisherController.java
31 31
	private VocabularyRetriever vocabularyRetriever;
32 32
	@Value("${vocabulary.publisher.title}")
33 33
	private String title;
34
	@Value("${vocabulary.publisher.baseURL}")
35
	private String baseURL;
36
	@Value("${container.context}")
37
	private String context;
38 34

  
35

  
39 36
	@RequestMapping(value = "/vocabularies", method = RequestMethod.GET, produces = { "application/json" })
40 37
	public @ResponseBody
41 38
	List<Vocabulary> listVocabularies() {
......
74 71
	public void listVocabularies(final ModelMap map) {
75 72
		map.addAttribute("vocabularies", listVocabularies());
76 73
		map.addAttribute("title", title);
77
		map.addAttribute("baseURL", baseURL);
78
		map.addAttribute("context", context);
79 74
	}
80 75

  
81 76
	@RequestMapping(value = "/vocabularies/{code}", method = RequestMethod.GET, produces = { "text/html" })
......
84 79
			final ModelMap map) throws VocabularyNotFoundException {
85 80

  
86 81
		map.addAttribute("vocabulary", getVocabulary(code));
87
		map.addAttribute("baseURL", baseURL);
88
		map.addAttribute("context", context);
89 82
		return "displayVocabulary";
90 83
	}
91 84

  
......
96 89
			final ModelMap map) throws VocabularyNotFoundException {
97 90
		map.addAttribute("vocabulary", getVocabulary(code));
98 91
		map.addAttribute("term", getTermSynonyms(code, request));
99
		map.addAttribute("baseURL", baseURL);
100
		map.addAttribute("context", context);
101 92
		return "displaySynonyms";
102 93
	}
103 94

  

Also available in: Unified diff