Updated for hibernate-osgi module creation