[blueprint annotation]add new test bean and bean factory classes from trunk with attempted annotation