Migration from XML configuration to Java Config #36

Merged
merged 6 commits into from Mar 23, 2012

2 participants

@gcuisinier

Migration to Java Configuration :

  • Replace web.xml with Servlet 3.0 java initializer
  • Replace TatamiController by ViewController configuration
  • Replace some Spring XML configuration by java configuration equivalent ** Introduce @EnableWebMvc ** Introduce @EnableCaching
gcuisinier added some commits Mar 19, 2012
@gcuisinier gcuisinier Replace TatamiController to mvc:view-controller 7b5b8c3
@gcuisinier gcuisinier Remove Servlet 2.5 inherited dependency 8125a16
@gcuisinier gcuisinier Replace Spring XML Configuration by Java Configuration deb0cef
@gcuisinier gcuisinier ignore target 1e3ebae
@gcuisinier gcuisinier Optimise Import + Format
Replace @Autowired by @Inject
4f99a54
@gcuisinier gcuisinier Merge remote-tracking branch 'upstream/master'
Conflicts:
	.gitignore
	src/main/java/fr/ippon/tatami/repository/TweetRepository.java
	src/main/java/fr/ippon/tatami/service/TimelineService.java
	src/main/java/fr/ippon/tatami/web/rest/UserController.java
	src/main/webapp/WEB-INF/jsp/about.jsp
	src/main/webapp/WEB-INF/jsp/home.jsp
	src/main/webapp/WEB-INF/jsp/login.jsp
16bdbbb
@jdubois jdubois merged commit f9cadd0 into ippontech:master Mar 23, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment