changes for upgrade to jsf 2.0

Signed-off-by: Thomas Schubert <funthomas424242@gmail.com>