[jbpm-commits] JBoss JBPM SVN: r3865 - in jbpm4/branches/hbraun/modules: integration/jboss5/src/main/resources/META-INF and 1 other directory.

[do-not-reply at jboss.org]

Author: heiko.braun at jboss.com
Date: 2009-02-13 05:49:27 -0500 (Fri, 13 Feb 2009)
New Revision: 3865

Modified:
   jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml
   jbpm4/branches/hbraun/modules/integration/jboss5/src/main/resources/META-INF/jbpm-deployers-jboss-beans.xml
Log:
Deployer picks up *jpdl.xml in par archives

Modified: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml	2009-02-13 09:27:29 UTC (rev 3864)
+++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml	2009-02-13 10:49:27 UTC (rev 3865)
@@ -101,13 +101,11 @@
   <!-- Packs -->
   <packs>
 
-    <!-- 
-    ********************************
-    *                              *  
-    *   jBPM Standalone            *
-    *                              *
-    ********************************
-    -->
+    <!--
+        ==============================
+        Standalone setup
+        ==============================
+        -->
 
     <pack name="jBPM4 Standalone" required="yes" preselected="yes">
       <description>The jBPM4 Standalone Components</description>
@@ -136,12 +134,10 @@
       </fileset>
     </pack>
 
-    <!-- 
-    ********************************
-    *                              *  
-    *   JBoss Integration          *
-    *                              *
-    ********************************
+    <!--
+    ==============================
+    JBoss integration
+    ==============================
     -->
 
     <pack name="jBPM4 JBoss Integration" required="no" preselected="yes">
@@ -168,7 +164,7 @@
         <include name="bpm-process-deployer.xml" />
       </fileset-->
       <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">
-        <include name="jbpm-log.jar" />         
+        <include name="jbpm-log.jar" />
         <include name="jbpm-pvm.jar" />
         <include name="jbpm-jpdl.jar" />
         <include name="jbpm-task.jar" />
@@ -200,7 +196,12 @@
         <include name="jbpm-sybase-ds.xml"/>
       </fileset>
 
-      <!-- deployer and service TODO: this is container dependend -->
+      <!--
+        ==============================
+        JBoss 5        
+        ==============================
+      -->
+
       <fileset dir="@{deploy.artifacts.dir}/lib/"
                targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/jbpm.deployer"
                override="true"
@@ -222,13 +223,17 @@
         <include name="jbpm-service-jboss-beans.xml"/>
       </fileset>
 
+
+      <!--
+        ==============================
+        Database configurations
+        ==============================
+        -->
+
       <!-- Database Hypsersonic -->
       <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic"/>
       <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml" condition="isHypersonic"
                   target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
-      <!--fileset dir="@{resources.dir}/database" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data" condition="isHypersonic">
-        <include name="hypersonic/jbpmDB.*" />
-      </fileset-->
 
       <!-- Database MySQL -->
       <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-mysql-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isMySQL"/>
@@ -240,12 +245,10 @@
 
     </pack>
 
-    <!-- 
-    ********************************
-    *                              *  
-    *   GWT Console                *
-    *                              *
-    ********************************
+    <!--
+       ==============================
+       GWT Console
+       ==============================
     -->
 
     <pack name="GWT-Console" parent="jBPM4 JBoss Integration" required="no" preselected="yes">
@@ -259,12 +262,10 @@
       <file src="@{deploy.artifacts.dir}/lib/report-engine.zip" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/birt/" unpack="true" override="true" /-->
     </pack>
 
-    <!-- 
-    ********************************
-    *                              *  
-    *   Optional Components        *
-    *                              *
-    ********************************
+    <!--
+    ==============================
+    Optional Components
+    ==============================
     -->
 
     <pack name="Optional Components" required="no" preselected="no">

Modified: jbpm4/branches/hbraun/modules/integration/jboss5/src/main/resources/META-INF/jbpm-deployers-jboss-beans.xml
===================================================================
--- jbpm4/branches/hbraun/modules/integration/jboss5/src/main/resources/META-INF/jbpm-deployers-jboss-beans.xml	2009-02-13 09:27:29 UTC (rev 3864)
+++ jbpm4/branches/hbraun/modules/integration/jboss5/src/main/resources/META-INF/jbpm-deployers-jboss-beans.xml	2009-02-13 10:49:27 UTC (rev 3865)
@@ -13,15 +13,16 @@
     The JBPM Meta Data Deployer
     -->
   <bean name="org.jbpm:service=MetaDataDeployer" class="org.jbpm.integration.jboss5.JBPMMetaDataDeployer">
+    <property name="suffix">jpdl.xml</property>
     <property name="jarExtension">par</property>
     <property name="allowMultipleFiles">true</property>
 
     <!-- files the deployer can process -->
-    <property name="names">
+    <!--property name="names">
       <set elementClass="java.lang.String">
         <value>processdefinition.xml</value>
       </set>
-    </property>
+    </property-->
   </bean>
 
   <!--