[jbpm-commits] JBoss JBPM SVN: r5356 - in jbpm3/branches/jbpm-3.2-soa: modules/distribution/src/main/resources/installer and 1 other directory.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Jul 28 01:00:10 EDT 2009


Author: alex.guizar at jboss.com
Date: 2009-07-28 01:00:10 -0400 (Tue, 28 Jul 2009)
New Revision: 5356

Modified:
   jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
   jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml
Log:
install jdbc drivers to jboss/server/config/lib directory

Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh	2009-07-28 02:13:14 UTC (rev 5355)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh	2009-07-28 05:00:10 UTC (rev 5356)
@@ -87,41 +87,47 @@
 cat resolve.tmp
 
 # Install Sybase driver
-JCONNECT_VERSION=`grep com.sybase:jconnect resolve.tmp | awk --field-separator : '{ print $4 }'`
-JCONNECT_JAR=~/.m2/repository/com/sybase/jconnect/$JCONNECT_VERSION/jconnect-$JCONNECT_VERSION.jar
-if [ -f $JCONNECT_JAR ]; then
-  CP_CMD="cp $JCONNECT_JAR $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar"
-  echo $CP_CMD; $CP_CMD
-elif [ "$DATABASE" = "sybase" ]; then
-  echo "WARNING: Sybase driver not found: $JCONNECT_JAR"
+if [ "$DATABASE" = "sybase" ]; then
+  JCONNECT_VERSION=`grep com.sybase:jconnect resolve.tmp | awk --field-separator : '{ print $4 }'`
+  JCONNECT_JAR=~/.m2/repository/com/sybase/jconnect/$JCONNECT_VERSION/jconnect-$JCONNECT_VERSION.jar
+  if [ -f $JCONNECT_JAR ]; then
+    CP_CMD="cp $JCONNECT_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib"
+    echo $CP_CMD; $CP_CMD
+  else
+    echo "WARNING: Sybase driver not found: $JCONNECT_JAR"
+  fi
 fi
 
 # Install Oracle driver
-OJDBC_VERSION=`grep com.oracle:ojdbc14:jar resolve.tmp | awk --field-separator : '{ print $4 }'`
-OJDBC_JAR=~/.m2/repository/com/oracle/ojdbc14/$OJDBC_VERSION/ojdbc14-$OJDBC_VERSION.jar
-if [ -f $OJDBC_JAR ]; then
-  CP_CMD="cp $OJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar"
-  echo $CP_CMD; $CP_CMD
-elif [ "$DATABASE" = "oracle" ]; then
-  echo "WARNING: Oracle driver not found: $OJDBC_JAR"
+if [ "$DATABASE" = "oracle" ]; then
+  OJDBC_VERSION=`grep com.oracle:ojdbc14:jar resolve.tmp | awk --field-separator : '{ print $4 }'`
+  OJDBC_JAR=~/.m2/repository/com/oracle/ojdbc14/$OJDBC_VERSION/ojdbc14-$OJDBC_VERSION.jar
+  if [ -f $OJDBC_JAR ]; then
+    CP_CMD="cp $OJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib"
+    echo $CP_CMD; $CP_CMD
+  else
+    echo "WARNING: Oracle driver not found: $OJDBC_JAR"
+  fi
 fi
 
 # Install DB2 driver
-DB2JCC_VERSION=`grep com.ibm:db2jcc:jar resolve.tmp | awk --field-separator : '{ print $4 }'`
-DB2JCC_JAR=~/.m2/repository/com/ibm/db2jcc/$DB2JCC_VERSION/db2jcc-$DB2JCC_VERSION.jar
-if [ -f $DB2JCC_JAR ]; then
-  CP_CMD="cp $DB2JCC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar"
-  echo $CP_CMD; $CP_CMD
-elif [ "$DATABASE" = "db2" ]; then
-  echo "WARNING: DB2 driver not found: $DB2JCC_JAR"
+if [ "$DATABASE" = "db2" ]; then
+  DB2JCC_VERSION=`grep com.ibm:db2jcc:jar resolve.tmp | awk --field-separator : '{ print $4 }'`
+  DB2JCC_JAR=~/.m2/repository/com/ibm/db2jcc/$DB2JCC_VERSION/db2jcc-$DB2JCC_VERSION.jar
+  if [ -f $DB2JCC_JAR ]; then
+    CP_CMD="cp $DB2JCC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib"
+    echo $CP_CMD; $CP_CMD
+  else
+    echo "WARNING: DB2 driver not found: $DB2JCC_JAR"
+  fi
+  DB2JCC_LICENSE=~/.m2/repository/com/ibm/db2jcc_license_cu/$DB2JCC_VERSION/db2jcc_license_cu-$DB2JCC_VERSION.jar
+  if [ -f $DB2JCC_LICENSE ]; then
+    CP_CMD="cp $DB2JCC_LICENSE $JBOSS_HOME/server/$JBOSS_SERVER/lib"
+    echo $CP_CMD; $CP_CMD
+  else
+    echo "WARNING: DB2 license not found: $DB2JCC_LICENSE"
+  fi
 fi
-DB2JCC_LICENSE=~/.m2/repository/com/ibm/db2jcc_license_cu/$DB2JCC_VERSION/db2jcc_license_cu-$DB2JCC_VERSION.jar
-if [ -f $DB2JCC_LICENSE ]; then
-  CP_CMD="cp $DB2JCC_LICENSE $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar"
-  echo $CP_CMD; $CP_CMD
-elif [ "$DATABASE" = "db2" ]; then
-  echo "WARNING: DB2 license not found: $DB2JCC_LICENSE"
-fi
 
 # Remove resolution output file
 rm resolve.tmp

Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml	2009-07-28 02:13:14 UTC (rev 5355)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml	2009-07-28 05:00:10 UTC (rev 5356)
@@ -139,8 +139,8 @@
         override="true" />
 
       <!-- jbpm3/examples -->
-      <fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-examples-dist" targetdir="$INSTALL_PATH/examples"
-        override="true" />
+      <fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-examples-dist"
+        targetdir="$INSTALL_PATH/examples" override="true" />
 
       <!-- jbpm3/docs -->
       <file src="@{project.build.assemblyDirectory}/lib/jbpm-userguide.jdocbook" targetdir="$INSTALL_PATH/docs/userguide"
@@ -228,8 +228,7 @@
 
       <!-- Database configs to docs/examples/jbpm -->
       <fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config"
-        targetdir="${jbossInstallPath}/docs/examples/jbpm"
-        override="true">
+        targetdir="${jbossInstallPath}/docs/examples/jbpm" override="true">
         <include name="hibernate.cfg.hsqldb.xml" />
         <include name="hibernate.cfg.mysql.xml" />
         <include name="hibernate.cfg.postgresql.xml" />
@@ -245,63 +244,59 @@
       </fileset>
 
       <!-- Database Hypersonic -->
-      <file src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml"
-        targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic" />
-      <singlefile
+      <file condition="isHypersonic"
+        src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml"
+        targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" />
+      <singlefile condition="isHypersonic"
         src="@{project.build.assemblyDirectory}/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.directory}/database" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data"
-        condition="isHypersonic">
+      <fileset condition="isHypersonic" dir="@{resources.directory}/database"
+        targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data">
         <include name="hypersonic/jbpmDB.*" />
       </fileset>
 
       <!-- Database MySQL -->
-      <file src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-mysql-ds.xml"
-        targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isMySQL" />
-      <singlefile src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.mysql.xml"
-        condition="isMySQL"
+      <file condition="isMySQL"
+        src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-mysql-ds.xml"
+        targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" />
+      <singlefile condition="isMySQL"
+        src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.mysql.xml"
         target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
-      <fileset dir="@{project.build.assemblyDirectory}/lib"
-        targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
-        override="true" condition="isMySQL">
-        <include name="mysql-connector-java.jar" />
-      </fileset>
+      <file condition="isMySQL" src="@{project.build.assemblyDirectory}/lib/mysql-connector-java.jar"
+        targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib" />
 
       <!-- Database PostgreSQL -->
-      <file src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-postgresql-ds.xml"
-        targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isPostgreSQL" />
-      <singlefile
+      <file condition="isPostgreSQL"
+        src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-postgresql-ds.xml"
+        targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" />
+      <singlefile condition="isPostgreSQL"
         src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.postgresql.xml"
-        condition="isPostgreSQL"
         target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
-      <fileset dir="@{project.build.assemblyDirectory}/lib"
-        targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
-        override="true" condition="isPostgreSQL">
-        <include name="postgresql.jar" />
-      </fileset>
+      <file condition="isPostgreSQL" src="@{project.build.assemblyDirectory}/lib/postgresql.jar"
+        targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib" />
 
       <!-- Database Sybase -->
-      <file src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-sybase-ds.xml"
-        targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isSybase" />
-      <singlefile
+      <file condition="isSybase"
+        src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-sybase-ds.xml"
+        targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" />
+      <singlefile condition="isSybase"
         src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.sybase.xml"
-        condition="isSybase"
         target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
 
       <!-- Database Oracle -->
-      <file src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-oracle-ds.xml"
-        targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isOracle" />
-      <singlefile
+      <file condition="isOracle"
+        src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-oracle-ds.xml"
+        targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" />
+      <singlefile condition="isOracle"
         src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.oracle.xml"
-        condition="isOracle"
         target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
 
       <!-- Database DB2 -->
-      <file src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-db2-ds.xml"
-        targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isDB2" />
-      <singlefile src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.db2.xml"
-        condition="isDB2"
+      <file condition="isDB2"
+        src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-db2-ds.xml"
+        targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" />
+      <singlefile condition="isDB2"
+        src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.db2.xml"
         target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
     </pack>
 



More information about the jbpm-commits mailing list