Bean name with slashes must be escaped on jrb creation

Heya,

I tried to collect the bean Catalina:type=DataSource,class=javax.sql.DataSource,name="jdbc/dataSource/factory" from a tomcat server. This bean represents a jdbc connection pool and is indeed written with quotations. OpenNMS fails to create a jrb file for this:

2009-11-13 14:57:41,551 ERROR [CollectdScheduler-150 Pool-fiber107] RrdUtils: createRRD: An error occured creating rrdfile /opt/opennms/share/rrd/snmp/25/xms_jmx/Catalina_type_DataSource_class_javax_sql_DataSource_name_"jdbc/dataSource/factory".jrb: java.io.FileNotFoundException: /opt/opennms/share/rrd/snmp/25/xms_jmx/Catalina_type_DataSource_class_javax_sql_DataSource_name_"jdbc/dataSource/factory".jrb (No such file or directory)
java.io.FileNotFoundException: /opt/opennms/share/rrd/snmp/25/xms_jmx/Catalina_type_DataSource_class_javax_sql_DataSource_name_"jdbc/dataSource/factory".jrb (No such file or directory)
2009-11-13 14:57:41,551 ERROR [CollectdScheduler-150 Pool-fiber107] GroupPersister: Unable to persist data for Catalina_type_DataSource_class_javax_sql_DataSource_name_"jdbc/dataSource/factory": org.opennms.netmgt.rrd.RrdException: An error occured creating rrdfile /opt/opennms/share/rrd/snmp/25/xms_jmx/Catalina_type_DataSource_class_javax_sql_DataSource_name_"jdbc/dataSource/factory".jrb: java.io.FileNotFoundException: /opt/opennms/share/rrd/snmp/25/xms_jmx/Catalina_type_DataSource_class_javax_sql_DataSource_name_"jdbc/dataSource/factory".jrb (No such file or directory)
org.opennms.netmgt.rrd.RrdException: An error occured creating rrdfile /opt/opennms/share/rrd/snmp/25/xms_jmx/Catalina_type_DataSource_class_javax_sql_DataSource_name_"jdbc/dataSource/factory".jrb: java.io.FileNotFoundException: /opt/opennms/share/rrd/snmp/25/xms_jmx/Catalina_type_DataSource_class_javax_sql_DataSource_name_"jdbc/dataSource/factory".jrb (No such file or directory)

It shouldn't be too difficult to escape such characters in the transformation function.