mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix ChatTranscript issue with current conversations.

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@6650 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2007-01-10 22:23:40 +00:00
committed by derek
parent 3910718a22
commit b6b7a35c66
7 changed files with 346 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

381
build/installer/spark.install4j
View File

@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<install4j version="3.2.1">
<install4j version="4.0.4" transformSequenceNumber="1">
<directoryPresets config="../../documentation" />
<application name="%APP_NAME%" distributionSourceDir="" applicationId="3057-7228-2063-7466" mediaDir="../../../../.." mediaFilePattern="spark_%VERSION%" compression="6" lzmaCompression="true" keepModificationTimes="false" shortName="%APP_SHORT_NAME%" publisher="%PUBLISHER%" publisherWeb="%PUBLISHER_URL%" version="%VERSION_MAJOR%.%VERSION_MINOR%.%VERSION_REVISION%" allPathsRelative="true" backupOnSave="false" autoSave="false" macSignature="????" javaMinVersion="1.5" javaMaxVersion="1.6" allowBetaVM="false">
<application name="${compiler:APP_NAME}" distributionSourceDir="" applicationId="3057-7228-2063-7466" mediaDir="../../../../.." mediaFilePattern="spark_${compiler:sys.version}" compression="6" lzmaCompression="true" pack200Compression="false" keepModificationTimes="false" shortName="${compiler:APP_SHORT_NAME}" publisher="${compiler:PUBLISHER}" publisherWeb="${compiler:PUBLISHER_URL}" version="${compiler:VERSION_MAJOR}.${compiler:VERSION_MINOR}.${compiler:VERSION_REVISION}" allPathsRelative="true" backupOnSave="false" autoSave="false" convertDotsToUnderscores="true" macSignature="????" javaMinVersion="1.5" javaMaxVersion="1.6" allowBetaVM="false">
<languages skipLanguageSelection="false">
<principalLanguage id="en" customLocalizationFile="" />
<additionalLanguages />
</languages>
<searchSequence>
<registry />
<envVar name="JAVA_HOME" />
@ -9,8 +13,8 @@
</searchSequence>
<variables>
<variable name="VERSION_MAJOR" value="2" />
<variable name="VERSION_MINOR" value="0" />
<variable name="VERSION_REVISION" value="4" />
<variable name="VERSION_MINOR" value="1" />
<variable name="VERSION_REVISION" value="0" />
<variable name="APP_NAME" value="Spark" />
<variable name="APP_SHORT_NAME" value="Spark" />
<variable name="PUBLISHER" value="Jive Software" />
@ -23,11 +27,12 @@
</variables>
</application>
<files>
<roots />
<mountPoints>
<mountPoint name="" id="1" location="" mode="755" />
<mountPoint id="1" root="" location="" mode="755" />
</mountPoints>
<entries>
<dirEntry mountPoint="1" file="../../target/build" overwrite="1" shared="false" mode="644" dontUninstall="false" excludeSuffixes="" dirMode="755">
<dirEntry mountPoint="1" file="../../target/build" overwrite="1" shared="false" mode="644" uninstallMode="0" excludeSuffixes="" dirMode="755">
<exclude>
<entry location="resources/version.xml~" launcher="false" />
</exclude>
@ -36,22 +41,17 @@
<components />
</files>
<launchers>
<launcher name="Spark" id="4" external="false" excludeFromMenu="false" menuName="" icnsFile="../../src/resources/images/message.icns" pngIcon16File="../../src/resources/images/message.png" pngIcon32File="../../src/resources/images/message-32x32.png" macServiceDependencies="" allowUserChangeServiceStartType="true">
<executable name="Spark" type="1" iconSet="true" iconFile="../../src/resources/images/message.ico" executableDir="." redirectStderr="true" stderrFile="logs/error.log" redirectStdout="true" stdoutFile="logs/output.log" failOnStderrOutput="true" executableMode="1" changeWorkingDirectory="true" workingDirectory="." singleInstance="true" serviceStartType="2" serviceDependencies="" serviceDescription="communicator" jreLocation="">
<versionInfo include="true" fileVersion="%VERSION%" companyName="" fileDescription="Spark" legalCopyright="Jive Software" productVersion="" internalName="%PRODUCT_NAME%" />
<launcher name="Spark" id="4" external="false" excludeFromMenu="false" menuName="" icnsFile="../../src/resources/images/message.icns" pngIcon16File="../../src/resources/images/message.png" pngIcon32File="../../src/resources/images/message-32x32.png" macServiceDependencies="" swtApp="false">
<executable name="Spark" type="1" iconSet="true" iconFile="../../src/resources/images/message.ico" executableDir="." redirectStderr="true" stderrFile="logs/error.log" redirectStdout="true" stdoutFile="logs/output.log" failOnStderrOutput="true" executableMode="1" changeWorkingDirectory="true" workingDirectory="." singleInstance="true" serviceStartType="2" serviceDependencies="" serviceDescription="communicator" jreLocation="" executionLevel="asInvoker">
<versionInfo include="true" fileVersion="${compiler:sys.version}" fileDescription="Spark" legalCopyright="Jive Software" internalName="${compiler:PRODUCT_NAME}" />
</executable>
<splashScreen show="false" autoOff="true" alwaysOnTop="true" width="0" height="0" bitmapFile="">
<text>
<statusLine x="20" y="20" text="" font="Arial" fontSize="8" fontColor="0,0,0" fontWeight="500" />
<versionLine x="20" y="40" text="version %VERSION%" font="Arial" fontSize="8" fontColor="0,0,0" fontWeight="500" />
<versionLine x="20" y="40" text="version ${compiler:sys.version}" font="Arial" fontSize="8" fontColor="0,0,0" fontWeight="500" />
</text>
</splashScreen>
<java mainClass="org.jivesoftware.Spark" vmParameters="&quot;-Dappdir=%INSTALL4J_EXEDIR%&quot; -Dsun.java2d.noddraw=true" arguments="" allowVMPassthroughParameters="true" minVersion="" maxVersion="" preferredVM="client" allowBetaVM="false" jdkOnly="false">
<searchSequence>
<registry />
<envVar name="JAVA_HOME" />
<envVar name="JDK_HOME" />
</searchSequence>
<java mainClass="org.jivesoftware.Spark" vmParameters="&quot;-Dappdir=${launcher:sys.launcherDirectory}&quot; -Dsun.java2d.noddraw=true" arguments="" allowVMPassthroughParameters="true" preferredVM="client">
<classPath>
<scanDirectory location="lib" failOnError="true" />
<directory location="resources" failOnError="false" />
@ -64,112 +64,343 @@
</nativeLibraryDirectories>
</java>
<includedFiles />
<unextractableFiles />
<customScript mode="1" file="">
<scriptLines />
</customScript>
</launcher>
<launcher name="starter" id="21" external="false" excludeFromMenu="false" menuName="" icnsFile="" pngIcon16File="" pngIcon32File="" macServiceDependencies="" allowUserChangeServiceStartType="true">
<executable name="starter" type="1" iconSet="false" iconFile="" executableDir="." redirectStderr="true" stderrFile="error.log" redirectStdout="false" stdoutFile="output.log" failOnStderrOutput="true" executableMode="1" changeWorkingDirectory="true" workingDirectory="." singleInstance="false" serviceStartType="2" serviceDependencies="" serviceDescription="" jreLocation="">
<versionInfo include="false" fileVersion="" companyName="" fileDescription="" legalCopyright="" productVersion="" internalName="" />
<launcher name="starter" id="21" external="false" excludeFromMenu="false" menuName="" icnsFile="" pngIcon16File="" pngIcon32File="" macServiceDependencies="" swtApp="false">
<executable name="starter" type="1" iconSet="false" iconFile="" executableDir="." redirectStderr="true" stderrFile="error.log" redirectStdout="false" stdoutFile="output.log" failOnStderrOutput="true" executableMode="1" changeWorkingDirectory="true" workingDirectory="." singleInstance="false" serviceStartType="2" serviceDependencies="" serviceDescription="" jreLocation="" executionLevel="asInvoker">
<versionInfo include="false" fileVersion="" fileDescription="" legalCopyright="" internalName="" />
</executable>
<splashScreen show="false" autoOff="true" alwaysOnTop="true" width="0" height="0" bitmapFile="">
<text>
<statusLine x="20" y="20" text="" font="Arial" fontSize="8" fontColor="0,0,0" fontWeight="500" />
<versionLine x="20" y="40" text="version %VERSION%" font="Arial" fontSize="8" fontColor="0,0,0" fontWeight="500" />
<versionLine x="20" y="40" text="version ${compiler:sys.version}" font="Arial" fontSize="8" fontColor="0,0,0" fontWeight="500" />
</text>
</splashScreen>
<java mainClass="org.jivesoftware.Restarter" vmParameters="" arguments="" allowVMPassthroughParameters="true" minVersion="" maxVersion="" preferredVM="" allowBetaVM="false" jdkOnly="false">
<searchSequence>
<registry />
<envVar name="JAVA_HOME" />
<envVar name="JDK_HOME" />
</searchSequence>
<java mainClass="org.jivesoftware.Restarter" vmParameters="" arguments="" allowVMPassthroughParameters="true" preferredVM="">
<classPath>
<scanDirectory location="lib" failOnError="false" />
</classPath>
<nativeLibraryDirectories />
</java>
<includedFiles />
<unextractableFiles />
<customScript mode="1" file="">
<scriptLines />
</customScript>
</launcher>
</launchers>
<installerGui installerType="1" runUninstallerOnUpdate="true" addOnAppId="" suggestPreviousLocations="true" allowUnattendedInstall="true" useCustomHeaderImage="false" customHeaderImage="" customSize="false" customWidth="500" customHeight="390">
<customCode preAction="false" preActionClass="" postAction="true" postActionClass="org.jivesoftware.Installer" preUninstallAction="false" preUninstallActionClass="" postUninstallAction="true" postUninstallActionClass="org.jivesoftware.Uninstaller" initHandler="false" initHandlerClass="" directoryValidator="false" directoryValidatorClass="" installationHandler="false" installationHandlerClass="">
<installerGui installerType="1" suggestPreviousProgramGroup="true" addOnAppId="" suggestPreviousLocations="true" allowUnattended="true" allowConsole="true" useCustomInstallerHeaderImage="false" customInstallerHeaderImage="" useCustomUninstallerHeaderImage="false" customUninstallerHeaderImage="" customSize="false" customWidth="500" customHeight="390" useCustomIcon="false" customIcnsFile="" customPngIcon16File="" customPngIcon32File="" customIcoFile="" vmParameters="" watermark="true" resizable="true">
<customCode useInstalledFiles="false">
<archive location="../../target/build/lib/spark.jar" />
</customCode>
<standardScreens>
<screen id="welcome" enabled="true" useCustomBanner="false" bannerImageFile="" background="255,255,255" />
<screen id="license" enabled="true" file="../../documentation/LICENSE.html" />
<screen id="location" enabled="true" showSpace="true" suggestAppDir="true" />
<screen id="components" enabled="true" allSelected="true" firstMandatory="true">
<selectedComponents />
<mandatoryComponents />
<installerScreens>
<screen name="" id="22" beanClass="com.install4j.runtime.beans.screens.WelcomeScreen" rollbackBarrier="false" backButton="2" finishScreen="false">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.screens.WelcomeScreen" />
</java>
</serializedBean>
<condition />
<validation />
<actions />
<formComponents />
</screen>
<screen id="programGroup" enabled="true" />
<screen id="fileAssociations" enabled="true">
<associations />
<screen name="" id="23" beanClass="com.install4j.runtime.beans.screens.LicenseScreen" rollbackBarrier="false" backButton="2" finishScreen="false">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.screens.LicenseScreen">
<void property="displayedTextFile">
<object class="com.install4j.api.beans.ExternalFile">
<string>../../documentation/LICENSE.html</string>
</object>
</void>
</object>
</java>
</serializedBean>
<condition />
<validation />
<actions />
<formComponents />
</screen>
<screen id="services" enabled="true" allSelected="true">
<selectedServiceLaunchers />
<screen name="" id="24" beanClass="com.install4j.runtime.beans.screens.InstallationDirectoryScreen" rollbackBarrier="false" backButton="2" finishScreen="false">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.screens.InstallationDirectoryScreen" />
</java>
</serializedBean>
<condition />
<validation />
<actions />
<formComponents />
</screen>
<screen id="additionalTasks" enabled="true" customTasksPlacement="1">
<customTasks />
<screen name="" id="25" beanClass="com.install4j.runtime.beans.screens.ComponentsScreen" rollbackBarrier="false" backButton="2" finishScreen="false">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.screens.ComponentsScreen" />
</java>
</serializedBean>
<condition />
<validation />
<actions />
<formComponents />
</screen>
<screen id="preInfo" enabled="false" file="" />
<screen id="install" enabled="true" />
<screen id="postInfo" enabled="false" file="" />
<screen id="finished" enabled="true" useCustomBanner="false" bannerImageFile="" background="255,255,255" />
</standardScreens>
<customScreens />
<screen name="" id="26" beanClass="com.install4j.runtime.beans.screens.StandardProgramGroupScreen" rollbackBarrier="false" backButton="2" finishScreen="false">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.screens.StandardProgramGroupScreen" />
</java>
</serializedBean>
<condition />
<validation />
<actions />
<formComponents />
</screen>
<screen name="" id="27" beanClass="com.install4j.runtime.beans.screens.FileAssociationsScreen" rollbackBarrier="false" backButton="2" finishScreen="false">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.screens.FileAssociationsScreen" />
</java>
</serializedBean>
<condition />
<validation />
<actions />
<formComponents />
</screen>
<screen name="" id="28" beanClass="com.install4j.runtime.beans.screens.InstallationScreen" rollbackBarrier="true" backButton="2" finishScreen="false">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.screens.InstallationScreen" />
</java>
</serializedBean>
<condition />
<validation />
<actions>
<action name="" id="29" beanClass="com.install4j.runtime.beans.actions.UninstallPreviousAction" rollbackBarrier="false" multiExec="false" failureStrategy="1" errorMessage="">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.actions.UninstallPreviousAction" />
</java>
</serializedBean>
<condition />
</action>
<action name="" id="30" beanClass="com.install4j.runtime.beans.actions.InstallFilesAction" rollbackBarrier="false" multiExec="false" failureStrategy="1" errorMessage="">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.actions.InstallFilesAction" />
</java>
</serializedBean>
<condition />
</action>
<action name="" id="31" beanClass="com.install4j.runtime.beans.actions.desktop.CreateProgramGroupAction" rollbackBarrier="false" multiExec="false" failureStrategy="1" errorMessage="">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.actions.desktop.CreateProgramGroupAction">
<void property="programGroupName">
<string>${compiler:sys.fullName}</string>
</void>
</object>
</java>
</serializedBean>
<condition />
</action>
<action name="" id="32" beanClass="com.install4j.runtime.beans.actions.desktop.RegisterAddRemoveAction" rollbackBarrier="false" multiExec="false" failureStrategy="1" errorMessage="">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.actions.desktop.RegisterAddRemoveAction">
<void property="itemName">
<string>${compiler:sys.fullName} ${compiler:sys.version}</string>
</void>
</object>
</java>
</serializedBean>
<condition />
</action>
</actions>
<formComponents />
</screen>
<screen name="" id="33" beanClass="com.install4j.runtime.beans.screens.FinishedScreen" rollbackBarrier="false" backButton="2" finishScreen="true">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.screens.FinishedScreen" />
</java>
</serializedBean>
<condition />
<validation />
<actions>
<action name="" id="44" beanClass="com.install4j.runtime.beans.actions.finish.ExecuteLauncherAction" rollbackBarrier="false" multiExec="false" failureStrategy="1" errorMessage="">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.actions.finish.ExecuteLauncherAction">
<void property="launcherId">
<string>4</string>
</void>
</object>
</java>
</serializedBean>
<condition>context.getBooleanVariable("executeLauncherAction") &amp;&amp; (!context.isUnattended())</condition>
</action>
</actions>
<formComponents>
<formComponent name="Execute launcher" id="45" beanClass="com.install4j.runtime.beans.formcomponents.CheckboxComponent" insetTop="" insetLeft="" insetBottom="" insetRight="" resetInitOnPrevious="false">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.formcomponents.CheckboxComponent">
<void property="checkboxText">
<string>${i18n:RunEntryExec("${compiler:sys.fullName}")}</string>
</void>
<void property="initiallySelected">
<boolean>true</boolean>
</void>
<void property="variableName">
<string>executeLauncherAction</string>
</void>
</object>
</java>
</serializedBean>
<initScript />
</formComponent>
</formComponents>
</screen>
</installerScreens>
<uninstallerScreens>
<screen name="" id="34" beanClass="com.install4j.runtime.beans.screens.UninstallWelcomeScreen" rollbackBarrier="false" backButton="2" finishScreen="false">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.screens.UninstallWelcomeScreen" />
</java>
</serializedBean>
<condition />
<validation />
<actions />
<formComponents />
</screen>
<screen name="" id="35" beanClass="com.install4j.runtime.beans.screens.UninstallationScreen" rollbackBarrier="false" backButton="2" finishScreen="false">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.screens.UninstallationScreen" />
</java>
</serializedBean>
<condition />
<validation />
<actions>
<action name="" id="36" beanClass="com.install4j.runtime.beans.actions.UninstallFilesAction" rollbackBarrier="false" multiExec="false" failureStrategy="1" errorMessage="">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.actions.UninstallFilesAction" />
</java>
</serializedBean>
<condition />
</action>
</actions>
<formComponents />
</screen>
<screen name="" id="37" beanClass="com.install4j.runtime.beans.screens.UninstallFailureScreen" rollbackBarrier="false" backButton="2" finishScreen="true">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.screens.UninstallFailureScreen" />
</java>
</serializedBean>
<condition />
<validation />
<actions />
<formComponents />
</screen>
<screen name="" id="38" beanClass="com.install4j.runtime.beans.screens.UninstallSuccessScreen" rollbackBarrier="false" backButton="2" finishScreen="true">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.screens.UninstallSuccessScreen" />
</java>
</serializedBean>
<condition />
<validation />
<actions />
<formComponents />
</screen>
</uninstallerScreens>
<installerStartup>
<screen name="" id="15" beanClass="com.install4j.runtime.beans.screens.StartupScreen" rollbackBarrier="false" backButton="2" finishScreen="false">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.screens.StartupScreen" />
</java>
</serializedBean>
<condition />
<validation />
<actions />
<formComponents />
</screen>
</installerStartup>
<uninstallerStartup>
<screen name="" id="16" beanClass="com.install4j.runtime.beans.screens.StartupScreen" rollbackBarrier="false" backButton="2" finishScreen="false">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.screens.StartupScreen" />
</java>
</serializedBean>
<condition />
<validation />
<actions />
<formComponents />
</screen>
</uninstallerStartup>
</installerGui>
<mediaSets>
<win32 name="Windows" id="2" mediaFileName="" installDir="Spark" allLaunchers="true" includedJRE="windows-x86-1.5.0_08" manualJREEntry="false" bundleType="1" jreURL="" jreFtpURL="" jreShared="false" customInstallBaseDir="" allowUserStartAfterFinish="true" launchExecutableId="4" createUninstallIcon="true" overrideLicenseFile="false" licenseFile="" overridePreInformationFile="false" preInformationFile="" overridePostInformationFile="false" postInformationFile="" adminRequired="false" languageID="en" modeDesktopIcon="3" desktopLauncherId="4" programGroup="Spark" allowUserDisableStartMenuCreation="false" reboot="false" rebootUninstaller="false" modeQuickLaunchIon="2">
<selectedLaunchers />
<messageSet language="English" />
<win32 name="Windows" id="2" mediaFileName="" installDir="Spark" overridePrincipalLanguage="true" requires64bit="false" runPostProcessor="false" postProcessor="" includedJRE="windows-x86-1.5.0_08" manualJREEntry="false" bundleType="1" jreURL="" jreFtpURL="" jreShared="false" customInstallBaseDir="" createUninstallIcon="true" contentFilesType="1" downloadURL="" runAsAdmin="false">
<excludedLaunchers />
<excludedComponents />
<overriddenPrincipalLanguage id="en" customLocalizationFile="" />
<exclude>
<entry location="bin/startup.bat" launcher="false" />
<entry location="lib/linux" launcher="false" />
</exclude>
<variables />
<excludedScreenIds />
<additionalStartMenuEntries />
<excludedInstallerScreens />
<excludedUninstallerScreens />
</win32>
<macos name="Mac OS X Single Bundle" id="6" mediaFileName="" installDir="%APP_SHORT_NAME%" allLaunchers="false" customInstallBaseDir="" allowUserStartAfterFinish="true" launchExecutableId="4" createUninstallIcon="true" overrideLicenseFile="false" licenseFile="" overridePreInformationFile="false" preInformationFile="" overridePostInformationFile="false" postInformationFile="" adminRequired="false" languageID="en" modeDesktopIcon="1" desktopLauncherId="">
<selectedLaunchers>
<launcher id="4" />
</selectedLaunchers>
<messageSet language="English" />
<macos name="Mac OS X Single Bundle" id="6" mediaFileName="" installDir="${compiler:APP_SHORT_NAME}" overridePrincipalLanguage="true" requires64bit="false" runPostProcessor="false" postProcessor="" customInstallBaseDir="" createUninstallIcon="true" contentFilesType="1" downloadURL="" launcherId="4">
<excludedComponents />
<overriddenPrincipalLanguage id="en" customLocalizationFile="" />
<exclude />
<variables />
<excludedScreenIds />
<excludedInstallerScreens />
<excludedUninstallerScreens />
</macos>
<win32 name="Updater" id="12" mediaFileName="CommunicatorUpdate" installDir="Jive Communicator" allLaunchers="false" includedJRE="" manualJREEntry="false" bundleType="1" jreURL="" jreFtpURL="" jreShared="false" customInstallBaseDir="" allowUserStartAfterFinish="true" launchExecutableId="4" createUninstallIcon="true" overrideLicenseFile="false" licenseFile="" overridePreInformationFile="false" preInformationFile="" overridePostInformationFile="false" postInformationFile="" adminRequired="false" languageID="en" modeDesktopIcon="1" desktopLauncherId="" programGroup="Jive IM" allowUserDisableStartMenuCreation="false" reboot="false" rebootUninstaller="false" modeQuickLaunchIon="1">
<selectedLaunchers>
<launcher id="4" />
</selectedLaunchers>
<messageSet language="English" />
<win32 name="Updater" id="12" mediaFileName="CommunicatorUpdate" installDir="Jive Communicator" overridePrincipalLanguage="true" requires64bit="false" runPostProcessor="false" postProcessor="" includedJRE="" manualJREEntry="false" bundleType="1" jreURL="" jreFtpURL="" jreShared="false" customInstallBaseDir="" createUninstallIcon="true" contentFilesType="1" downloadURL="" runAsAdmin="false">
<excludedLaunchers>
<launcher id="21" />
</excludedLaunchers>
<excludedComponents />
<overriddenPrincipalLanguage id="en" customLocalizationFile="" />
<exclude />
<variables />
<excludedScreenIds />
<additionalStartMenuEntries />
<excludedInstallerScreens />
<excludedUninstallerScreens />
</win32>
<unixArchive name="Unix Archive" id="13" mediaFileName="" installDir="%APP_SHORT_NAME%" allLaunchers="true" includedJRE="linux-x86-1.5.0_08_client_only" manualJREEntry="false" customScriptMode="1" customScriptFile="">
<selectedLaunchers />
<messageSet language="English" />
<unixArchive name="Unix Archive" id="13" mediaFileName="" installDir="${compiler:APP_SHORT_NAME}" overridePrincipalLanguage="true" requires64bit="false" runPostProcessor="false" postProcessor="" includedJRE="linux-x86-1.5.0_08_client_only" manualJREEntry="false">
<excludedLaunchers />
<excludedComponents />
<overriddenPrincipalLanguage id="en" customLocalizationFile="" />
<exclude>
<entry location="bin/startup.bat" launcher="false" />
<entry location="lib/windows" launcher="false" />
<entry location="plugins/jniwrapper.jar" launcher="false" />
</exclude>
<variables />
<customScriptLines />
</unixArchive>
<win32 name="Windows NON-JRE" id="19" mediaFileName="spark_%VERSION%_online" installDir="Spark" allLaunchers="true" includedJRE="windows-x86-1.5.0_05_us_only" manualJREEntry="false" bundleType="2" jreURL="http://www.jivesoftware.org/updater/releases/windows-x86-1.5.0_05.tar.gz" jreFtpURL="" jreShared="false" customInstallBaseDir="" allowUserStartAfterFinish="true" launchExecutableId="4" createUninstallIcon="true" overrideLicenseFile="false" licenseFile="" overridePreInformationFile="false" preInformationFile="" overridePostInformationFile="false" postInformationFile="" adminRequired="false" languageID="en" modeDesktopIcon="3" desktopLauncherId="4" programGroup="Spark" allowUserDisableStartMenuCreation="false" reboot="false" rebootUninstaller="false" modeQuickLaunchIon="2">
<selectedLaunchers />
<messageSet language="English" />
<win32 name="Windows NON-JRE" id="19" mediaFileName="spark_${compiler:sys.version}_online" installDir="Spark" overridePrincipalLanguage="true" requires64bit="false" runPostProcessor="false" postProcessor="" includedJRE="windows-x86-1.5.0_05_us_only" manualJREEntry="false" bundleType="2" jreURL="http://www.jivesoftware.org/updater/releases/windows-x86-1.5.0_05.tar.gz" jreFtpURL="" jreShared="false" customInstallBaseDir="" createUninstallIcon="true" contentFilesType="1" downloadURL="" runAsAdmin="false">
<excludedLaunchers />
<excludedComponents />
<overriddenPrincipalLanguage id="en" customLocalizationFile="" />
<exclude>
<entry location="bin/startup.bat" launcher="false" />
<entry location="lib/linux" launcher="false" />
</exclude>
<variables />
<excludedScreenIds />
<additionalStartMenuEntries />
<excludedInstallerScreens />
<excludedUninstallerScreens />
</win32>
</mediaSets>
<buildIds buildAll="false">

2
build/projects/Spark.iml
View File

@ -202,7 +202,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib/dist/syntheticaBlueMoon.jar!/" />
<root url="jar://$MODULE_DIR$/../../../../crapola/bluelookandfeel/moon.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />

1
build/projects/Spark.ipr
View File

@ -404,6 +404,7 @@
<modules>
<module fileurl="file://$PROJECT_DIR$/Spark.iml" filepath="$PROJECT_DIR$/Spark.iml" />
<module fileurl="file://$PROJECT_DIR$/../../../sparkphone/client/SparkPhone.iml" filepath="$PROJECT_DIR$/../../../sparkphone/client/SparkPhone.iml" />
<module fileurl="file://$PROJECT_DIR$/../../../sparkcom/plugins/outlook/outlook.iml" filepath="$PROJECT_DIR$/../../../sparkcom/plugins/outlook/outlook.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.6 (1)" project-jdk-type="JavaSDK" />

8
src/java/org/jivesoftware/spark/ui/ChatContainer.java
View File

@ -123,7 +123,7 @@ public class ChatContainer extends SparkTabbedPane implements MessageListener, C
public void allTabsRemoved() {
chatFrame.setTitle("");
chatFrame.setVisible(false);
chatFrame.dispose();
}
});
@ -384,7 +384,7 @@ public class ChatContainer extends SparkTabbedPane implements MessageListener, C
}
else if (!chatFrame.isVisible()) {
if (Spark.isWindows()) {
//chatFrame.setFocusableWindowState(false);
chatFrame.setFocusableWindowState(false);
chatFrame.setState(Frame.ICONIFIED);
}
chatFrame.setVisible(true);
@ -640,7 +640,7 @@ public class ChatContainer extends SparkTabbedPane implements MessageListener, C
}
else if (!chatFrame.isVisible()) {
if (Spark.isWindows()) {
//chatFrame.setFocusableWindowState(false);
chatFrame.setFocusableWindowState(false);
chatFrame.setState(Frame.ICONIFIED);
}
chatFrame.setVisible(true);
@ -723,7 +723,7 @@ public class ChatContainer extends SparkTabbedPane implements MessageListener, C
if (getTabCount() == 0) {
chatFrame.setTitle("");
chatFrame.setVisible(false);
chatFrame.dispose();
}
this.removeTabAt(location);

9
src/java/org/jivesoftware/spark/ui/ChatRoom.java
View File

@ -368,6 +368,15 @@ public abstract class ChatRoom extends BackgroundPanel implements ActionListener
scrollToBottom();
}
public void addToTranscript(String to, String from, String body, Date date) {
final Message newMessage = new Message();
newMessage.setTo(to);
newMessage.setFrom(from);
newMessage.setBody(body);
newMessage.setProperty("date", date);
transcript.add(newMessage);
}
/**
* Scrolls the chat window to the bottom.
*/

1
src/java/org/jivesoftware/spark/ui/rooms/ChatRoomImpl.java
View File

@ -659,6 +659,7 @@ public class ChatRoomImpl extends ChatRoom {
String nickname = StringUtils.parseName(from);
Date date = message.getDate();
getTranscriptWindow().insertHistoryMessage(nickname, message.getBody(), date);
addToTranscript(message.getTo(), message.getFrom(), message.getBody(), date);
}
}

16
src/java/org/jivesoftware/sparkimpl/plugin/transcripts/ChatTranscripts.java
View File

@ -11,8 +11,8 @@
package org.jivesoftware.sparkimpl.plugin.transcripts;
import org.jivesoftware.spark.SparkManager;
import org.jivesoftware.spark.util.log.Log;
import org.jivesoftware.spark.util.StringUtils;
import org.jivesoftware.spark.util.log.Log;
import org.xmlpull.mxp1.MXParser;
import org.xmlpull.v1.XmlPullParser;
@ -60,18 +60,18 @@ final public class ChatTranscripts {
final File transcriptFile = getTranscriptFile(jid);
// Write Full Transcript
writeToFile(transcriptFile, transcript.getMessages());
writeToFile(transcriptFile, transcript.getMessages(), true);
// Write to current history File
final File currentHistoryFile = getCurrentHistoryFile(jid);
writeToFile(currentHistoryFile, transcript.getNumberOfEntries(20));
writeToFile(currentHistoryFile, transcript.getNumberOfEntries(20), false);
}
private static void writeToFile(File transcriptFile, Collection<HistoryMessage> messages) {
private static void writeToFile(File transcriptFile, Collection<HistoryMessage> messages, boolean append) {
final StringBuilder builder = new StringBuilder();
// Handle new transcript file.
if (!transcriptFile.exists()) {
if (!transcriptFile.exists() || !append) {
builder.append("<transcript><messages>");
}
@ -86,12 +86,12 @@ final public class ChatTranscripts {
builder.append("</message>");
}
if (!transcriptFile.exists()) {
if (!transcriptFile.exists() || !append) {
builder.append("</messages></transcript>");
}
if (!transcriptFile.exists()) {
if (!transcriptFile.exists() || !append) {
// Write out new File
try {
FileOutputStream fout = new FileOutputStream(transcriptFile);
@ -105,6 +105,7 @@ final public class ChatTranscripts {
return;
}
if (append) {
// Append to File
try {
final RandomAccessFile raf = new RandomAccessFile(transcriptFile, "rw");
@ -124,6 +125,7 @@ final public class ChatTranscripts {
Log.error(e);
}
}
}
/**
* Retrieve the current chat history.