Made the requested chages. Please verify if they work for ASF?
<pmc-chair-hat-on>
Much nicer, but there are still a few issues:
1) you are shipping your code with the Apache Software License and you are granting copyright to the ASF for your stuff. This is still not acceptable for the ASF guidelines since there is no proper legal oversight on what you do on your own.
Common practice is to use a modified version of the apache license that give you credits for, for examples look at Chaperon's or Krysalis' licenses or other Apache-derived licenses.
The use of the original apache license for non-ASF stuff is not allowed.
Also make sure to remove all cocoon-related things from your license.
2) you are using the 'org.xmlform' package name but the domain doesn't appear to be registered. I would suggest you to use the org.cocoonhive.xmlform package name or register the xmlform.org domain to protect yourself from future legal issues on package name abuses.
</pmc-chair-hat-on>
Stefano.
