[jbpm-commits] JBoss JBPM SVN: r5444 - jbpm4/trunk/modules/distro/src/main/files/install.

[do-not-reply at jboss.org]

Author: heiko.braun at jboss.com
Date: 2009-08-07 09:38:25 -0400 (Fri, 07 Aug 2009)
New Revision: 5444

Modified:
   jbpm4/trunk/modules/distro/src/main/files/install/build.xml
Log:
Fix distro/build.xml

Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-08-07 12:07:39 UTC (rev 5443)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-08-07 13:38:25 UTC (rev 5444)
@@ -29,12 +29,12 @@
   <property name="tomcat.distro.url" value="http://www.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/${tomcat.filename}" />
   <property name="tomcat.distro.path" value="${tomcat.distro.dir}/${tomcat.filename}" />
 
-  <property name="jboss.version" value="5.1.0" />
+  <property name="jboss.version" value="5.1.0.GA" />
   <property name="jboss.parent.dir" value="generated" />
   <property name="jboss.home" value="${jboss.parent.dir}/jboss-${jboss.version}" />
   <property name="jboss.filename" value="jboss-${jboss.version}.zip" />
-	<property name="jboss.distro.dir" value="downloads" />
-  <property name="jboss.distro.url" value="http://downloads.sourceforge.net/jboss/${jboss.filename}" />
+	<property name="jboss.distro.dir" value="downloads" />                                           
+  <property name="jboss.distro.url" value="http://downloads.sourceforge.net/project/jboss/JBoss/JBoss-5.1.0.GA/${jboss.filename}?use_mirror=surfnet"/>
   <property name="jboss.distro.path" value="${jboss.distro.dir}/${jboss.filename}" />
   <property name="jboss.server.configuration" value="default" />
   <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" />
@@ -130,8 +130,8 @@
 
     <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true">
       <fileset dir="${jbpm.home}/lib">
-        <include name="gwt-console.war" />
-        <include name="gwt-console-server.war" />
+        <include name="gwt-console-jbpm.war" />
+        <include name="gwt-console-server-jbpm.war" />
       </fileset>
     </copy>
     
@@ -181,7 +181,7 @@
     </copy>
 
   	<property name="container.lib.dir" value="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" />
-  	<antcall target="internal.copy.database.driver}" />
+  	<antcall target="internal.copy.database.driver" />
   </target>
 
   <!-- ### START JBOSS ################################################### -->
@@ -318,16 +318,13 @@
   </target>
   
   <!-- ### COPY DATABASE DRIVER ######################################### -->
-  <target name="internal.copy.database.driver" if="database.driver">
+  <target name="internal.copy.database.driver">
     <condition property="database.driver" value="mysql-connector-java.jar">
       <equals arg1="${database}" arg2="mysql" />
     </condition>
     <condition property="database.driver" value="ojdbc14.jar">
       <equals arg1="${database}" arg2="oracle" />
-    </condition>
-    <condition property="database.driver" value="mysql-connector-java.jar">
-      <equals arg1="${database}" arg2="mysql" />
-    </condition>
+    </condition>    
     <condition property="database.driver" value="postgresql.jar">
       <equals arg1="${database}" arg2="postgresql" />
     </condition>