[jboss-svn-commits] JBL Code SVN: r32510 - in labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product: services/jbpm/src/main/resources/config/jmsscheduler and 3 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2010-04-12 06:20:39 -0400 (Mon, 12 Apr 2010)
New Revision: 32510

Modified:
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm.cfg.xml.config
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm.cfg.xml.config
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbpm.cfg.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management/mysql.properties
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/jonplugin/src/main/resources/META-INF/rhq-plugin.xml
Log:
Merge 4.4.0.GA_CP4_CR2 into SOA branch

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm.cfg.xml.config
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm.cfg.xml.config	2010-04-12 09:58:48 UTC (rev 32509)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm.cfg.xml.config	2010-04-12 10:20:39 UTC (rev 32510)
@@ -12,11 +12,11 @@
     <service name="persistence">
       <factory>
         <bean class="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory">
-          <field name="isTransactionEnabled"><false/></field>
-          <field name="isCurrentSessionEnabled"><true/></field>
-          <!--field name="sessionFactoryJndiName">
+          <property name="isTransactionEnabled"><false/></property>
+          <property name="isCurrentSessionEnabled"><true/></property>
+          <!--property name="sessionFactoryJndiName">
             <string value="java:/myHibSessFactJndiName" />
-          </field-->
+          </property-->
         </bean>
      </factory>
      </service>

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm.cfg.xml.config
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm.cfg.xml.config	2010-04-12 09:58:48 UTC (rev 32509)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm.cfg.xml.config	2010-04-12 10:20:39 UTC (rev 32510)
@@ -12,11 +12,11 @@
     <service name="persistence">
       <factory>
         <bean class="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory">
-          <field name="isTransactionEnabled"><false/></field>
-          <field name="isCurrentSessionEnabled"><true/></field>
-          <!--field name="sessionFactoryJndiName">
+          <property name="isTransactionEnabled"><false/></property>
+          <property name="isCurrentSessionEnabled"><true/></property>
+          <!--property name="sessionFactoryJndiName">
             <string value="java:/myHibSessFactJndiName" />
-          </field-->
+          </property-->
         </bean>
      </factory>
      </service>

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbpm.cfg.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbpm.cfg.xml	2010-04-12 09:58:48 UTC (rev 32509)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbpm.cfg.xml	2010-04-12 10:20:39 UTC (rev 32510)
@@ -12,11 +12,11 @@
     <service name="persistence">
       <factory>
         <bean class="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory">
-          <field name="isTransactionEnabled"><false/></field>
-          <field name="isCurrentSessionEnabled"><true/></field>
-          <!--field name="sessionFactoryJndiName">
+          <property name="isTransactionEnabled"><false/></property>
+          <property name="isCurrentSessionEnabled"><true/></property>
+          <!--property name="sessionFactoryJndiName">
             <string value="java:/myHibSessFactJndiName" />
-          </field-->
+          </property-->
         </bean>
      </factory>
      </service>
@@ -48,14 +48,14 @@
   <string name="jbpm.mail.from.address" value="jbpm at noreply" />
   
   <bean name="jbpm.job.executor" class="org.jbpm.job.executor.JobExecutor">
-    <field name="jbpmConfiguration"><ref bean="jbpmConfiguration" /></field>
-    <field name="name"><string value="JbpmJobExector" /></field>
-    <field name="nbrOfThreads"><int value="1" /></field>
-    <field name="idleInterval"><int value="5000" /></field>
-    <field name="maxIdleInterval"><int value="3600000" /></field> <!-- 1 hour -->
-    <field name="historyMaxSize"><int value="20" /></field>
-    <field name="maxLockTime"><int value="600000" /></field> <!-- 10 minutes -->
-    <field name="lockMonitorInterval"><int value="60000" /></field> <!-- 1 minute -->
-    <field name="lockBufferTime"><int value="5000" /></field> <!-- 5 seconds -->
+    <property name="jbpmConfiguration"><ref bean="jbpmConfiguration" /></property>
+    <property name="name"><string value="JbpmJobExector" /></property>
+    <property name="nbrOfThreads"><int value="1" /></property>
+    <property name="idleInterval"><int value="5000" /></property>
+    <property name="maxIdleInterval"><int value="3600000" /></property> <!-- 1 hour -->
+    <property name="historyMaxSize"><int value="20" /></property>
+    <property name="maxLockTime"><int value="600000" /></property> <!-- 10 minutes -->
+    <property name="lockMonitorInterval"><int value="60000" /></property> <!-- 1 minute -->
+    <property name="lockBufferTime"><int value="5000" /></property> <!-- 5 seconds -->
   </bean>
 </jbpm-configuration>

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management/mysql.properties
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management/mysql.properties	2010-04-12 09:58:48 UTC (rev 32509)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management/mysql.properties	2010-04-12 10:20:39 UTC (rev 32510)
@@ -1,4 +1,4 @@
-db.dialect=org.hibernate.dialect.MySQLDialect
+db.dialect=org.hibernate.dialect.MySQL5InnoDBDialect 
 connection.datasource=java:/ManagementDS
 db.datasource=ManagementDS
 database.depends=

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/jonplugin/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/jonplugin/src/main/resources/META-INF/rhq-plugin.xml	2010-04-12 09:58:48 UTC (rev 32509)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/jonplugin/src/main/resources/META-INF/rhq-plugin.xml	2010-04-12 10:20:39 UTC (rev 32510)
@@ -4,7 +4,7 @@
         displayName="JBossESB"
         package="org.jbosson.plugins.jbossesb"
         description="Provides monitoring of JBoss ESB"
-        version="2.0"
+        version="@VERSION@"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="urn:xmlns:rhq-plugin"
         xmlns:c="urn:xmlns:rhq-configuration">