Updated refereces to jive_*.

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

build/build.xml

@@ -639,11 +639,11 @@
 
         <!-- ie: wildfire -->
         <property name="release.name" value="${dist.prefix}"/>
-        <!-- ie: jive_wildfire_src -->
+        <!-- ie: wildfire_src -->
         <property name="release.name.src" value="${dist.prefix}_src"/>
-        <!-- ie: jive_wildfire_2_1_2 -->
+        <!-- ie: wildfire_2_1_2 -->
         <property name="release.fullname" value="${dist.prefix}_${version.filename}"/>
-        <!-- ie: jive_wildfire_src_2_1_2 -->
+        <!-- ie: wildfire_src_2_1_2 -->
         <property name="release.fullname.src" value="${dist.prefix}_src_${version.filename}"/>
 
         <property name="release.out.dir" value="${release.dest.dir}/${release.name}"/>

build/installer/wildfire.install4j

@@ -12,7 +12,7 @@
       <variable name="VERSION_MINOR" value="4" />
       <variable name="VERSION_REVISION" value="0" />
       <variable name="APP_NAME" value="Wildfire" />
-      <variable name="APP_SHORT_NAME" value="jive_wildfire" />
+      <variable name="APP_SHORT_NAME" value="wildfire" />
       <variable name="PRODUCT_NAME" value="wildfire" />
       <variable name="PUBLISHER" value="Jive Software" />
       <variable name="PUBLISHER_URL" value="www.jivesoftware.org" />
@@ -21,7 +21,7 @@
       <variable name="RELEASE_FULL_PATH" value="%RELEASE_ROOT_PATH%\%RELEASE_DIR%" />
       <variable name="FILE_PREFIX" value="%APP_SHORT_NAME%" />
       <variable name="APPLICATION_ID" value="6886-9911-0474-3571" />
-      <variable name="UNIX_INSTALL_DIR" value="jive_wildfire" />
+      <variable name="UNIX_INSTALL_DIR" value="wildfire" />
       <variable name="WINDOWS_INSTALL_DIR" value="Wildfire" />
     </variables>
   </application>
@@ -198,7 +198,7 @@
       <variables />
       <customScriptLines />
     </linuxRPM>
-    <unixArchive name="Unix Archive" id="30" mediaFileName="" installDir="jive_%PRODUCT_NAME%" allLaunchers="false" includedJRE="" manualJREEntry="false" customScriptMode="1" customScriptFile="">
+    <unixArchive name="Unix Archive" id="30" mediaFileName="" installDir="%PRODUCT_NAME%" allLaunchers="false" includedJRE="" manualJREEntry="false" customScriptMode="1" customScriptFile="">
       <selectedLaunchers>
         <launcher id="22" />
       </selectedLaunchers>

documentation/docs/install-guide.html

@@ -23,11 +23,11 @@ Run the Wildfire installer. The application will be installed to <tt>c:\Program
  
  Choose either the RPM or tar.gz build. If using the RPM, run it using your package manager to install Wildfire to <tt>/opt/wildfire</tt>:
 
- <p><tt>rpm -ivh jive_wildfire_2_1_2.rpm</tt></p>
+ <p><tt>rpm -ivh wildfire_2_4_0.rpm</tt></p>
  
  If using the .tar.gz, extract the archive to <tt>/opt</tt> or <tt>/usr/bin</tt>:
 
- <p><tt>tar -xzvf jive_wildfire_2_1_2.tar.gz<br>
+ <p><tt>tar -xzvf wildfire_2_4_0.tar.gz<br>
  mv wildfire /opt</tt></p>
 
  <p><b>Note:</b> the .tar.gz build does not contain a bundled Java runtime (JRE). Therefore, you must have JDK or JRE 1.5.0 (Java 5) or later installed on your system. You can check your java version by typing "java -version" at the command line and (if necessary) upgrade your Java installation by visiting http://java.sun.com.</p>

documentation/docs/ldap-guide.html

@@ -237,7 +237,7 @@
     <p>
         Some LDAP servers or application servers may require that a different LDAP
         initial context factory be used rather than the default (com.sun.jndi.ldap.LdapCtxFactory).
-        You can set a custom initial context factory by adding the following to jive_config.xml:
+        You can set a custom initial context factory by adding the following to wildfire.xml:
 
 <pre>
   &lt;ldap&gt;

src/bin/extra/wildfired

@@ -24,7 +24,7 @@
 #
 
 # Set this to tell this script where wildfire lives
-# If this is not set the script will look for /opt/jive_wildfire, then /usr/local/jive_wildfire
+# If this is not set the script will look for /opt/wildfire, then /usr/local/wildfire
 #export WILDFIRE_HOME=
 
 # If there is a different user you would like to run this script as,

src/java/org/jivesoftware/wildfire/net/SSLJiveKeyManagerFactory.java

@@ -26,7 +26,7 @@ import org.jivesoftware.util.Log;
 
 /**
  * A custom KeyManagerFactory that creates a key manager list using the
- * default key manager or a standard keystore as specified in jive_config.xml.
+ * default key manager or a standard keystore as specified in wildfire.xml.
  * The default keystore provided with the Jive distribution uses the Sun Java
  * Keystore (JKS) and that takes a single password which must apply to both the
  * keystore and the key itself. Users may specify another keystore type and keystore

src/java/org/jivesoftware/wildfire/net/SSLJiveTrustManagerFactory.java

@@ -25,7 +25,7 @@ import org.jivesoftware.util.Log;
 
 /**
  * A custom TrustManagerFactory that creates a trust manager list using the
- * default trust manager or a standard keystore as specified in jive_config.xml.
+ * default trust manager or a standard keystore as specified in wildfire.xml.
  * There is no default trust keystore provided with the Jive distribution as most
  * clients will not need to be authenticated with the server.
  * <p/>