{"shas":[["245527001dcd9fd18a9d4965b9fa6a5dbf75aa6f","389fd494afe31cb024cec281057417f4d81cbc59@gmail.com","made spring mvc and resteasy use a common Href framework, as well as common daos & model","sduskis"],["7c87f0cc726fa724082245323f62b0ae2742b564","389fd494afe31cb024cec281057417f4d81cbc59@gmail.com","forgot the shared stuff","sduskis"],["adf8063d9dc02e1b5d9d12698bbf69c0d1b376b4","389fd494afe31cb024cec281057417f4d81cbc59@gmail.com","Merge remote branch 'upstream/master'\n\nConflicts:\n\tyoga-core/src/main/java/org/skyscreamer/yoga/annotations/Nested.java\n\tyoga-core/src/main/java/org/skyscreamer/yoga/annotations/Reference.java\n\tyoga-core/src/main/java/org/skyscreamer/yoga/annotations/URITemplate.java\n\tyoga-core/src/main/java/org/skyscreamer/yoga/mapper/ResultMapper.java\n\tyoga-core/src/main/java/org/skyscreamer/yoga/mapper/XhtmlHierarchyModel.java\n\tyoga-core/src/main/java/org/skyscreamer/yoga/mapper/XmlHierarchyModel.java\n\tyoga-core/src/main/java/org/skyscreamer/yoga/util/NameUtil.java\n\tyoga-demos/yoga-demo-resteasy/src/main/java/org/skyscreamer/yoga/demo/model/Album.java\n\tyoga-demos/yoga-demo-resteasy/src/main/java/org/skyscreamer/yoga/demo/model/Artist.java\n\tyoga-demos/yoga-demo-resteasy/src/main/java/org/skyscreamer/yoga/demo/model/Song.java\n\tyoga-demos/yoga-demo-resteasy/src/main/java/org/skyscreamer/yoga/demo/model/User.java\n\tyoga-demos/yoga-demo-shared/src/main/resources/applicationContext.xml\n\tyoga-integration/yoga-resteasy/src/main/java/org/skyscreamer/yoga/resteasy/annotations/Nested.java\n\tyoga-integration/yoga-resteasy/src/main/java/org/skyscreamer/yoga/resteasy/mapper/HibernateResultTraverser.java\n\tyoga-integration/yoga-resteasy/src/main/java/org/skyscreamer/yoga/resteasy/view/AbstractSelectorMessageBodyWriter.java\n\tyoga-integration/yoga-resteasy/src/main/java/org/skyscreamer/yoga/resteasy/view/XhtmlSelectorMessageBodyWriter.java\n\tyoga-integration/yoga-springmvc/src/main/java/org/skyscreamer/yoga/springmvc/view/SelectorModelAndViewResolver.java","sduskis"],["7557bd9e2dc61bdd6e2c395665315e9b8bd24fbf","389fd494afe31cb024cec281057417f4d81cbc59@gmail.com","RESTEasy now works","sduskis"],["fe58cd853be1c7bf58b5a55e2fa72a65070e5a07","389fd494afe31cb024cec281057417f4d81cbc59@gmail.com","fixing failed tests","sduskis"],["0630e5600447cfbc0754fb30be8bfe502227250b","389fd494afe31cb024cec281057417f4d81cbc59@gmail.com","added an example of configurable FieldPopulators and made it work","sduskis"]],"ref":"refs/heads/master","size":6,"head":"0630e5600447cfbc0754fb30be8bfe502227250b","push_id":37353124}