In compating Locke & Rousseau: which one is republican and which one is liberal? why?

Locke was very conservative, was very big on property rights, taking things from the state of nature and mixing ones labor to make it your own - definitely a capitalist notion. Rousseau (based on what I've read) believed that the state of nature was a superior state than of civil society, which he considered to be slavery. I would say Rousseau was definitely liberal.