mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2024-12-23 04:57:58 +01:00
Fixes
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6945 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
parent
035852e6ec
commit
bf6471e76b
4 changed files with 8 additions and 12 deletions
|
@ -278,7 +278,7 @@
|
||||||
|
|
||||||
<!-- release -->
|
<!-- release -->
|
||||||
<!-- ======================================================================================= -->
|
<!-- ======================================================================================= -->
|
||||||
<target name="release" if="release.exists" depends="release-exists">
|
<target name="release" description="Builds a release" if="release.exists" depends="release-exists">
|
||||||
<antcall target="jar">
|
<antcall target="jar">
|
||||||
<param name="no.test" value="true" />
|
<param name="no.test" value="true" />
|
||||||
</antcall>
|
</antcall>
|
||||||
|
|
|
@ -112,31 +112,31 @@
|
||||||
<if>
|
<if>
|
||||||
<equals arg1="${dailybuild}" arg2="true" />
|
<equals arg1="${dailybuild}" arg2="true" />
|
||||||
<then>
|
<then>
|
||||||
<zip destfile="${basedir}/release/${release-dev.name}.zip"
|
<zip destfile="${basedir}/target/release/${release-dev.name}.zip"
|
||||||
basedir="${release-dev.dir}/.."
|
basedir="${release-dev.dir}/.."
|
||||||
includes="${release-dev.name}/**/*.*"
|
includes="${release-dev.name}/**/*.*"
|
||||||
/>
|
/>
|
||||||
<tar destfile="${basedir}/release/${release-dev.name}.tar.gz"
|
<tar destfile="${basedir}/target/release/${release-dev.name}.tar.gz"
|
||||||
basedir="${release-dev.dir}/.."
|
basedir="${release-dev.dir}/.."
|
||||||
includes="${release-dev.name}/**/*.*"
|
includes="${release-dev.name}/**/*.*"
|
||||||
compression="gzip"
|
compression="gzip"
|
||||||
/>
|
/>
|
||||||
</then>
|
</then>
|
||||||
<else>
|
<else>
|
||||||
<zip destfile="${basedir}/release/${release.name}.zip"
|
<zip destfile="${basedir}/target/release/${release.name}.zip"
|
||||||
basedir="${release.dir}/.."
|
basedir="${release.dir}/.."
|
||||||
includes="${release.name}/**/*.*"
|
includes="${release.name}/**/*.*"
|
||||||
/>
|
/>
|
||||||
<tar destfile="${basedir}/release/${release.name}.tar.gz"
|
<tar destfile="${basedir}/target/release/${release.name}.tar.gz"
|
||||||
basedir="${release.dir}/.."
|
basedir="${release.dir}/.."
|
||||||
includes="${release.name}/**/*.*"
|
includes="${release.name}/**/*.*"
|
||||||
compression="gzip"
|
compression="gzip"
|
||||||
/>
|
/>
|
||||||
<zip destfile="${basedir}/release/${release-dev.name}.zip"
|
<zip destfile="${basedir}/target/release/${release-dev.name}.zip"
|
||||||
basedir="${release-dev.dir}/.."
|
basedir="${release-dev.dir}/.."
|
||||||
includes="${release-dev.name}/**/*.*"
|
includes="${release-dev.name}/**/*.*"
|
||||||
/>
|
/>
|
||||||
<tar destfile="${basedir}/release/${release-dev.name}.tar.gz"
|
<tar destfile="${basedir}/target/release/${release-dev.name}.tar.gz"
|
||||||
basedir="${release-dev.dir}/.."
|
basedir="${release-dev.dir}/.."
|
||||||
includes="${release-dev.name}/**/*.*"
|
includes="${release-dev.name}/**/*.*"
|
||||||
compression="gzip"
|
compression="gzip"
|
||||||
|
|
|
@ -124,7 +124,7 @@ public class RosterEntry {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the roster subscription type of the entry. When the type is
|
* Returns the roster subscription type of the entry. When the type is
|
||||||
* {@link RosterPacket.ItemType#none} or {@link RosterPacket.ItemType#from},
|
* RosterPacket.ItemType.none or RosterPacket.ItemType.from,
|
||||||
* refer to {@link RosterEntry getStatus()} to see if a subscription request
|
* refer to {@link RosterEntry getStatus()} to see if a subscription request
|
||||||
* is pending.
|
* is pending.
|
||||||
*
|
*
|
||||||
|
|
|
@ -588,10 +588,6 @@ public class XMPPConnection {
|
||||||
* Closes the connection by setting presence to unavailable then closing the stream to
|
* Closes the connection by setting presence to unavailable then closing the stream to
|
||||||
* the XMPP server. The XMPPConnection can still be used for connecting to the server
|
* the XMPP server. The XMPPConnection can still be used for connecting to the server
|
||||||
* again.
|
* again.
|
||||||
*
|
|
||||||
* The difference between disconnect and shutdown is that disconnect makes a complete reset
|
|
||||||
* of the connection state whereas shutdown only cleans the connection and keeps alive
|
|
||||||
* packet reader listeners, previous login and roster presences.
|
|
||||||
*/
|
*/
|
||||||
public void disconnect() {
|
public void disconnect() {
|
||||||
this.shutdown();
|
this.shutdown();
|
||||||
|
|
Loading…
Reference in a new issue