NullPointerException deploying resource adapter

trying to deploy a trivial "hello world" resource adapter results in NPE in ConnectorModuleBuilder.java. Looks like it assumes that some optional elements in ra.xml will always be present.

Will attach a patch to check that these fields aren't null, with this patch it (at least) deploys. Here's my ra.xml:

<?xml version="1.0" ?>

<connector xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
version="1.5">

<description>Fake Resource Adapter</description>
<display-name>Fake Resource Adapter</display-name>

<vendor-name>Fake Vendor</vendor-name>
<eis-type>example</eis-type>
<resourceadapter-version>0.0</resourceadapter-version>
<resourceadapter>
<resourceadapter-class>example.x.ResAdImpl</resourceadapter-class>
</resourceadapter>
</connector>