Merged eclipse + jboss config branch.