Solaris build updates related to recent modules.xml inclusion

build/build.xml

@@ -1176,7 +1176,7 @@
 
         <copy tofile="${target.solaris.root}/pkginfo" file="${basedir}/build/pkg/pkginfo" />
         <copy tofile="${target.solaris.root}/opt/openfire/resources/solaris/openfire.xml" file="${basedir}/build/solaris/openfire.xml" />
-        <copy tofile="${target.solaris.root}/opt/openfire/resources/solaris/modules.xml" file="${basedir}/build/solaris/modules.xml" />
+        <copy tofile="${target.solaris.root}/opt/openfire/resources/solaris/modules.xml" file="${basedir}/src/conf/modules.xml" />
         <copy tofile="${target.solaris.root}/checkinstall" file="${basedir}/build/solaris/checkinstall" />
         <copy tofile="${target.solaris.root}/postinstall" file="${basedir}/build/solaris/postinstall" />
         <copy tofile="${target.solaris.root}/preremove" file="${basedir}/build/solaris/preremove" />

build/solaris/postinstall

@@ -10,6 +10,11 @@ if [ -f /tmp/openfireInstallBackup/security.xml ]; then
 	/bin/chown daemon:daemon /opt/openfire/conf/security.xml
 fi
 
+if [ -f /tmp/openfireInstallBackup/modules.xml ]; then
+        /bin/mv /tmp/openfireInstallBackup/modules.xml /opt/openfire/conf/modules.xml
+	/bin/chown daemon:daemon /opt/openfire/conf/modules.xml
+fi
+
 if [ -f /tmp/openfireInstallBackup/keystore ]; then
         /bin/mv /tmp/openfireInstallBackup/keystore /opt/openfire/resources/security/keystore
 	/bin/chown daemon:daemon /opt/openfire/resources/security/keystore

build/solaris/preremove

@@ -11,6 +11,9 @@ if [ -d "/opt/openfire" ]; then
 	if [ -f /opt/openfire/conf/security.xml ]; then
 		/bin/cp -f /opt/openfire/conf/security.xml /tmp/openfireInstallBackup/security.xml
 	fi
+	if [ -f /opt/openfire/conf/modules.xml ]; then
+		/bin/cp -f /opt/openfire/conf/modules.xml /tmp/openfireInstallBackup/modules.xml
+	fi
 	if [ -f /opt/openfire/resources/security/keystore ]; then
 		/bin/cp -f /opt/openfire/resources/security/keystore /tmp/openfireInstallBackup/keystore
 	fi