Skip to content

O
Openfire
Commit 86b52c91 authored by Guus der Kinderen's avatar Guus der Kinderen
Browse files
Options

OF-951: Dropping support for Solaris.

parent 748e2cf6
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 221 deletions
build/build.xml
View file @ 86b52c91
......@@ -1182,85 +1182,6 @@
</if>
</target>
<!-- installer.solaris ========================================================================= -->
<target name="installer.solaris" depends="init, dist.init, dist.bin" description="Builds a solaris pkg of openfire.">
<property name="target.solaris" value="${work.dir}/solaris" />
<property name="target.solaris.root" value="${target.solaris}/root" />
<!-- <property name="target.solaris.pkg" value="${target.solaris}/pkg" /> -->
<property name="target.solaris.pkg" value="/var/spool/pkg" />
<property name="solaris.pkg.name" value="JSopenfire"/>
<property name="solaris.pkg.filename" value="${solaris.pkg.name}-${version}-ALL.pkg"/>
<tstamp>
<format property="solaris.builddate" pattern="yyyymmdd" locale="en"/>
</tstamp>
<antcall target="dist.bin">
<!-- Don't need package for installer build -->
<param name="no.package" value="true"/>
</antcall>
<mkdir dir="${target.solaris.root}" />
<mkdir dir="${target.solaris.root}/opt" />
<!-- <mkdir dir="${target.solaris.pkg}" /> -->
<mkdir dir="${target.solaris.root}/opt/openfire/resources/solaris" />
<copy todir="${target.solaris.root}/opt/openfire">
<fileset dir="${release.out.dir}"/>
</copy>
<chmod perm="0755" file="${target.solaris.root}/opt/openfire/bin/openfirectl" />
<chmod perm="0755" file="${target.solaris.root}/opt/openfire/bin/openfire.sh" />
<chmod perm="0755" file="${target.solaris.root}/opt/openfire/bin/extra/embedded-db-viewer.sh" />
<delete file="${target.solaris.root}/opt/openfire/bin/openfire.bat" />
<delete file="${target.solaris.root}/opt/openfire/bin/openfire-dev.bat" />
<delete file="${target.solaris.root}/opt/openfire/bin/extra/openfire-launchd-wrapper.sh" />
<delete file="${target.solaris.root}/opt/openfire/bin/extra/openfired" />
<delete dir="${target.solaris.root}/opt/openfire/bin/extra/redhat" />
<delete file="${target.solaris.root}/opt/openfire/bin/extra/redhat-postinstall.sh" />
<delete file="${target.solaris.root}/opt/openfire/bin/extra/embedded-db-viewer.bat" />
<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}/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" />
<copy tofile="${target.solaris.root}/Prototype" file="${basedir}/build/pkg/Prototype.template" overwrite="true"/>
<exec executable="/usr/bin/pkgproto" output="${target.solaris.root}/Prototype" append="true" failonerror="true">
<arg value="${target.solaris.root}/opt/openfire=/opt/openfire"/>
</exec>
<replaceregexp file="${target.solaris.root}/Prototype" match="(.* .* .* .*) .* .*" replace="\1 daemon daemon" byline="true"/>
<replaceregexp file="${target.solaris.root}/Prototype" match=".* (.* /opt/openfire/conf/openfire.xml=.* .* .* .*)" replace="e \1" byline="true"/>
<replaceregexp file="${target.solaris.root}/Prototype" match=".* (.* /opt/openfire/conf/modules.xml=.* .* .* .*)" replace="e \1" byline="true"/>
<replaceregexp file="${target.solaris.root}/Prototype" match=".* (.* /opt/openfire/resources/security/keystore=.* .* .* .*)" replace="e \1" byline="true"/>
<replaceregexp file="${target.solaris.root}/Prototype" match=".* (.* /opt/openfire/resources/security/truststore=.* .* .* .*)" replace="e \1" byline="true"/>
<replaceregexp file="${target.solaris.root}/Prototype" match=".* (.* /opt/openfire/resources/security/client.truststore=.* .* .* .*)" replace="e \1" byline="true"/>
<replaceregexp file="${target.solaris.root}/Prototype" match=".* (.* /opt/openfire/bin/embedded-db.rc=.* .* .* .*)" replace="e \1" byline="true"/>
<exec executable="/usr/bin/pkgmk" dir="${target.solaris.root}" failonerror="true">
<arg value="-o"/>
<!-- <arg value="-d ${target.solaris.pkg}"/> this doesn't work as advertised -->
<arg value="-v ${version}"/>
<arg value="-p ${solaris.builddate}"/>
</exec>
<touch file="${release.dest.dir}/${solaris.pkg.filename}"/>
<exec executable="/usr/bin/pkgtrans" failonerror="true">
<arg value="-s"/>
<arg value="${target.solaris.pkg}"/>
<arg value="${release.dest.dir}/${solaris.pkg.filename}"/>
<arg value="${solaris.pkg.name}"/>
</exec>
<gzip src="${release.dest.dir}/${solaris.pkg.filename}" destfile="${release.dest.dir}/${solaris.pkg.filename}.gz"/>
<delete dir="${target.solaris.pkg}/${solaris.pkg.name}"/>
</target>
<!-- plugins =============================================================================== -->
<target name="plugins" description="Builds all plugins" depends="anttasks">
<tstamp>
......
build/rpm/openfire.spec
View file @ 86b52c91
......@@ -74,7 +74,6 @@ mv $RPM_BUILD_ROOT%{homedir}/bin/extra/embedded-db-viewer.sh $RPM_BUILD_ROOT%{ho
rm -rf $RPM_BUILD_ROOT%{homedir}/bin/extra
rm -f $RPM_BUILD_ROOT%{homedir}/bin/*.bat
rm -rf $RPM_BUILD_ROOT%{homedir}/resources/nativeAuth/osx-ppc
rm -rf $RPM_BUILD_ROOT%{homedir}/resources/nativeAuth/solaris-sparc
rm -rf $RPM_BUILD_ROOT%{homedir}/resources/nativeAuth/win32-x86
rm -f $RPM_BUILD_ROOT%{homedir}/lib/*.dll
......
build/solaris/checkinstall deleted 100755 → 0
View file @ 748e2cf6
#!/bin/sh
#
expectedrelease="5.10"
release=`/bin/uname -r`
if [ `/bin/expr $release \< $expectedrelease` -eq 1 ]; then
/bin/echo "\n\n\n\tWARNING: This package may not work with Solaris releases"
/bin/echo "\tolder than version 10 (5.10).\n\n\n"
fi
if [ ! -d "/usr/java" ]; then
/bin/echo "\n\n\n\tJava does not appear to be installed on this system!"
/bin/echo "\tAborting installation.\n\n\n"
exit 1
fi
exit 0
build/solaris/openfire.xml deleted 100644 → 0
View file @ 748e2cf6
<?xml version='1.0'?>
<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
<service_bundle type='manifest' name='export'>
<service name='network/openfire' type='service' version='0'>
<create_default_instance enabled='true'/>
<single_instance/>
<dependency name='loopback' grouping='require_all' restart_on='error' type='service'>
<service_fmri value='svc:/network/loopback:default'/>
</dependency>
<dependency name='physical' grouping='require_all' restart_on='error' type='service'>
<service_fmri value='svc:/network/physical:default'/>
</dependency>
<dependency name='fs-local' grouping='require_all' restart_on='none' type='service'>
<service_fmri value='svc:/system/filesystem/local'/>
</dependency>
<exec_method name='start' type='method' exec='/opt/openfire/bin/openfirectl start' timeout_seconds='60'>
<method_context/>
</exec_method>
<exec_method name='stop' type='method' exec='/opt/openfire/bin/openfirectl stop' timeout_seconds='60'>
<method_context/>
</exec_method>
<stability value='Stable'/>
<template>
<common_name>
<loctext xml:lang='C'>Openfire XMPP Server</loctext>
</common_name>
<documentation>
<doc_link name='igniterealtime.org' uri='http://www.igniterealtime.org/projects/openfire/index.jsp'/>
</documentation>
</template>
</service>
</service_bundle>
build/solaris/postinstall deleted 100755 → 0
View file @ 748e2cf6
#!/bin/sh
#
if [ -f /tmp/openfireInstallBackup/openfire.xml ]; then
/bin/mv /tmp/openfireInstallBackup/openfire.xml /opt/openfire/conf/openfire.xml
/bin/chown daemon:daemon /opt/openfire/conf/openfire.xml
fi
if [ -f /tmp/openfireInstallBackup/security.xml ]; then
/bin/mv /tmp/openfireInstallBackup/security.xml /opt/openfire/conf/security.xml
/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
fi
if [ -f /tmp/openfireInstallBackup/truststore ]; then
/bin/mv /tmp/openfireInstallBackup/truststore /opt/openfire/resources/security/truststore
/bin/chown daemon:daemon /opt/openfire/resources/security/truststore
fi
if [ -f /tmp/openfireInstallBackup/client.truststore ]; then
/bin/mv /tmp/openfireInstallBackup/client.truststore /opt/openfire/resources/security/client.truststore
/bin/chown daemon:daemon /opt/openfire/resources/security/client.truststore
fi
if [ -f /tmp/openfireInstallBackup/log4j.xml ]; then
/bin/mv /tmp/openfireInstallBackup/log4j.xml /opt/openfire/lib/log4j.xml
/bin/chown daemon:daemon /opt/openfire/lib/log4j.xml
fi
if [ -d "/tmp/openfireInstallBackup" ]; then
/bin/rm -rf /tmp/openfireInstallBackup
fi
if [ -x "/usr/sbin/svccfg" ]; then
if [ -d "/opt/openfire/resources/solaris" ]; then
/usr/sbin/svccfg import /opt/openfire/resources/solaris/openfire.xml
fi
fi
if [ -x "/usr/sbin/svcadm" ]; then
/usr/sbin/svcadm enable openfire
fi
/bin/chmod o-rwx /opt/openfire
build/solaris/preremove deleted 100755 → 0
View file @ 748e2cf6
#!/bin/sh
#
if [ -d "/opt/openfire" ]; then
/bin/rm -rf /tmp/openfireInstallBackup
/bin/mkdir -p /tmp/openfireInstallBackup
if [ -f /opt/openfire/conf/openfire.xml ]; then
/bin/cp -f /opt/openfire/conf/openfire.xml /tmp/openfireInstallBackup/openfire.xml
fi
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
if [ -f /opt/openfire/resources/security/truststore ]; then
/bin/cp -f /opt/openfire/resources/security/truststore /tmp/openfireInstallBackup/truststore
fi
if [ -f /opt/openfire/resources/security/client.truststore ]; then
/bin/cp -f /opt/openfire/resources/security/client.truststore /tmp/openfireInstallBackup/client.truststore
fi
if [ -f /opt/openfire/lib/log4j.xml ]; then
/bin/cp -f /opt/openfire/lib/log4j.xml /tmp/openfireInstallBackup/log4j.xml
fi
if [ -x "/usr/sbin/svcadm" ]; then
/usr/sbin/svcadm disable openfire
fi
if [ -x "/usr/sbin/svccfg" ]; then
/usr/sbin/svccfg delete -f openfire
fi
fi
src/java/org/jivesoftware/openfire/launcher/GraphicUtils.java
View file @ 86b52c91
......@@ -169,7 +169,7 @@ public final class GraphicUtils {
Rectangle screenBounds = screensBounds[i];
if (screenBounds.x <= x && x <= (screenBounds.x + screenBounds.width)) {
Dimension sizeScreen = screenBounds.getSize();
sizeScreen.height -= 32; // Hack to help prevent menu being clipped by Windows/Linux/Solaris Taskbar.
sizeScreen.height -= 32; // Hack to help prevent menu being clipped by Windows/Linux Taskbar.
int xOffset = 0;
if (bottomRightMenu.x > (screenBounds.x + sizeScreen.width))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023