[jbpm-commits] JBoss JBPM SVN: r2776 - in jbpm3/trunk: modules/distribution/src/main/resources/installer and 1 other directory.

[do-not-reply at jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-11-06 09:39:45 -0500 (Thu, 06 Nov 2008)
New Revision: 2776

Modified:
   jbpm3/trunk/hudson/hudson-home/command.sh
   jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
Log:
[IZPACK-153] Add jbpm configs to docs/examples/jbpm

Modified: jbpm3/trunk/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/trunk/hudson/hudson-home/command.sh	2008-11-06 13:29:16 UTC (rev 2775)
+++ jbpm3/trunk/hudson/hudson-home/command.sh	2008-11-06 14:39:45 UTC (rev 2776)
@@ -63,9 +63,10 @@
 
 # FIXME: Autoinstall does not respect conditions
 # http://jira.codehaus.org/browse/IZPACK-153
-mv $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-$DATABASE-ds.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-$DATABASE-ds.keep
 rm $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-*-ds.xml
-mv $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-$DATABASE-ds.keep $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-$DATABASE-ds.xml
+rm $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml
+cp $JBOSS_HOME/docs/examples/jbpm/jbpm-$DATABASE-ds.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-$DATABASE-ds.xml
+cp $JBOSS_HOME/docs/examples/jbpm/hibernate.cfg.$DATABASE.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml
 
 #
 # start jbossas

Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml	2008-11-06 13:29:16 UTC (rev 2775)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml	2008-11-06 14:39:45 UTC (rev 2776)
@@ -184,40 +184,49 @@
       <!-- jbpm-destinations-service -->
       <file src="@{resources.dir}/destination/jbpm-destinations-service.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" />
       
+      <!-- database configs to docs/examples/jbpm -->
+      <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-core-config" targetdir="${installPath}/docs/examples/jbpm" override="true">
+        <include name="hibernate.cfg.hsqldb.xml"/>
+        <include name="hibernate.cfg.mysql.xml"/>
+        <include name="hibernate.cfg.postgresql.xml"/>
+        <include name="hibernate.cfg.sybase.xml"/>
+        <include name="jbpm-hsqldb-ds.xml"/>
+        <include name="jbpm-mysql-ds.xml"/>
+        <include name="jbpm-postgresql-ds.xml"/>
+        <include name="jbpm-sybase-ds.xml"/>
+      </fileset>
+      
       <!-- Database Hypsersonic -->
+      <file src="@{deploy.artifacts.dir}/resources/jbpm-core-config/jbpm-hsqldb-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic"/>
+      <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.hsqldb.xml" condition="isHypersonic" 
+        target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
       <fileset dir="@{resources.dir}/database" targetdir="${installPath}/server/${jbossTargetServer}/data" condition="isHypersonic">
         <include name="hypersonic/jbpmDB.*" />
       </fileset>
-      <file src="@{deploy.artifacts.dir}/resources/jbpm-core-config/jbpm-hsqldb-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic"/>
-      <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.hsqldb.xml" condition="isHypersonic" 
-        target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
         
       <!-- Database MySQL -->
-      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
-        override="true" condition="isMySQL">
-        <include name="mysql-connector-java.jar" />
-      </fileset>
       <file src="@{deploy.artifacts.dir}/resources/jbpm-core-config/jbpm-mysql-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isMySQL"/>
       <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.mysql.xml" condition="isMySQL" 
         target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
+      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isMySQL">
+        <include name="mysql-connector-java.jar" />
+      </fileset>
         
       <!-- Database PostgreSQL -->
-      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
-        override="true" condition="isPostgreSQL">
-        <include name="postgresql.jar" />
-      </fileset>
       <file src="@{deploy.artifacts.dir}/resources/jbpm-core-config/jbpm-postgresql-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm"  condition="isPostgreSQL"/>
       <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.postgresql.xml" condition="isPostgreSQL" 
         target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
+      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isPostgreSQL">
+        <include name="postgresql.jar" />
+      </fileset>
         
       <!-- Database Sybase -->
-      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
-        override="true" condition="isSybase">
-        <include name="jtds.jar" />
-      </fileset>
       <file src="@{deploy.artifacts.dir}/resources/jbpm-core-config/jbpm-sybase-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isSybase"/>
       <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.sybase.xml" condition="isSybase" 
         target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
+      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isSybase">
+        <include name="jtds.jar" />
+      </fileset>
     </pack>
 
     <!-- Optional Components -->
@@ -242,11 +251,8 @@
     <!-- GWT Console -->
     <pack name="GWT-Console" required="no" parent="Optional Components" preselected="no">
       <description>GWT-Console (Preview, use at your own risk)</description>
-      <file src="@{deploy.artifacts.dir}/lib/gwt-console.war"
-        targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/" unpack="false" override="true" />
-
-      <file src="@{deploy.artifacts.dir}/lib/gwt-console-server.war"
-        targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="true" override="true" />
+      <file src="@{deploy.artifacts.dir}/lib/gwt-console.war" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" />
+      <file src="@{deploy.artifacts.dir}/lib/gwt-console-server.war" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" />
     </pack>
     
   </packs>