More renaming work.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@7670 b35dd754-fafc-0310-a699-88a17e54d16e

src/bin/extra/embedded-db.rc

-# Connection settings for the embedded Wildfire database.
+# Connection settings for the embedded Openfire database.
 urlid embedded-db
-url jdbc:hsqldb:../../embedded-db/wildfire
+url jdbc:hsqldb:../../embedded-db/openfire
 username sa
 password

src/bin/extra/openfire-launchd-wrapper.sh

 #!/bin/bash
-export OPENFIRE_HOME=/usr/local/wildfire
+export OPENFIRE_HOME=/usr/local/openfire
 export JAVA_HOME=/Library/Java/Home
 
 function shutdown() 
 {
 	date
 	echo "Shutting down Openfire"
-    kill -s TERM `ps auxww | grep -v wrapper | awk '/wildfire/ && !/awk/ {print $2}'`
+    kill -s TERM `ps auxww | grep -v wrapper | awk '/openfire/ && !/awk/ {print $2}'`
 }
 
 date
 echo "Starting Openfire"
 
-/usr/bin/java -server -jar "$OPENFIRE_HOME/lib/startup.jar" -Dwildfire.lib.dir=/usr/local/wildfire/lib&
+/usr/bin/java -server -jar "$OPENFIRE_HOME/lib/startup.jar" -Dopenfire.lib.dir=/usr/local/openfire/lib&
 
-OPENFIRE_PID=`ps auxww | grep -v wrapper | awk '/wildfire/ && !/awk/ {print $2}'`
+OPENFIRE_PID=`ps auxww | grep -v wrapper | awk '/openfire/ && !/awk/ {print $2}'`
 
 # allow any signal which would kill a process to stop Openfire
 trap shutdown HUP INT QUIT ABRT KILL ALRM TERM TSTP

src/bin/extra/redhat-postinstall.sh

@@ -16,10 +16,10 @@ OPENFIRE_USER="jive"
 OPENFIRE_GROUP="jive"
 
 if [ ! $OPENFIRE_HOME ]; then
-	if [ -d "/opt/wildfire" ]; then
-		OPENFIRE_HOME="/opt/wildfire"
-	elif [ -d "/usr/local/wildfire" ]; then
-		OPENFIRE_HOME="/usr/local/wildfire"
+	if [ -d "/opt/openfire" ]; then
+		OPENFIRE_HOME="/opt/openfire"
+	elif [ -d "/usr/local/openfire" ]; then
+		OPENFIRE_HOME="/usr/local/openfire"
 	fi
 fi
 

src/bin/openfire.sh

@@ -71,7 +71,7 @@ fi
 
 #set the OPENFIRE_LIB location
 OPENFIRE_LIB="${OPENFIRE_HOME}/lib"
-OPENFIRE_OPTS="${OPENFIRE_OPTS} -Dwildfire.lib.dir=${OPENFIRE_LIB}"
+OPENFIRE_OPTS="${OPENFIRE_OPTS} -Dopenfire.lib.dir=${OPENFIRE_LIB}"
 
 
 if [ -z "$JAVACMD" ] ; then

src/java/org/jivesoftware/wildfire/starter/ServerStarter.java

@@ -32,7 +32,7 @@ import java.util.jar.JarOutputStream;
  *      <li>Start the server</li>
  * </ul>
  *
- * Note: if the enviroment property <tt>wildfire.lib.directory</tt> is specified
+ * Note: if the enviroment property <tt>openfire.lib.directory</tt> is specified
  * ServerStarter will attempt to use this value as the value for openfire's lib
  * directory. If the property is not specified the default value of ../lib will be used.
  *
@@ -60,7 +60,7 @@ public class ServerStarter {
             // Load up the bootstrap container
             final ClassLoader parent = findParentClassLoader();
 
-            String libDirString = System.getProperty("wildfire.lib.dir");
+            String libDirString = System.getProperty("openfire.lib.dir");
 
             File libDir;
             if (libDirString != null) {