Author: heiko.braun(a)jboss.com Date: 2009-05-30 14:32:32 -0400 (Sat, 30 May 2009) New Revision: 4961 Modified: jbpm4/trunk/modules/integration/report/src/main/resources/overall_activity.rptdesign jbpm4/trunk/modules/integration/report/src/main/resources/process_summary.rptdesign Log: Fix column name problem for HSQLDB Modified: jbpm4/trunk/modules/integration/report/src/main/resources/overall_activity.rptdesign =================================================================== --- jbpm4/trunk/modules/integration/report/src/main/resources/overall_activity.rptdesign 2009-05-30 17:29:08 UTC (rev 4960) +++ jbpm4/trunk/modules/integration/report/src/main/resources/overall_activity.rptdesign 2009-05-30 18:32:32 UTC (rev 4961) @@ -12,6 +12,12 @@ <encrypted-property name="odaPassword" encryptionID="base64">amJwbQ==</encrypted-property> <property name="odaJndiName">java:/JbpmDS</property> </oda-data-source> + <oda-data-source extensionID="org.eclipse.birt.report.data.oda.jdbc" name="HSQLDB" id="248"> + <property name="odaDriverClass">org.hsqldb.jdbcDriver</property> + <property name="odaURL">jdbc:hsqldb:hsql://localhost:1701</property> + <property name="odaUser">sa</property> + <property name="odaJndiName">java:/JbpmDS</property> + </oda-data-source> </data-sources> <data-sets> <oda-data-set extensionID="org.eclipse.birt.report.data.oda.jdbc.JdbcSelectDataSet" name="process_definitions" id="9"> @@ -56,12 +62,12 @@ </structure> </list-property> </structure> - <property name="dataSource">MySQL</property> + <property name="dataSource">HSQLDB</property> <list-property name="resultSet"> <structure> <property name="position">1</property> <property name="name">dpl</property> - <property name="nativeName">dpl</property> + <property name="nativeName">DPL</property> <property name="dataType">decimal</property> <property name="nativeDataType">-5</property> </structure> @@ -73,10 +79,10 @@ <property name="nativeDataType">12</property> </structure> </list-property> - <property name="queryText">SELECT d.DBID_ as dpl, p.STRINGVAL_ as processId FROM JBPM4_DEPLOYMENT d, JBPM4_DEPLOYPROP p + <property name="queryText">SELECT d.DBID_ as "dpl", p.STRINGVAL_ as "processId" FROM JBPM4_DEPLOYMENT d, JBPM4_DEPLOYPROP p WHERE p.KEY_='pdid' AND d.DBID_=p.DEPLOYMENT_ - GROUP BY dpl,processId + GROUP BY "dpl","processId" LIMIT 10</property> <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> <model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/desi... xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaMod... @@ -169,7 +175,7 @@ </structure> </list-property> </structure> - <property name="dataSource">MySQL</property> + <property name="dataSource">HSQLDB</property> <list-property name="resultSet"> <structure> <property name="position">1</property> @@ -186,7 +192,9 @@ <property name="nativeDataType">12</property> </structure> </list-property> - <property name="queryText">SELECT distinct(ID_) as instanceId, PROCDEFID_ FROM JBPM4_HIST_PROCINST J WHERE END_ IS NULL</property> + <property name="queryText">SELECT distinct(ID_) as "instanceId", PROCDEFID_ + FROM JBPM4_HIST_PROCINST J + WHERE END_ IS NULL</property> <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> <model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/desi... xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaMod... <Version>1.0</Version> @@ -278,7 +286,7 @@ </structure> </list-property> </structure> - <property name="dataSource">MySQL</property> + <property name="dataSource">HSQLDB</property> <list-property name="resultSet"> <structure> <property name="position">1</property> @@ -295,7 +303,8 @@ <property name="nativeDataType">12</property> </structure> </list-property> - <property name="queryText">SELECT distinct(ID_) as instanceId, PROCDEFID_ FROM JBPM4_HIST_PROCINST J </property> + <property name="queryText">SELECT distinct(ID_) as "instanceId", +PROCDEFID_ FROM JBPM4_HIST_PROCINST J </property> </oda-data-set> <oda-data-set extensionID="org.eclipse.birt.report.data.oda.jdbc.JdbcSelectDataSet" name="number_executions" id="126"> <list-property name="computedColumns"> @@ -325,7 +334,7 @@ <structure> <property name="position">1</property> <property name="name">numExecutions</property> - <property name="dataType">decimal</property> + <property name="dataType">integer</property> </structure> <structure> <property name="position">2</property> @@ -339,14 +348,14 @@ </structure> </list-property> </structure> - <property name="dataSource">MySQL</property> + <property name="dataSource">HSQLDB</property> <list-property name="resultSet"> <structure> <property name="position">1</property> <property name="name">numExecutions</property> <property name="nativeName">numExecutions</property> - <property name="dataType">decimal</property> - <property name="nativeDataType">-5</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> </structure> <structure> <property name="position">2</property> @@ -356,10 +365,10 @@ <property name="nativeDataType">12</property> </structure> </list-property> - <property name="queryText">SELECT count(PROCDEFID_) as numExecutions, PROCDEFID_ + <property name="queryText">SELECT count(PROCDEFID_) as "numExecutions", PROCDEFID_ FROM JBPM4_HIST_PROCINST J GROUP BY PROCDEFID_ - ORDER BY numExecutions DESC + ORDER BY "numExecutions" DESC limit 15</property> <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> <model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/desi... xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaMod... @@ -535,7 +544,7 @@ </structure> </list-property> </structure> - <property name="dataSource">MySQL</property> + <property name="dataSource">HSQLDB</property> <list-property name="resultSet"> <structure> <property name="position">1</property> Modified: jbpm4/trunk/modules/integration/report/src/main/resources/process_summary.rptdesign =================================================================== --- jbpm4/trunk/modules/integration/report/src/main/resources/process_summary.rptdesign 2009-05-30 17:29:08 UTC (rev 4960) +++ jbpm4/trunk/modules/integration/report/src/main/resources/process_summary.rptdesign 2009-05-30 18:32:32 UTC (rev 4961) @@ -10,6 +10,7 @@ <property name="dataType">string</property> <property name="paramType">simple</property> <text-property name="promptText">Please enter an process definition ID</text-property> + <property name="isRequired">true</property> <property name="controlType">text-box</property> <property name="distinct">true</property> <structure name="format"> @@ -25,6 +26,12 @@ <encrypted-property name="odaPassword" encryptionID="base64">amJwbQ==</encrypted-property> <property name="odaJndiName">java:/JbpmDS</property> </oda-data-source> + <oda-data-source extensionID="org.eclipse.birt.report.data.oda.jdbc" name="HSQLDB" id="275"> + <property name="odaDriverClass">org.hsqldb.jdbcDriver</property> + <property name="odaURL">jdbc:hsqldb:hsql://localhost:1701</property> + <property name="odaUser">sa</property> + <property name="odaJndiName">java:/JbpmDS</property> + </oda-data-source> </data-sources> <data-sets> <oda-data-set extensionID="org.eclipse.birt.report.data.oda.jdbc.JdbcSelectDataSet" name="active_instances" id="126"> @@ -132,7 +139,7 @@ </structure> </list-property> </structure> - <property name="dataSource">MySQL</property> + <property name="dataSource">HSQLDB</property> <list-property name="parameters"> <structure> <property name="name">id</property> @@ -255,7 +262,7 @@ </structure> </list-property> </structure> - <property name="dataSource">MySQL</property> + <property name="dataSource">HSQLDB</property> <list-property name="parameters"> <structure> <property name="name">id</property> @@ -529,7 +536,7 @@ </structure> </list-property> </structure> - <property name="dataSource">MySQL</property> + <property name="dataSource">HSQLDB</property> <list-property name="parameters"> <structure> <property name="name">id</property> @@ -556,7 +563,7 @@ <property name="nativeDataType">-5</property> </structure> </list-property> - <property name="queryText">SELECT ID_ as instanceId, DURATION_ + <property name="queryText">SELECT ID_ as "instanceId", DURATION_ FROM JBPM4_HIST_PROCINST J WHERE PROCDEFID_= ? and STATE_ NOT LIKE 'active' @@ -653,7 +660,7 @@ </structure> </list-property> </structure> - <property name="dataSource">MySQL</property> + <property name="dataSource">HSQLDB</property> <list-property name="resultSet"> <structure> <property name="position">1</property>