Index: modules/distro/src/main/files/install/build.xml
===================================================================
--- modules/distro/src/main/files/install/build.xml	(revision 6480)
+++ modules/distro/src/main/files/install/build.xml	(working copy)
@@ -21,9 +21,9 @@
   <property name="tx" value="standalone" />
 
   <!-- INTERNAL PROPERTY DEFAULTS -->
-  <property name="jbpm.version" value="4.4-SNAPSHOT" />
+  <property name="jbpm.version" value="4.5-SNAPSHOT" />
   <property name="jbpm.parent.dir" value="../.." />
-  <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" />
+  <property name="jbpm.home" value="." />
   <!-- jdbc | datasource -->
   <property name="hibernate.connection.type" value="jdbc" />
   <!-- jdk | none -->
@@ -592,7 +592,7 @@
       <filterset filtersfile="${jdbc.properties.dir}/${database}.properties" />
     </copy>
     <replace file="${tomcat.home}/conf/server.xml"
-             token="@bind.address@"
+             token="$${bind.address}"
              value="${bind.address}" />
   </target>
 
Index: modules/distro/src/main/files/install/src/tomcat/server.xml
===================================================================
--- modules/distro/src/main/files/install/src/tomcat/server.xml	(revision 6480)
+++ modules/distro/src/main/files/install/src/tomcat/server.xml	(working copy)
@@ -23,25 +23,25 @@
 
   <Service name="Catalina">
 
-    <Connector address="@bind.address@" port="8080" protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="8443" />
+    <Connector address="${bind.address}" port="8080" protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="8443" />
 
-    <Connector address="@bind.address@" port="8009" protocol="AJP/1.3" redirectPort="8443" />
+    <Connector address="${bind.address}" port="8009" protocol="AJP/1.3" redirectPort="8443" />
 
     <Engine name="Catalina" defaultHost="localhost">
 
       <Host name="localhost" appBase="webapps" unpackWARs="true"
         autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false">
 
-        <!-- 
+        <!--
           Current workaround for using the JBPM identity tables on Tomcat.
           Setting the Realm on the context with path /jbpm-console did not seem
-          to work. Note that this workaround means that the cmplete localhost 
+          to work. Note that this workaround means that the cmplete localhost
           domain will use this realm !
          -->
         <Realm className="org.jbpm.integration.tomcat6.JbpmConsoleRealm"
-               driverName="@jdbc.driver@" 
+               driverName="@jdbc.driver@"
                connectionUrl="@jdbc.url@"
-               connectionName="@jdbc.username@" 
+               connectionName="@jdbc.username@"
                connectionPassword="@jdbc.password@" />
 
       </Host>