added CDATA to groovy and expression components