OF-728 Remove bundled JRE from source tree (finally), set a build.properties entry for

where to find the bundled JRE when building the installer.rpm target.  For example
ant -Djre.bundle.location=/tmp/jre-1.7.0-55.tgz installer.rpm

build/build.properties.template

@@ -25,3 +25,8 @@ plugin.dev.dir=
 # if you used the standard location you won't need to edit the property below.
 #
 # installer.install4j.home=
+
+#
+# Path to a bundled JRE you wish to use with the installer.rpm ant target
+#
+jre.bundle.location=
\ No newline at end of file

build/build.xml

@@ -1114,7 +1114,7 @@
             <equals arg1="${bundle.jre}" arg2="true"/>
             <then>
                 <!-- Include bundled jre -->
-                <copy todir="${target.rpm}/SOURCES" file="${basedir}/build/rpm/jre-dist.tar.gz" />
+                <copy todir="${target.rpm}/SOURCES" file="${jre.bundle.location}" />
             </then>
         </if>
         <copy todir="${target.rpm}/SOURCES" file="${release.dest.dir}/${release.fullname.src}.tar.gz" />
@@ -1125,7 +1125,7 @@
             <then>
 	      <rpm specFile="openfire.spec"
 		  topDir="${target.rpm}"
-		  command="-ba --target i386 --define 'OPENFIRE_VERSION ${version}' --define 'OPENFIRE_SOURCE ${release.fullname.src}.tar.gz' --define 'OPENFIRE_BUILDDATE ${rpm.builddate}'"
+		  command="-ba --target i386 --define 'JRE_BUNDLE ${jre.bundle.location}' --define 'OPENFIRE_VERSION ${version}' --define 'OPENFIRE_SOURCE ${release.fullname.src}.tar.gz' --define 'OPENFIRE_BUILDDATE ${rpm.builddate}'"
 		  failOnError="true"
 		  />
 

build/rpm/openfire.spec

@@ -5,7 +5,7 @@ Release: 1
 BuildRoot: %{_builddir}/%{name}-root
 Source0: %{OPENFIRE_SOURCE}
 %ifnarch noarch
-Source1: jre-dist.tar.gz
+Source1: %{JRE_BUNDLE}
 %endif
 Group: Applications/Communications
 Vendor: Jive Software