[jbpm-commits] JBoss JBPM SVN: r4274 - in jbpm4/trunk/modules: integration/jboss4/src/main/resources/jbpm.beans/META-INF and 1 other directory.

[do-not-reply at jboss.org]

Author: heiko.braun at jboss.com
Date: 2009-03-18 06:28:53 -0400 (Wed, 18 Mar 2009)
New Revision: 4274

Modified:
   jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml
   jbpm4/trunk/modules/integration/jboss4/src/main/resources/jbpm.beans/META-INF/jboss-beans.xml
Log:
Fix as installtion

Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml	2009-03-18 09:20:51 UTC (rev 4273)
+++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml	2009-03-18 10:28:53 UTC (rev 4274)
@@ -152,27 +152,18 @@
 
       <description>The Install jBPM in JBoss</description>
 
-      <!-- jbpm/jbpm-service.sar
-      <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">
-        <include name="logging.properties"/>
-      </fileset>
-       -->
-
-      <!-- jbpm/jbpm-service.sar , enterprise config-->
+      <!-- jbpm/jbpm-service.sar , spi  config-->
       <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-spi-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">
         <include name="jbpm-users.properties"/>
         <include name="jbpm-roles.properties"/>
       </fileset>
-      <!-- jbpm/jbpm-service.sar/META-INF , enterprise config-->
-      <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/META-INF" override="true">
+      <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-spi-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/META-INF" override="true">
         <include name="jboss-service.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-pvm.jar" />
-        <include name="jbpm-jpdl.jar" />
-        <include name="jbpm-task.jar" />
+        <include name="jbpm-jpdl.jar" />        
         <include name="jbpm-console-integration.jar" />
         <include name="idm*.jar" />
         <include name="livetribe-jsr223.jar" />
@@ -203,7 +194,28 @@
         <include name="jbpm-log.jar" />
       </fileset>
 
+       <!-- deployer -->
+      <fileset dir="@{deploy.artifacts.dir}/lib/"
+               targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm.deployer"
+               override="true"
+               condition="isJBoss422">
+        <include name="jbpm-jboss4.jar"/>
+      </fileset>
+      <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-jboss4-config/jbpm.deployer/META-INF"
+               targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm.deployer/META-INF"
+               override="true"
+               condition="isJBoss422">
+        <include name="jboss-service.xml"/>
+      </fileset>
 
+      <!-- service -->
+      <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-jboss4-config/jbpm.beans/META-INF"
+               targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/jbpm.beans/META-INF"
+               override="true"
+               condition="isJBoss422">
+        <include name="jboss-beans.xml"/>
+      </fileset>
+
       <!--
         ==============================
         JBoss 423

Modified: jbpm4/trunk/modules/integration/jboss4/src/main/resources/jbpm.beans/META-INF/jboss-beans.xml
===================================================================
--- jbpm4/trunk/modules/integration/jboss4/src/main/resources/jbpm.beans/META-INF/jboss-beans.xml	2009-03-18 09:20:51 UTC (rev 4273)
+++ jbpm4/trunk/modules/integration/jboss4/src/main/resources/jbpm.beans/META-INF/jboss-beans.xml	2009-03-18 10:28:53 UTC (rev 4274)
@@ -24,7 +24,7 @@
      ServerConfig
   -->
   <bean name="org.jbpm:service=ServerConfig"
-        class="org.jbpm.integration.jboss5.mgmt.ServerConfig">    
+        class="org.jbpm.integration.jboss4.mgmt.ServerConfig">    
   </bean>
 
 </deployment>
\ No newline at end of file