Skip to content

O
Openfire
Commit 4234ed48 authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato
Browse files
Options

More refactoring work. Changing to new name. 

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk/src/plugins/gateway@7742 b35dd754-fafc-0310-a699-88a17e54d16e
parent fc2d9e92
Hide whitespace changes
Inline Side-by-side
Showing with 195 additions and 197 deletions
plugin.xml
View file @ 4234ed48
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<plugin> <plugin>
<!-- Main plugin class --> <!-- Main plugin class -->
<class>org.jivesoftware.wildfire.gateway.GatewayPlugin</class> <class>org.jivesoftware.openfire.gateway.GatewayPlugin</class>
<!-- Plugin meta-data --> <!-- Plugin meta-data -->
<name>IM Gateway</name> <name>IM Gateway</name>
......
src/java/org/jivesoftware/wildfire/gateway/BaseTransport.java → src/java/org/jivesoftware/openfire/gateway/BaseTransport.java
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway; package org.jivesoftware.openfire.gateway;
import org.dom4j.DocumentHelper; import org.dom4j.DocumentHelper;
import org.dom4j.Element; import org.dom4j.Element;
...@@ -17,13 +17,13 @@ import org.jivesoftware.util.JiveGlobals; ...@@ -17,13 +17,13 @@ import org.jivesoftware.util.JiveGlobals;
import org.jivesoftware.util.LocaleUtils; import org.jivesoftware.util.LocaleUtils;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.util.NotFoundException; import org.jivesoftware.util.NotFoundException;
import org.jivesoftware.wildfire.SessionManager; import org.jivesoftware.openfire.SessionManager;
import org.jivesoftware.wildfire.XMPPServer; import org.jivesoftware.openfire.XMPPServer;
import org.jivesoftware.wildfire.container.PluginManager; import org.jivesoftware.openfire.container.PluginManager;
import org.jivesoftware.wildfire.roster.Roster; import org.jivesoftware.openfire.roster.Roster;
import org.jivesoftware.wildfire.roster.*; import org.jivesoftware.openfire.roster.*;
import org.jivesoftware.wildfire.user.UserAlreadyExistsException; import org.jivesoftware.openfire.user.UserAlreadyExistsException;
import org.jivesoftware.wildfire.user.UserNotFoundException; import org.jivesoftware.openfire.user.UserNotFoundException;
import org.xmpp.component.Component; import org.xmpp.component.Component;
import org.xmpp.component.ComponentManager; import org.xmpp.component.ComponentManager;
import org.xmpp.forms.DataForm; import org.xmpp.forms.DataForm;
...@@ -76,19 +76,19 @@ public abstract class BaseTransport implements Component, RosterEventListener { ...@@ -76,19 +76,19 @@ public abstract class BaseTransport implements Component, RosterEventListener {
/** /**
* Manages all active sessions. * Manages all active sessions.
* @see org.jivesoftware.wildfire.gateway.TransportSessionManager * @see org.jivesoftware.openfire.gateway.TransportSessionManager
*/ */
public final TransportSessionManager sessionManager = new TransportSessionManager(this); public final TransportSessionManager sessionManager = new TransportSessionManager(this);
/** /**
* Manages registration information. * Manages registration information.
* @see org.jivesoftware.wildfire.gateway.RegistrationManager * @see org.jivesoftware.openfire.gateway.RegistrationManager
*/ */
public final RegistrationManager registrationManager = new RegistrationManager(); public final RegistrationManager registrationManager = new RegistrationManager();
/** /**
* Manages permission information. * Manages permission information.
* @see org.jivesoftware.wildfire.gateway.PermissionManager * @see org.jivesoftware.openfire.gateway.PermissionManager
*/ */
public PermissionManager permissionManager = null; public PermissionManager permissionManager = null;
...@@ -114,7 +114,7 @@ public abstract class BaseTransport implements Component, RosterEventListener { ...@@ -114,7 +114,7 @@ public abstract class BaseTransport implements Component, RosterEventListener {
/** /**
* Type of the transport in question. * Type of the transport in question.
* @see org.jivesoftware.wildfire.gateway.TransportType * @see org.jivesoftware.openfire.gateway.TransportType
*/ */
public TransportType transportType = null; public TransportType transportType = null;
...@@ -1611,7 +1611,7 @@ public abstract class BaseTransport implements Component, RosterEventListener { ...@@ -1611,7 +1611,7 @@ public abstract class BaseTransport implements Component, RosterEventListener {
/** /**
* Intercepts roster additions related to the gateway and flags them as non-persistent. * Intercepts roster additions related to the gateway and flags them as non-persistent.
* *
* @see org.jivesoftware.wildfire.roster.RosterEventListener#addingContact(org.jivesoftware.wildfire.roster.Roster, org.jivesoftware.wildfire.roster.RosterItem, boolean) * @see org.jivesoftware.openfire.roster.RosterEventListener#addingContact(org.jivesoftware.openfire.roster.Roster, org.jivesoftware.openfire.roster.RosterItem, boolean)
*/ */
public boolean addingContact(Roster roster, RosterItem item, boolean persistent) { public boolean addingContact(Roster roster, RosterItem item, boolean persistent) {
if (item.getJid().getDomain().equals(this.getJID().toString()) && item.getJid().getNode() != null) { if (item.getJid().getDomain().equals(this.getJID().toString()) && item.getJid().getNode() != null) {
...@@ -1623,7 +1623,7 @@ public abstract class BaseTransport implements Component, RosterEventListener { ...@@ -1623,7 +1623,7 @@ public abstract class BaseTransport implements Component, RosterEventListener {
/** /**
* Handles updates to a roster item that are not normally forwarded to the transport. * Handles updates to a roster item that are not normally forwarded to the transport.
* *
* @see org.jivesoftware.wildfire.roster.RosterEventListener#contactUpdated(org.jivesoftware.wildfire.roster.Roster, org.jivesoftware.wildfire.roster.RosterItem) * @see org.jivesoftware.openfire.roster.RosterEventListener#contactUpdated(org.jivesoftware.openfire.roster.Roster, org.jivesoftware.openfire.roster.RosterItem)
*/ */
public void contactUpdated(Roster roster, RosterItem item) { public void contactUpdated(Roster roster, RosterItem item) {
if (!item.getJid().getDomain().equals(this.getJID().getDomain())) { if (!item.getJid().getDomain().equals(this.getJID().getDomain())) {
...@@ -1649,7 +1649,7 @@ public abstract class BaseTransport implements Component, RosterEventListener { ...@@ -1649,7 +1649,7 @@ public abstract class BaseTransport implements Component, RosterEventListener {
/** /**
* Handles additions to a roster. We don't really care because we hear about these via subscribes. * Handles additions to a roster. We don't really care because we hear about these via subscribes.
* *
* @see org.jivesoftware.wildfire.roster.RosterEventListener#contactAdded(org.jivesoftware.wildfire.roster.Roster, org.jivesoftware.wildfire.roster.RosterItem) * @see org.jivesoftware.openfire.roster.RosterEventListener#contactAdded(org.jivesoftware.openfire.roster.Roster, org.jivesoftware.openfire.roster.RosterItem)
*/ */
public void contactAdded(Roster roster, RosterItem item) { public void contactAdded(Roster roster, RosterItem item) {
if (!item.getJid().getDomain().equals(this.getJID().getDomain())) { if (!item.getJid().getDomain().equals(this.getJID().getDomain())) {
...@@ -1675,7 +1675,7 @@ public abstract class BaseTransport implements Component, RosterEventListener { ...@@ -1675,7 +1675,7 @@ public abstract class BaseTransport implements Component, RosterEventListener {
/** /**
* Handles deletions from a roster. We don't really care because we hear about these via unsubscribes. * Handles deletions from a roster. We don't really care because we hear about these via unsubscribes.
* *
* @see org.jivesoftware.wildfire.roster.RosterEventListener#contactDeleted(org.jivesoftware.wildfire.roster.Roster, org.jivesoftware.wildfire.roster.RosterItem) * @see org.jivesoftware.openfire.roster.RosterEventListener#contactDeleted(org.jivesoftware.openfire.roster.Roster, org.jivesoftware.openfire.roster.RosterItem)
*/ */
public void contactDeleted(Roster roster, RosterItem item) { public void contactDeleted(Roster roster, RosterItem item) {
if (!item.getJid().getDomain().equals(this.getJID().getDomain())) { if (!item.getJid().getDomain().equals(this.getJID().getDomain())) {
...@@ -1701,7 +1701,7 @@ public abstract class BaseTransport implements Component, RosterEventListener { ...@@ -1701,7 +1701,7 @@ public abstract class BaseTransport implements Component, RosterEventListener {
/** /**
* Handles notifications of a roster being loaded. Not sure we care. * Handles notifications of a roster being loaded. Not sure we care.
* *
* @see org.jivesoftware.wildfire.roster.RosterEventListener#rosterLoaded(org.jivesoftware.wildfire.roster.Roster) * @see org.jivesoftware.openfire.roster.RosterEventListener#rosterLoaded(org.jivesoftware.openfire.roster.Roster)
*/ */
public void rosterLoaded(Roster roster) { public void rosterLoaded(Roster roster) {
Log.debug(getType().toString()+": rosterLoaded "+roster.getUsername()); Log.debug(getType().toString()+": rosterLoaded "+roster.getUsername());
......
src/java/org/jivesoftware/wildfire/gateway/ChatStateType.java → src/java/org/jivesoftware/openfire/gateway/ChatStateType.java
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway; package org.jivesoftware.openfire.gateway;
/** /**
* An enumeration for different chat state types. * An enumeration for different chat state types.
......
src/java/org/jivesoftware/wildfire/gateway/GatewayPlugin.java → src/java/org/jivesoftware/openfire/gateway/GatewayPlugin.java
View file @ 4234ed48
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway; package org.jivesoftware.openfire.gateway;
import org.jivesoftware.util.LocaleUtils; import org.jivesoftware.util.LocaleUtils;
import org.jivesoftware.wildfire.container.Plugin; import org.jivesoftware.openfire.container.Plugin;
import org.jivesoftware.wildfire.container.PluginManager; import org.jivesoftware.openfire.container.PluginManager;
import org.xmpp.component.ComponentManager; import org.xmpp.component.ComponentManager;
import org.xmpp.component.ComponentManagerFactory; import org.xmpp.component.ComponentManagerFactory;
import org.picocontainer.MutablePicoContainer; import org.picocontainer.MutablePicoContainer;
...@@ -63,23 +63,23 @@ public class GatewayPlugin implements Plugin { ...@@ -63,23 +63,23 @@ public class GatewayPlugin implements Plugin {
ComponentManager componentManager = ComponentManagerFactory.getComponentManager(); ComponentManager componentManager = ComponentManagerFactory.getComponentManager();
/* Set up AIM transport. */ /* Set up AIM transport. */
transports.put("aim", new TransportInstance(TransportType.aim, LocaleUtils.getLocalizedString("gateway.aim.name", "gateway"), "org.jivesoftware.wildfire.gateway.protocols.oscar.OSCARTransport", componentManager)); transports.put("aim", new TransportInstance(TransportType.aim, LocaleUtils.getLocalizedString("gateway.aim.name", "gateway"), "org.jivesoftware.openfire.gateway.protocols.oscar.OSCARTransport", componentManager));
maybeStartService("aim"); maybeStartService("aim");
/* Set up ICQ transport. */ /* Set up ICQ transport. */
transports.put("icq", new TransportInstance(TransportType.icq, LocaleUtils.getLocalizedString("gateway.icq.name", "gateway"), "org.jivesoftware.wildfire.gateway.protocols.oscar.OSCARTransport", componentManager)); transports.put("icq", new TransportInstance(TransportType.icq, LocaleUtils.getLocalizedString("gateway.icq.name", "gateway"), "org.jivesoftware.openfire.gateway.protocols.oscar.OSCARTransport", componentManager));
maybeStartService("icq"); maybeStartService("icq");
/* Set up IRC transport. */ /* Set up IRC transport. */
transports.put("irc", new TransportInstance(TransportType.irc, LocaleUtils.getLocalizedString("gateway.irc.name", "gateway"), "org.jivesoftware.wildfire.gateway.protocols.irc.IRCTransport", componentManager)); transports.put("irc", new TransportInstance(TransportType.irc, LocaleUtils.getLocalizedString("gateway.irc.name", "gateway"), "org.jivesoftware.openfire.gateway.protocols.irc.IRCTransport", componentManager));
maybeStartService("irc"); maybeStartService("irc");
/* Set up Yahoo transport. */ /* Set up Yahoo transport. */
transports.put("yahoo", new TransportInstance(TransportType.yahoo, LocaleUtils.getLocalizedString("gateway.yahoo.name", "gateway"), "org.jivesoftware.wildfire.gateway.protocols.yahoo.YahooTransport", componentManager)); transports.put("yahoo", new TransportInstance(TransportType.yahoo, LocaleUtils.getLocalizedString("gateway.yahoo.name", "gateway"), "org.jivesoftware.openfire.gateway.protocols.yahoo.YahooTransport", componentManager));
maybeStartService("yahoo"); maybeStartService("yahoo");
/* Set up MSN transport. */ /* Set up MSN transport. */
transports.put("msn", new TransportInstance(TransportType.msn, LocaleUtils.getLocalizedString("gateway.msn.name", "gateway"), "org.jivesoftware.wildfire.gateway.protocols.msn.MSNTransport", componentManager)); transports.put("msn", new TransportInstance(TransportType.msn, LocaleUtils.getLocalizedString("gateway.msn.name", "gateway"), "org.jivesoftware.openfire.gateway.protocols.msn.MSNTransport", componentManager));
maybeStartService("msn"); maybeStartService("msn");
} }
......
src/java/org/jivesoftware/wildfire/gateway/PermissionManager.java → src/java/org/jivesoftware/openfire/gateway/PermissionManager.java
View file @ 4234ed48
...@@ -8,15 +8,15 @@ ...@@ -8,15 +8,15 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway; package org.jivesoftware.openfire.gateway;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
import org.jivesoftware.util.JiveGlobals; import org.jivesoftware.util.JiveGlobals;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.database.DbConnectionManager; import org.jivesoftware.database.DbConnectionManager;
import org.jivesoftware.wildfire.group.GroupManager; import org.jivesoftware.openfire.group.GroupManager;
import org.jivesoftware.wildfire.group.Group; import org.jivesoftware.openfire.group.Group;
import org.jivesoftware.wildfire.user.User; import org.jivesoftware.openfire.user.User;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
......
src/java/org/jivesoftware/wildfire/gateway/PresenceType.java → src/java/org/jivesoftware/openfire/gateway/PresenceType.java
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway; package org.jivesoftware.openfire.gateway;
/** /**
* An enumeration for different presence types. * An enumeration for different presence types.
......
src/java/org/jivesoftware/wildfire/gateway/PseudoRoster.java → src/java/org/jivesoftware/openfire/gateway/PseudoRoster.java
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway; package org.jivesoftware.openfire.gateway;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.util.NotFoundException; import org.jivesoftware.util.NotFoundException;
......
src/java/org/jivesoftware/wildfire/gateway/PseudoRosterItem.java → src/java/org/jivesoftware/openfire/gateway/PseudoRosterItem.java
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway; package org.jivesoftware.openfire.gateway;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.util.NotFoundException; import org.jivesoftware.util.NotFoundException;
......
src/java/org/jivesoftware/wildfire/gateway/PseudoRosterManager.java → src/java/org/jivesoftware/openfire/gateway/PseudoRosterManager.java
View file @ 4234ed48
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway; package org.jivesoftware.openfire.gateway;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
import org.jivesoftware.wildfire.user.UserNotFoundException; import org.jivesoftware.openfire.user.UserNotFoundException;
import org.jivesoftware.database.DbConnectionManager; import org.jivesoftware.database.DbConnectionManager;
import java.util.Collection; import java.util.Collection;
...@@ -31,7 +31,7 @@ public class PseudoRosterManager { ...@@ -31,7 +31,7 @@ public class PseudoRosterManager {
/** /**
* Manages registration information. * Manages registration information.
* @see org.jivesoftware.wildfire.gateway.RegistrationManager * @see org.jivesoftware.openfire.gateway.RegistrationManager
*/ */
public final RegistrationManager registrationManager = new RegistrationManager(); public final RegistrationManager registrationManager = new RegistrationManager();
......
src/java/org/jivesoftware/wildfire/gateway/Registration.java → src/java/org/jivesoftware/openfire/gateway/Registration.java
View file @ 4234ed48
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway; package org.jivesoftware.openfire.gateway;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
import org.jivesoftware.wildfire.auth.AuthFactory; import org.jivesoftware.openfire.auth.AuthFactory;
import org.jivesoftware.util.NotFoundException; import org.jivesoftware.util.NotFoundException;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.database.DbConnectionManager; import org.jivesoftware.database.DbConnectionManager;
......
src/java/org/jivesoftware/wildfire/gateway/RegistrationManager.java → src/java/org/jivesoftware/openfire/gateway/RegistrationManager.java
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway; package org.jivesoftware.openfire.gateway;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
import org.jivesoftware.database.DbConnectionManager; import org.jivesoftware.database.DbConnectionManager;
......
src/java/org/jivesoftware/wildfire/gateway/SupportedFeature.java → src/java/org/jivesoftware/openfire/gateway/SupportedFeature.java
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway; package org.jivesoftware.openfire.gateway;
/** /**
* An enumeration for supported features. * An enumeration for supported features.
......
src/java/org/jivesoftware/wildfire/gateway/TransportBuddy.java → src/java/org/jivesoftware/openfire/gateway/TransportBuddy.java
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway; package org.jivesoftware.openfire.gateway;
/** /**
* Transport Buddy. * Transport Buddy.
......
src/java/org/jivesoftware/wildfire/gateway/TransportInstance.java → src/java/org/jivesoftware/openfire/gateway/TransportInstance.java
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway; package org.jivesoftware.openfire.gateway;
import org.jivesoftware.util.JiveGlobals; import org.jivesoftware.util.JiveGlobals;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
......
src/java/org/jivesoftware/wildfire/gateway/TransportLoginStatus.java → src/java/org/jivesoftware/openfire/gateway/TransportLoginStatus.java
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway; package org.jivesoftware.openfire.gateway;
/** /**
* An enumeration for different login statuses. * An enumeration for different login statuses.
......
src/java/org/jivesoftware/wildfire/gateway/TransportSession.java → src/java/org/jivesoftware/openfire/gateway/TransportSession.java
View file @ 4234ed48
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway; package org.jivesoftware.openfire.gateway;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
import org.jivesoftware.wildfire.user.UserNotFoundException; import org.jivesoftware.openfire.user.UserNotFoundException;
import org.jivesoftware.wildfire.roster.RosterItem; import org.jivesoftware.openfire.roster.RosterItem;
import org.jivesoftware.wildfire.roster.Roster; import org.jivesoftware.openfire.roster.Roster;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import java.util.ArrayList; import java.util.ArrayList;
......
src/java/org/jivesoftware/wildfire/gateway/TransportSessionManager.java → src/java/org/jivesoftware/openfire/gateway/TransportSessionManager.java
View file @ 4234ed48
...@@ -8,14 +8,14 @@ ...@@ -8,14 +8,14 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway; package org.jivesoftware.openfire.gateway;
import java.util.*; import java.util.*;
import org.jivesoftware.util.NotFoundException; import org.jivesoftware.util.NotFoundException;
import org.jivesoftware.wildfire.SessionManager; import org.jivesoftware.openfire.SessionManager;
import org.jivesoftware.wildfire.XMPPServer; import org.jivesoftware.openfire.XMPPServer;
import org.jivesoftware.wildfire.user.UserNotFoundException; import org.jivesoftware.openfire.user.UserNotFoundException;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
/** /**
......
src/java/org/jivesoftware/wildfire/gateway/TransportType.java → src/java/org/jivesoftware/openfire/gateway/TransportType.java
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway; package org.jivesoftware.openfire.gateway;
/** /**
* An enumeration for the valid transport types, which encompasses proprietary IM networks * An enumeration for the valid transport types, which encompasses proprietary IM networks
......
src/java/org/jivesoftware/wildfire/gateway/UserCapabilities.java → src/java/org/jivesoftware/openfire/gateway/UserCapabilities.java
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway; package org.jivesoftware.openfire.gateway;
/** /**
* User Capabilities Tracking * User Capabilities Tracking
......
src/java/org/jivesoftware/wildfire/gateway/protocols/irc/IRCListener.java → src/java/org/jivesoftware/openfire/gateway/protocols/irc/IRCListener.java
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway.protocols.irc; package org.jivesoftware.openfire.gateway.protocols.irc;
import org.schwering.irc.lib.IRCEventListener; import org.schwering.irc.lib.IRCEventListener;
import org.schwering.irc.lib.IRCUser; import org.schwering.irc.lib.IRCUser;
...@@ -19,8 +19,8 @@ import org.xmpp.packet.Presence; ...@@ -19,8 +19,8 @@ import org.xmpp.packet.Presence;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.util.LocaleUtils; import org.jivesoftware.util.LocaleUtils;
import org.jivesoftware.wildfire.gateway.PresenceType; import org.jivesoftware.openfire.gateway.PresenceType;
import org.jivesoftware.wildfire.gateway.TransportLoginStatus; import org.jivesoftware.openfire.gateway.TransportLoginStatus;
import java.util.*; import java.util.*;
......
src/java/org/jivesoftware/wildfire/gateway/protocols/irc/IRCSession.java → src/java/org/jivesoftware/openfire/gateway/protocols/irc/IRCSession.java
View file @ 4234ed48
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway.protocols.irc; package org.jivesoftware.openfire.gateway.protocols.irc;
import org.jivesoftware.wildfire.gateway.*; import org.jivesoftware.openfire.gateway.*;
import org.jivesoftware.wildfire.roster.RosterItem; import org.jivesoftware.openfire.roster.RosterItem;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.util.JiveGlobals; import org.jivesoftware.util.JiveGlobals;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
...@@ -160,7 +160,7 @@ public class IRCSession extends TransportSession { ...@@ -160,7 +160,7 @@ public class IRCSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#updateStatus(org.jivesoftware.wildfire.gateway.PresenceType, String) * @see org.jivesoftware.openfire.gateway.TransportSession#updateStatus(org.jivesoftware.openfire.gateway.PresenceType, String)
*/ */
public void updateStatus(PresenceType presenceType, String verboseStatus) { public void updateStatus(PresenceType presenceType, String verboseStatus) {
String awayMsg = ((IRCTransport)getTransport()).convertJabStatusToIRC(presenceType, verboseStatus); String awayMsg = ((IRCTransport)getTransport()).convertJabStatusToIRC(presenceType, verboseStatus);
...@@ -182,7 +182,7 @@ public class IRCSession extends TransportSession { ...@@ -182,7 +182,7 @@ public class IRCSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#addContact(org.jivesoftware.wildfire.roster.RosterItem) * @see org.jivesoftware.openfire.gateway.TransportSession#addContact(org.jivesoftware.openfire.roster.RosterItem)
*/ */
public void addContact(RosterItem item) { public void addContact(RosterItem item) {
String contact = getTransport().convertJIDToID(item.getJid()); String contact = getTransport().convertJIDToID(item.getJid());
...@@ -200,7 +200,7 @@ public class IRCSession extends TransportSession { ...@@ -200,7 +200,7 @@ public class IRCSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#removeContact(org.jivesoftware.wildfire.roster.RosterItem) * @see org.jivesoftware.openfire.gateway.TransportSession#removeContact(org.jivesoftware.openfire.roster.RosterItem)
*/ */
public void removeContact(RosterItem item) { public void removeContact(RosterItem item) {
String contact = getTransport().convertJIDToID(item.getJid()); String contact = getTransport().convertJIDToID(item.getJid());
...@@ -209,7 +209,7 @@ public class IRCSession extends TransportSession { ...@@ -209,7 +209,7 @@ public class IRCSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#updateContact(org.jivesoftware.wildfire.roster.RosterItem) * @see org.jivesoftware.openfire.gateway.TransportSession#updateContact(org.jivesoftware.openfire.roster.RosterItem)
*/ */
public void updateContact(RosterItem item) { public void updateContact(RosterItem item) {
String contact = getTransport().convertJIDToID(item.getJid()); String contact = getTransport().convertJIDToID(item.getJid());
...@@ -227,28 +227,28 @@ public class IRCSession extends TransportSession { ...@@ -227,28 +227,28 @@ public class IRCSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#sendMessage(org.xmpp.packet.JID, String) * @see org.jivesoftware.openfire.gateway.TransportSession#sendMessage(org.xmpp.packet.JID, String)
*/ */
public void sendMessage(JID jid, String message) { public void sendMessage(JID jid, String message) {
conn.doPrivmsg(getTransport().convertJIDToID(jid), message); conn.doPrivmsg(getTransport().convertJIDToID(jid), message);
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#sendServerMessage(String) * @see org.jivesoftware.openfire.gateway.TransportSession#sendServerMessage(String)
*/ */
public void sendServerMessage(String message) { public void sendServerMessage(String message) {
conn.send(message); conn.send(message);
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#sendChatState(org.xmpp.packet.JID, org.jivesoftware.wildfire.gateway.ChatStateType) * @see org.jivesoftware.openfire.gateway.TransportSession#sendChatState(org.xmpp.packet.JID, org.jivesoftware.openfire.gateway.ChatStateType)
*/ */
public void sendChatState(JID jid, ChatStateType chatState) { public void sendChatState(JID jid, ChatStateType chatState) {
// IRC doesn't support this // IRC doesn't support this
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#retrieveContactStatus(org.xmpp.packet.JID) * @see org.jivesoftware.openfire.gateway.TransportSession#retrieveContactStatus(org.xmpp.packet.JID)
*/ */
public void retrieveContactStatus(JID jid) { public void retrieveContactStatus(JID jid) {
if (isLoggedIn()) { if (isLoggedIn()) {
...@@ -269,7 +269,7 @@ public class IRCSession extends TransportSession { ...@@ -269,7 +269,7 @@ public class IRCSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#resendContactStatuses(org.xmpp.packet.JID) * @see org.jivesoftware.openfire.gateway.TransportSession#resendContactStatuses(org.xmpp.packet.JID)
*/ */
public void resendContactStatuses(JID jid) { public void resendContactStatuses(JID jid) {
for (String contact : buddyStatuses.keySet()) { for (String contact : buddyStatuses.keySet()) {
......
src/java/org/jivesoftware/wildfire/gateway/protocols/irc/IRCTransport.java → src/java/org/jivesoftware/openfire/gateway/protocols/irc/IRCTransport.java
View file @ 4234ed48
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway.protocols.irc; package org.jivesoftware.openfire.gateway.protocols.irc;
import org.jivesoftware.wildfire.gateway.*; import org.jivesoftware.openfire.gateway.*;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.util.LocaleUtils; import org.jivesoftware.util.LocaleUtils;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
...@@ -26,45 +26,45 @@ import org.xmpp.packet.JID; ...@@ -26,45 +26,45 @@ import org.xmpp.packet.JID;
public class IRCTransport extends BaseTransport { public class IRCTransport extends BaseTransport {
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyUsername() * @see org.jivesoftware.openfire.gateway.BaseTransport#getTerminologyUsername()
*/ */
public String getTerminologyUsername() { public String getTerminologyUsername() {
return LocaleUtils.getLocalizedString("gateway.irc.username", "gateway"); return LocaleUtils.getLocalizedString("gateway.irc.username", "gateway");
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyPassword() * @see org.jivesoftware.openfire.gateway.BaseTransport#getTerminologyPassword()
*/ */
public String getTerminologyPassword() { public String getTerminologyPassword() {
return LocaleUtils.getLocalizedString("gateway.irc.password", "gateway"); return LocaleUtils.getLocalizedString("gateway.irc.password", "gateway");
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyNickname() * @see org.jivesoftware.openfire.gateway.BaseTransport#getTerminologyNickname()
*/ */
public String getTerminologyNickname() { public String getTerminologyNickname() {
return LocaleUtils.getLocalizedString("gateway.irc.nickname", "gateway"); return LocaleUtils.getLocalizedString("gateway.irc.nickname", "gateway");
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyRegistration() * @see org.jivesoftware.openfire.gateway.BaseTransport#getTerminologyRegistration()
*/ */
public String getTerminologyRegistration() { public String getTerminologyRegistration() {
return LocaleUtils.getLocalizedString("gateway.irc.registration", "gateway"); return LocaleUtils.getLocalizedString("gateway.irc.registration", "gateway");
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#isPasswordRequired() * @see org.jivesoftware.openfire.gateway.BaseTransport#isPasswordRequired()
*/ */
public Boolean isPasswordRequired() { return false; } public Boolean isPasswordRequired() { return false; }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#isNicknameRequired() * @see org.jivesoftware.openfire.gateway.BaseTransport#isNicknameRequired()
*/ */
public Boolean isNicknameRequired() { return true; } public Boolean isNicknameRequired() { return true; }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#isUsernameValid(String) * @see org.jivesoftware.openfire.gateway.BaseTransport#isUsernameValid(String)
*/ */
public Boolean isUsernameValid(String username) { public Boolean isUsernameValid(String username) {
return username.matches("\\w+"); return username.matches("\\w+");
......
src/java/org/jivesoftware/wildfire/gateway/protocols/msn/MSNListener.java → src/java/org/jivesoftware/openfire/gateway/protocols/msn/MSNListener.java
View file @ 4234ed48
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway.protocols.msn; package org.jivesoftware.openfire.gateway.protocols.msn;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.util.LocaleUtils; import org.jivesoftware.util.LocaleUtils;
import org.jivesoftware.wildfire.gateway.TransportLoginStatus; import org.jivesoftware.openfire.gateway.TransportLoginStatus;
import org.xmpp.packet.Message; import org.xmpp.packet.Message;
import org.xmpp.packet.Presence; import org.xmpp.packet.Presence;
import net.sf.jml.event.MsnAdapter; import net.sf.jml.event.MsnAdapter;
......
src/java/org/jivesoftware/wildfire/gateway/protocols/msn/MSNSession.java → src/java/org/jivesoftware/openfire/gateway/protocols/msn/MSNSession.java
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway.protocols.msn; package org.jivesoftware.openfire.gateway.protocols.msn;
import net.sf.jml.*; import net.sf.jml.*;
import net.sf.jml.message.MsnControlMessage; import net.sf.jml.message.MsnControlMessage;
...@@ -17,10 +17,10 @@ import net.sf.jml.impl.MsnMessengerFactory; ...@@ -17,10 +17,10 @@ import net.sf.jml.impl.MsnMessengerFactory;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.util.JiveGlobals; import org.jivesoftware.util.JiveGlobals;
import org.jivesoftware.util.LocaleUtils; import org.jivesoftware.util.LocaleUtils;
import org.jivesoftware.wildfire.gateway.*; import org.jivesoftware.openfire.gateway.*;
import org.jivesoftware.wildfire.roster.RosterItem; import org.jivesoftware.openfire.roster.RosterItem;
import org.jivesoftware.wildfire.roster.Roster; import org.jivesoftware.openfire.roster.Roster;
import org.jivesoftware.wildfire.user.UserNotFoundException; import org.jivesoftware.openfire.user.UserNotFoundException;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
import org.xmpp.packet.PacketError; import org.xmpp.packet.PacketError;
import org.xmpp.packet.Presence; import org.xmpp.packet.Presence;
...@@ -273,7 +273,7 @@ public class MSNSession extends TransportSession { ...@@ -273,7 +273,7 @@ public class MSNSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#addContact(org.jivesoftware.wildfire.roster.RosterItem) * @see org.jivesoftware.openfire.gateway.TransportSession#addContact(org.jivesoftware.openfire.roster.RosterItem)
*/ */
public void addContact(RosterItem item) { public void addContact(RosterItem item) {
Email contact = Email.parseStr(getTransport().convertJIDToID(item.getJid())); Email contact = Email.parseStr(getTransport().convertJIDToID(item.getJid()));
...@@ -297,7 +297,7 @@ public class MSNSession extends TransportSession { ...@@ -297,7 +297,7 @@ public class MSNSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#removeContact(org.jivesoftware.wildfire.roster.RosterItem) * @see org.jivesoftware.openfire.gateway.TransportSession#removeContact(org.jivesoftware.openfire.roster.RosterItem)
*/ */
public void removeContact(RosterItem item) { public void removeContact(RosterItem item) {
Email contact = Email.parseStr(getTransport().convertJIDToID(item.getJid())); Email contact = Email.parseStr(getTransport().convertJIDToID(item.getJid()));
...@@ -312,7 +312,7 @@ public class MSNSession extends TransportSession { ...@@ -312,7 +312,7 @@ public class MSNSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#updateContact(org.jivesoftware.wildfire.roster.RosterItem) * @see org.jivesoftware.openfire.gateway.TransportSession#updateContact(org.jivesoftware.openfire.roster.RosterItem)
*/ */
public void updateContact(RosterItem item) { public void updateContact(RosterItem item) {
Email contact = Email.parseStr(getTransport().convertJIDToID(item.getJid())); Email contact = Email.parseStr(getTransport().convertJIDToID(item.getJid()));
...@@ -378,21 +378,21 @@ public class MSNSession extends TransportSession { ...@@ -378,21 +378,21 @@ public class MSNSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#sendMessage(org.xmpp.packet.JID, String) * @see org.jivesoftware.openfire.gateway.TransportSession#sendMessage(org.xmpp.packet.JID, String)
*/ */
public void sendMessage(JID jid, String message) { public void sendMessage(JID jid, String message) {
msnMessenger.sendText(Email.parseStr(getTransport().convertJIDToID(jid)), message); msnMessenger.sendText(Email.parseStr(getTransport().convertJIDToID(jid)), message);
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#sendServerMessage(String) * @see org.jivesoftware.openfire.gateway.TransportSession#sendServerMessage(String)
*/ */
public void sendServerMessage(String message) { public void sendServerMessage(String message) {
// We don't care. // We don't care.
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#sendChatState(org.xmpp.packet.JID, org.jivesoftware.wildfire.gateway.ChatStateType) * @see org.jivesoftware.openfire.gateway.TransportSession#sendChatState(org.xmpp.packet.JID, org.jivesoftware.openfire.gateway.ChatStateType)
*/ */
public void sendChatState(JID jid, ChatStateType chatState) { public void sendChatState(JID jid, ChatStateType chatState) {
if (chatState.equals(ChatStateType.composing)) { if (chatState.equals(ChatStateType.composing)) {
...@@ -408,7 +408,7 @@ public class MSNSession extends TransportSession { ...@@ -408,7 +408,7 @@ public class MSNSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#retrieveContactStatus(org.xmpp.packet.JID) * @see org.jivesoftware.openfire.gateway.TransportSession#retrieveContactStatus(org.xmpp.packet.JID)
*/ */
public void retrieveContactStatus(JID jid) { public void retrieveContactStatus(JID jid) {
if (isLoggedIn()) { if (isLoggedIn()) {
...@@ -429,7 +429,7 @@ public class MSNSession extends TransportSession { ...@@ -429,7 +429,7 @@ public class MSNSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#updateStatus(org.jivesoftware.wildfire.gateway.PresenceType, String) * @see org.jivesoftware.openfire.gateway.TransportSession#updateStatus(org.jivesoftware.openfire.gateway.PresenceType, String)
*/ */
public void updateStatus(PresenceType presenceType, String verboseStatus) { public void updateStatus(PresenceType presenceType, String verboseStatus) {
if (isLoggedIn()) { if (isLoggedIn()) {
...@@ -450,7 +450,7 @@ public class MSNSession extends TransportSession { ...@@ -450,7 +450,7 @@ public class MSNSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#resendContactStatuses(org.xmpp.packet.JID) * @see org.jivesoftware.openfire.gateway.TransportSession#resendContactStatuses(org.xmpp.packet.JID)
*/ */
public void resendContactStatuses(JID jid) { public void resendContactStatuses(JID jid) {
for (MsnContact friend : msnContacts.values()) { for (MsnContact friend : msnContacts.values()) {
......
src/java/org/jivesoftware/wildfire/gateway/protocols/msn/MSNTransport.java → src/java/org/jivesoftware/openfire/gateway/protocols/msn/MSNTransport.java
View file @ 4234ed48
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway.protocols.msn; package org.jivesoftware.openfire.gateway.protocols.msn;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.util.LocaleUtils; import org.jivesoftware.util.LocaleUtils;
import org.jivesoftware.wildfire.gateway.*; import org.jivesoftware.openfire.gateway.*;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
import org.xmpp.packet.Presence; import org.xmpp.packet.Presence;
import net.sf.jml.MsnUserStatus; import net.sf.jml.MsnUserStatus;
...@@ -28,45 +28,45 @@ import net.sf.jml.MsnUserStatus; ...@@ -28,45 +28,45 @@ import net.sf.jml.MsnUserStatus;
public class MSNTransport extends BaseTransport { public class MSNTransport extends BaseTransport {
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyUsername() * @see org.jivesoftware.openfire.gateway.BaseTransport#getTerminologyUsername()
*/ */
public String getTerminologyUsername() { public String getTerminologyUsername() {
return LocaleUtils.getLocalizedString("gateway.msn.username", "gateway"); return LocaleUtils.getLocalizedString("gateway.msn.username", "gateway");
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyPassword() * @see org.jivesoftware.openfire.gateway.BaseTransport#getTerminologyPassword()
*/ */
public String getTerminologyPassword() { public String getTerminologyPassword() {
return LocaleUtils.getLocalizedString("gateway.msn.password", "gateway"); return LocaleUtils.getLocalizedString("gateway.msn.password", "gateway");
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyNickname() * @see org.jivesoftware.openfire.gateway.BaseTransport#getTerminologyNickname()
*/ */
public String getTerminologyNickname() { public String getTerminologyNickname() {
return null; return null;
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyRegistration() * @see org.jivesoftware.openfire.gateway.BaseTransport#getTerminologyRegistration()
*/ */
public String getTerminologyRegistration() { public String getTerminologyRegistration() {
return LocaleUtils.getLocalizedString("gateway.msn.registration", "gateway"); return LocaleUtils.getLocalizedString("gateway.msn.registration", "gateway");
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#isPasswordRequired() * @see org.jivesoftware.openfire.gateway.BaseTransport#isPasswordRequired()
*/ */
public Boolean isPasswordRequired() { return true; } public Boolean isPasswordRequired() { return true; }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#isNicknameRequired() * @see org.jivesoftware.openfire.gateway.BaseTransport#isNicknameRequired()
*/ */
public Boolean isNicknameRequired() { return false; } public Boolean isNicknameRequired() { return false; }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#isUsernameValid(String) * @see org.jivesoftware.openfire.gateway.BaseTransport#isUsernameValid(String)
*/ */
public Boolean isUsernameValid(String username) { public Boolean isUsernameValid(String username) {
return username.matches("[^ \\p{Cntrl}()@,;:\\\\\"\\[\\]]+@[^ \\p{Cntrl}()@,;:\\\\\"\\[\\]]+"); return username.matches("[^ \\p{Cntrl}()@,;:\\\\\"\\[\\]]+@[^ \\p{Cntrl}()@,;:\\\\\"\\[\\]]+");
......
src/java/org/jivesoftware/wildfire/gateway/protocols/msn/MsnSessionListener.java → src/java/org/jivesoftware/openfire/gateway/protocols/msn/MsnSessionListener.java
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway.protocols.msn; package org.jivesoftware.openfire.gateway.protocols.msn;
import net.sf.cindy.SessionAdapter; import net.sf.cindy.SessionAdapter;
import net.sf.cindy.Session; import net.sf.cindy.Session;
......
src/java/org/jivesoftware/wildfire/gateway/protocols/oscar/BOSConnection.java → src/java/org/jivesoftware/openfire/gateway/protocols/oscar/BOSConnection.java
View file @ 4234ed48
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Heavily inspired by joscardemo of the Joust Project: http://joust.kano.net/ * Heavily inspired by joscardemo of the Joust Project: http://joust.kano.net/
*/ */
package org.jivesoftware.wildfire.gateway.protocols.oscar; package org.jivesoftware.openfire.gateway.protocols.oscar;
import net.kano.joscar.*; import net.kano.joscar.*;
import net.kano.joscar.flap.*; import net.kano.joscar.flap.*;
...@@ -33,7 +33,7 @@ import java.util.List; ...@@ -33,7 +33,7 @@ import java.util.List;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.util.StringUtils; import org.jivesoftware.util.StringUtils;
import org.jivesoftware.wildfire.gateway.TransportLoginStatus; import org.jivesoftware.openfire.gateway.TransportLoginStatus;
import org.xmpp.packet.Presence; import org.xmpp.packet.Presence;
/** /**
......
src/java/org/jivesoftware/wildfire/gateway/protocols/oscar/BaseFlapConnection.java → src/java/org/jivesoftware/openfire/gateway/protocols/oscar/BaseFlapConnection.java
View file @ 4234ed48
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Heavily inspired by joscardemo of the Joust Project: http://joust.kano.net/ * Heavily inspired by joscardemo of the Joust Project: http://joust.kano.net/
*/ */
package org.jivesoftware.wildfire.gateway.protocols.oscar; package org.jivesoftware.openfire.gateway.protocols.oscar;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
......
src/java/org/jivesoftware/wildfire/gateway/protocols/oscar/BasicFlapConnection.java → src/java/org/jivesoftware/openfire/gateway/protocols/oscar/BasicFlapConnection.java
View file @ 4234ed48
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Heavily inspired by joscardemo of the Joust Project: http://joust.kano.net/ * Heavily inspired by joscardemo of the Joust Project: http://joust.kano.net/
*/ */
package org.jivesoftware.wildfire.gateway.protocols.oscar; package org.jivesoftware.openfire.gateway.protocols.oscar;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.text.DateFormat; import java.text.DateFormat;
......
src/java/org/jivesoftware/wildfire/gateway/protocols/oscar/LoginConnection.java → src/java/org/jivesoftware/openfire/gateway/protocols/oscar/LoginConnection.java
View file @ 4234ed48
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
* Heavily inspired by joscardemo of the Joust Project: http://joust.kano.net/ * Heavily inspired by joscardemo of the Joust Project: http://joust.kano.net/
*/ */
package org.jivesoftware.wildfire.gateway.protocols.oscar; package org.jivesoftware.openfire.gateway.protocols.oscar;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.util.LocaleUtils; import org.jivesoftware.util.LocaleUtils;
import org.jivesoftware.wildfire.gateway.TransportLoginStatus; import org.jivesoftware.openfire.gateway.TransportLoginStatus;
import org.jivesoftware.wildfire.gateway.TransportType; import org.jivesoftware.openfire.gateway.TransportType;
import org.xmpp.packet.Message; import org.xmpp.packet.Message;
import org.xmpp.packet.Presence; import org.xmpp.packet.Presence;
......
src/java/org/jivesoftware/wildfire/gateway/protocols/oscar/LoginICQFlapCmd.java → src/java/org/jivesoftware/openfire/gateway/protocols/oscar/LoginICQFlapCmd.java
View file @ 4234ed48
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Heavily inspired by joscardemo of the Joust Project: http://joust.kano.net/ * Heavily inspired by joscardemo of the Joust Project: http://joust.kano.net/
*/ */
package org.jivesoftware.wildfire.gateway.protocols.oscar; package org.jivesoftware.openfire.gateway.protocols.oscar;
import net.kano.joscar.ByteBlock; import net.kano.joscar.ByteBlock;
import net.kano.joscar.BinaryTools; import net.kano.joscar.BinaryTools;
......
src/java/org/jivesoftware/wildfire/gateway/protocols/oscar/OSCARSession.java → src/java/org/jivesoftware/openfire/gateway/protocols/oscar/OSCARSession.java
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway.protocols.oscar; package org.jivesoftware.openfire.gateway.protocols.oscar;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
...@@ -30,16 +30,14 @@ import net.kano.joscar.snaccmd.loc.SetInfoCmd; ...@@ -30,16 +30,14 @@ import net.kano.joscar.snaccmd.loc.SetInfoCmd;
import net.kano.joscar.snaccmd.InfoData; import net.kano.joscar.snaccmd.InfoData;
import net.kano.joscar.snaccmd.CapabilityBlock; import net.kano.joscar.snaccmd.CapabilityBlock;
import net.kano.joscar.snaccmd.icq.OfflineMsgIcqRequest; import net.kano.joscar.snaccmd.icq.OfflineMsgIcqRequest;
import net.kano.joscar.snaccmd.icq.MetaShortInfoRequest;
import net.kano.joscar.snaccmd.icq.MetaFullInfoRequest;
import net.kano.joscar.ssiitem.BuddyItem; import net.kano.joscar.ssiitem.BuddyItem;
import net.kano.joscar.ssiitem.GroupItem; import net.kano.joscar.ssiitem.GroupItem;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.util.JiveGlobals; import org.jivesoftware.util.JiveGlobals;
import org.jivesoftware.util.LocaleUtils; import org.jivesoftware.util.LocaleUtils;
import org.jivesoftware.wildfire.gateway.*; import org.jivesoftware.openfire.gateway.*;
import org.jivesoftware.wildfire.user.UserNotFoundException; import org.jivesoftware.openfire.user.UserNotFoundException;
import org.jivesoftware.wildfire.roster.RosterItem; import org.jivesoftware.openfire.roster.RosterItem;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
import org.xmpp.packet.Presence; import org.xmpp.packet.Presence;
import org.xmpp.packet.Message; import org.xmpp.packet.Message;
...@@ -232,7 +230,7 @@ public class OSCARSession extends TransportSession { ...@@ -232,7 +230,7 @@ public class OSCARSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#addContact(org.jivesoftware.wildfire.roster.RosterItem) * @see org.jivesoftware.openfire.gateway.TransportSession#addContact(org.jivesoftware.openfire.roster.RosterItem)
*/ */
public void addContact(RosterItem item) { public void addContact(RosterItem item) {
String legacyId = getTransport().convertJIDToID(item.getJid()); String legacyId = getTransport().convertJIDToID(item.getJid());
...@@ -248,7 +246,7 @@ public class OSCARSession extends TransportSession { ...@@ -248,7 +246,7 @@ public class OSCARSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#removeContact(org.jivesoftware.wildfire.roster.RosterItem) * @see org.jivesoftware.openfire.gateway.TransportSession#removeContact(org.jivesoftware.openfire.roster.RosterItem)
*/ */
public void removeContact(RosterItem item) { public void removeContact(RosterItem item) {
String legacyId = getTransport().convertJIDToID(item.getJid()); String legacyId = getTransport().convertJIDToID(item.getJid());
...@@ -263,7 +261,7 @@ public class OSCARSession extends TransportSession { ...@@ -263,7 +261,7 @@ public class OSCARSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#updateContact(org.jivesoftware.wildfire.roster.RosterItem) * @see org.jivesoftware.openfire.gateway.TransportSession#updateContact(org.jivesoftware.openfire.roster.RosterItem)
*/ */
public void updateContact(RosterItem item) { public void updateContact(RosterItem item) {
String legacyId = getTransport().convertJIDToID(item.getJid()); String legacyId = getTransport().convertJIDToID(item.getJid());
...@@ -279,21 +277,21 @@ public class OSCARSession extends TransportSession { ...@@ -279,21 +277,21 @@ public class OSCARSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#sendMessage(org.xmpp.packet.JID, String) * @see org.jivesoftware.openfire.gateway.TransportSession#sendMessage(org.xmpp.packet.JID, String)
*/ */
public void sendMessage(JID jid, String message) { public void sendMessage(JID jid, String message) {
request(new SendImIcbm(getTransport().convertJIDToID(jid), message)); request(new SendImIcbm(getTransport().convertJIDToID(jid), message));
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#sendServerMessage(String) * @see org.jivesoftware.openfire.gateway.TransportSession#sendServerMessage(String)
*/ */
public void sendServerMessage(String message) { public void sendServerMessage(String message) {
// We don't care. // We don't care.
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#sendChatState(org.xmpp.packet.JID, org.jivesoftware.wildfire.gateway.ChatStateType) * @see org.jivesoftware.openfire.gateway.TransportSession#sendChatState(org.xmpp.packet.JID, org.jivesoftware.openfire.gateway.ChatStateType)
*/ */
public void sendChatState(JID jid, ChatStateType chatState) { public void sendChatState(JID jid, ChatStateType chatState) {
if (chatState.equals(ChatStateType.composing)) { if (chatState.equals(ChatStateType.composing)) {
...@@ -514,7 +512,7 @@ public class OSCARSession extends TransportSession { ...@@ -514,7 +512,7 @@ public class OSCARSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#retrieveContactStatus(org.xmpp.packet.JID) * @see org.jivesoftware.openfire.gateway.TransportSession#retrieveContactStatus(org.xmpp.packet.JID)
*/ */
public void retrieveContactStatus(JID jid) { public void retrieveContactStatus(JID jid) {
if (isLoggedIn()) { if (isLoggedIn()) {
...@@ -529,7 +527,7 @@ public class OSCARSession extends TransportSession { ...@@ -529,7 +527,7 @@ public class OSCARSession extends TransportSession {
); );
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#updateStatus(org.jivesoftware.wildfire.gateway.PresenceType, String) * @see org.jivesoftware.openfire.gateway.TransportSession#updateStatus(org.jivesoftware.openfire.gateway.PresenceType, String)
*/ */
public void updateStatus(PresenceType presenceType, String verboseStatus) { public void updateStatus(PresenceType presenceType, String verboseStatus) {
if (presenceType != PresenceType.available && presenceType != PresenceType.chat) { if (presenceType != PresenceType.available && presenceType != PresenceType.chat) {
...@@ -557,7 +555,7 @@ public class OSCARSession extends TransportSession { ...@@ -557,7 +555,7 @@ public class OSCARSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#resendContactStatuses(org.xmpp.packet.JID) * @see org.jivesoftware.openfire.gateway.TransportSession#resendContactStatuses(org.xmpp.packet.JID)
*/ */
public void resendContactStatuses(JID jid) { public void resendContactStatuses(JID jid) {
if (bosConn != null) { if (bosConn != null) {
......
src/java/org/jivesoftware/wildfire/gateway/protocols/oscar/OSCARTransport.java → src/java/org/jivesoftware/openfire/gateway/protocols/oscar/OSCARTransport.java
View file @ 4234ed48
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway.protocols.oscar; package org.jivesoftware.openfire.gateway.protocols.oscar;
import org.jivesoftware.util.LocaleUtils; import org.jivesoftware.util.LocaleUtils;
import org.jivesoftware.wildfire.gateway.*; import org.jivesoftware.openfire.gateway.*;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
/** /**
...@@ -25,45 +25,45 @@ import org.xmpp.packet.JID; ...@@ -25,45 +25,45 @@ import org.xmpp.packet.JID;
public class OSCARTransport extends BaseTransport { public class OSCARTransport extends BaseTransport {
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyUsername() * @see org.jivesoftware.openfire.gateway.BaseTransport#getTerminologyUsername()
*/ */
public String getTerminologyUsername() { public String getTerminologyUsername() {
return LocaleUtils.getLocalizedString("gateway."+getType().toString()+".username", "gateway"); return LocaleUtils.getLocalizedString("gateway."+getType().toString()+".username", "gateway");
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyPassword() * @see org.jivesoftware.openfire.gateway.BaseTransport#getTerminologyPassword()
*/ */
public String getTerminologyPassword() { public String getTerminologyPassword() {
return LocaleUtils.getLocalizedString("gateway."+getType().toString()+".password", "gateway"); return LocaleUtils.getLocalizedString("gateway."+getType().toString()+".password", "gateway");
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyNickname() * @see org.jivesoftware.openfire.gateway.BaseTransport#getTerminologyNickname()
*/ */
public String getTerminologyNickname() { public String getTerminologyNickname() {
return null; return null;
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyRegistration() * @see org.jivesoftware.openfire.gateway.BaseTransport#getTerminologyRegistration()
*/ */
public String getTerminologyRegistration() { public String getTerminologyRegistration() {
return LocaleUtils.getLocalizedString("gateway."+getType().toString()+".registration", "gateway"); return LocaleUtils.getLocalizedString("gateway."+getType().toString()+".registration", "gateway");
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#isPasswordRequired() * @see org.jivesoftware.openfire.gateway.BaseTransport#isPasswordRequired()
*/ */
public Boolean isPasswordRequired() { return true; } public Boolean isPasswordRequired() { return true; }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#isNicknameRequired() * @see org.jivesoftware.openfire.gateway.BaseTransport#isNicknameRequired()
*/ */
public Boolean isNicknameRequired() { return false; } public Boolean isNicknameRequired() { return false; }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#isUsernameValid(String) * @see org.jivesoftware.openfire.gateway.BaseTransport#isUsernameValid(String)
*/ */
public Boolean isUsernameValid(String username) { public Boolean isUsernameValid(String username) {
if (getType() == TransportType.icq) { if (getType() == TransportType.icq) {
......
src/java/org/jivesoftware/wildfire/gateway/protocols/oscar/PendingSnacListener.java → src/java/org/jivesoftware/openfire/gateway/protocols/oscar/PendingSnacListener.java
View file @ 4234ed48
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Heavily inspired by joscardemo of the Joust Project: http://joust.kano.net/ * Heavily inspired by joscardemo of the Joust Project: http://joust.kano.net/
*/ */
package org.jivesoftware.wildfire.gateway.protocols.oscar; package org.jivesoftware.openfire.gateway.protocols.oscar;
import net.kano.joscar.snac.SnacRequest; import net.kano.joscar.snac.SnacRequest;
......
src/java/org/jivesoftware/wildfire/gateway/protocols/oscar/PendingSnacMgr.java → src/java/org/jivesoftware/openfire/gateway/protocols/oscar/PendingSnacMgr.java
View file @ 4234ed48
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Heavily inspired by joscardemo of the Joust Project: http://joust.kano.net/ * Heavily inspired by joscardemo of the Joust Project: http://joust.kano.net/
*/ */
package org.jivesoftware.wildfire.gateway.protocols.oscar; package org.jivesoftware.openfire.gateway.protocols.oscar;
import net.kano.joscar.snac.SnacRequest; import net.kano.joscar.snac.SnacRequest;
import net.kano.joscar.DefensiveTools; import net.kano.joscar.DefensiveTools;
......
src/java/org/jivesoftware/wildfire/gateway/protocols/oscar/ServiceConnection.java → src/java/org/jivesoftware/openfire/gateway/protocols/oscar/ServiceConnection.java
View file @ 4234ed48
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Heavily inspired by joscardemo of the Joust Project: http://joust.kano.net/ * Heavily inspired by joscardemo of the Joust Project: http://joust.kano.net/
*/ */
package org.jivesoftware.wildfire.gateway.protocols.oscar; package org.jivesoftware.openfire.gateway.protocols.oscar;
import net.kano.joscar.flap.ClientFlapConn; import net.kano.joscar.flap.ClientFlapConn;
......
src/java/org/jivesoftware/wildfire/gateway/protocols/oscar/SnacManager.java → src/java/org/jivesoftware/openfire/gateway/protocols/oscar/SnacManager.java
View file @ 4234ed48
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Heavily inspired by joscardemo of the Joust Project: http://joust.kano.net/ * Heavily inspired by joscardemo of the Joust Project: http://joust.kano.net/
*/ */
package org.jivesoftware.wildfire.gateway.protocols.oscar; package org.jivesoftware.openfire.gateway.protocols.oscar;
import net.kano.joscar.snac.SnacRequest; import net.kano.joscar.snac.SnacRequest;
......
src/java/org/jivesoftware/wildfire/gateway/protocols/yahoo/YahooSession.java → src/java/org/jivesoftware/openfire/gateway/protocols/yahoo/YahooSession.java
View file @ 4234ed48
...@@ -8,14 +8,14 @@ ...@@ -8,14 +8,14 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway.protocols.yahoo; package org.jivesoftware.openfire.gateway.protocols.yahoo;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.util.JiveGlobals; import org.jivesoftware.util.JiveGlobals;
import org.jivesoftware.util.LocaleUtils; import org.jivesoftware.util.LocaleUtils;
import org.jivesoftware.wildfire.gateway.*; import org.jivesoftware.openfire.gateway.*;
import org.jivesoftware.wildfire.roster.RosterItem; import org.jivesoftware.openfire.roster.RosterItem;
import org.jivesoftware.wildfire.user.UserNotFoundException; import org.jivesoftware.openfire.user.UserNotFoundException;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
import org.xmpp.packet.Message; import org.xmpp.packet.Message;
import org.xmpp.packet.PacketError; import org.xmpp.packet.PacketError;
...@@ -249,7 +249,7 @@ public class YahooSession extends TransportSession { ...@@ -249,7 +249,7 @@ public class YahooSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#addContact(org.jivesoftware.wildfire.roster.RosterItem) * @see org.jivesoftware.openfire.gateway.TransportSession#addContact(org.jivesoftware.openfire.roster.RosterItem)
*/ */
public void addContact(RosterItem item) { public void addContact(RosterItem item) {
// Syncing will take are of add. // Syncing will take are of add.
...@@ -267,7 +267,7 @@ public class YahooSession extends TransportSession { ...@@ -267,7 +267,7 @@ public class YahooSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#removeContact(org.jivesoftware.wildfire.roster.RosterItem) * @see org.jivesoftware.openfire.gateway.TransportSession#removeContact(org.jivesoftware.openfire.roster.RosterItem)
*/ */
public void removeContact(RosterItem item) { public void removeContact(RosterItem item) {
String contact = getTransport().convertJIDToID(item.getJid()); String contact = getTransport().convertJIDToID(item.getJid());
...@@ -287,7 +287,7 @@ public class YahooSession extends TransportSession { ...@@ -287,7 +287,7 @@ public class YahooSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#updateContact(org.jivesoftware.wildfire.roster.RosterItem) * @see org.jivesoftware.openfire.gateway.TransportSession#updateContact(org.jivesoftware.openfire.roster.RosterItem)
*/ */
public void updateContact(RosterItem item) { public void updateContact(RosterItem item) {
String contact = getTransport().convertJIDToID(item.getJid()); String contact = getTransport().convertJIDToID(item.getJid());
...@@ -359,7 +359,7 @@ public class YahooSession extends TransportSession { ...@@ -359,7 +359,7 @@ public class YahooSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#sendMessage(org.xmpp.packet.JID, String) * @see org.jivesoftware.openfire.gateway.TransportSession#sendMessage(org.xmpp.packet.JID, String)
*/ */
public void sendMessage(JID jid, String message) { public void sendMessage(JID jid, String message) {
try { try {
...@@ -371,21 +371,21 @@ public class YahooSession extends TransportSession { ...@@ -371,21 +371,21 @@ public class YahooSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#sendServerMessage(String) * @see org.jivesoftware.openfire.gateway.TransportSession#sendServerMessage(String)
*/ */
public void sendServerMessage(String message) { public void sendServerMessage(String message) {
// We don't care. // We don't care.
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#sendChatState(org.xmpp.packet.JID, org.jivesoftware.wildfire.gateway.ChatStateType) * @see org.jivesoftware.openfire.gateway.TransportSession#sendChatState(org.xmpp.packet.JID, org.jivesoftware.openfire.gateway.ChatStateType)
*/ */
public void sendChatState(JID jid, ChatStateType chatState) { public void sendChatState(JID jid, ChatStateType chatState) {
// TODO: Handle this // TODO: Handle this
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#updateStatus(org.jivesoftware.wildfire.gateway.PresenceType, String) * @see org.jivesoftware.openfire.gateway.TransportSession#updateStatus(org.jivesoftware.openfire.gateway.PresenceType, String)
*/ */
public void updateStatus(PresenceType presenceType, String verboseStatus) { public void updateStatus(PresenceType presenceType, String verboseStatus) {
try { try {
...@@ -420,7 +420,7 @@ public class YahooSession extends TransportSession { ...@@ -420,7 +420,7 @@ public class YahooSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#retrieveContactStatus(org.xmpp.packet.JID) * @see org.jivesoftware.openfire.gateway.TransportSession#retrieveContactStatus(org.xmpp.packet.JID)
*/ */
public void retrieveContactStatus(JID jid) { public void retrieveContactStatus(JID jid) {
if (isLoggedIn()) { if (isLoggedIn()) {
...@@ -448,7 +448,7 @@ public class YahooSession extends TransportSession { ...@@ -448,7 +448,7 @@ public class YahooSession extends TransportSession {
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.TransportSession#resendContactStatuses(org.xmpp.packet.JID) * @see org.jivesoftware.openfire.gateway.TransportSession#resendContactStatuses(org.xmpp.packet.JID)
*/ */
public void resendContactStatuses(JID jid) { public void resendContactStatuses(JID jid) {
for (Object userObj : yahooSession.getUsers().values()) { for (Object userObj : yahooSession.getUsers().values()) {
......
src/java/org/jivesoftware/wildfire/gateway/protocols/yahoo/YahooSessionListener.java → src/java/org/jivesoftware/openfire/gateway/protocols/yahoo/YahooSessionListener.java
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway.protocols.yahoo; package org.jivesoftware.openfire.gateway.protocols.yahoo;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.util.LocaleUtils; import org.jivesoftware.util.LocaleUtils;
......
src/java/org/jivesoftware/wildfire/gateway/protocols/yahoo/YahooTransport.java → src/java/org/jivesoftware/openfire/gateway/protocols/yahoo/YahooTransport.java
View file @ 4234ed48
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway.protocols.yahoo; package org.jivesoftware.openfire.gateway.protocols.yahoo;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.util.LocaleUtils; import org.jivesoftware.util.LocaleUtils;
import org.jivesoftware.wildfire.gateway.*; import org.jivesoftware.openfire.gateway.*;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
import org.xmpp.packet.Presence; import org.xmpp.packet.Presence;
import ymsg.network.StatusConstants; import ymsg.network.StatusConstants;
...@@ -28,45 +28,45 @@ import ymsg.network.StatusConstants; ...@@ -28,45 +28,45 @@ import ymsg.network.StatusConstants;
public class YahooTransport extends BaseTransport { public class YahooTransport extends BaseTransport {
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyUsername() * @see org.jivesoftware.openfire.gateway.BaseTransport#getTerminologyUsername()
*/ */
public String getTerminologyUsername() { public String getTerminologyUsername() {
return LocaleUtils.getLocalizedString("gateway.yahoo.username", "gateway"); return LocaleUtils.getLocalizedString("gateway.yahoo.username", "gateway");
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyPassword() * @see org.jivesoftware.openfire.gateway.BaseTransport#getTerminologyPassword()
*/ */
public String getTerminologyPassword() { public String getTerminologyPassword() {
return LocaleUtils.getLocalizedString("gateway.yahoo.password", "gateway"); return LocaleUtils.getLocalizedString("gateway.yahoo.password", "gateway");
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyNickname() * @see org.jivesoftware.openfire.gateway.BaseTransport#getTerminologyNickname()
*/ */
public String getTerminologyNickname() { public String getTerminologyNickname() {
return null; return null;
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyRegistration() * @see org.jivesoftware.openfire.gateway.BaseTransport#getTerminologyRegistration()
*/ */
public String getTerminologyRegistration() { public String getTerminologyRegistration() {
return LocaleUtils.getLocalizedString("gateway.yahoo.registration", "gateway"); return LocaleUtils.getLocalizedString("gateway.yahoo.registration", "gateway");
} }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#isPasswordRequired() * @see org.jivesoftware.openfire.gateway.BaseTransport#isPasswordRequired()
*/ */
public Boolean isPasswordRequired() { return true; } public Boolean isPasswordRequired() { return true; }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#isNicknameRequired() * @see org.jivesoftware.openfire.gateway.BaseTransport#isNicknameRequired()
*/ */
public Boolean isNicknameRequired() { return false; } public Boolean isNicknameRequired() { return false; }
/** /**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#isUsernameValid(String) * @see org.jivesoftware.openfire.gateway.BaseTransport#isUsernameValid(String)
*/ */
public Boolean isUsernameValid(String username) { public Boolean isUsernameValid(String username) {
return username.matches("[^ \\p{Cntrl}()@,;:\\\\\"\\[\\]]+@?[^ \\p{Cntrl}()@,;:\\\\\"\\[\\]]+"); return username.matches("[^ \\p{Cntrl}()@,;:\\\\\"\\[\\]]+@?[^ \\p{Cntrl}()@,;:\\\\\"\\[\\]]+");
......
src/java/org/jivesoftware/wildfire/gateway/web/ConfigManager.java → src/java/org/jivesoftware/openfire/gateway/web/ConfigManager.java
View file @ 4234ed48
...@@ -8,20 +8,20 @@ ...@@ -8,20 +8,20 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway.web; package org.jivesoftware.openfire.gateway.web;
import org.jivesoftware.wildfire.container.PluginManager; import org.jivesoftware.openfire.container.PluginManager;
import org.jivesoftware.wildfire.XMPPServer; import org.jivesoftware.openfire.XMPPServer;
import org.jivesoftware.wildfire.user.UserManager; import org.jivesoftware.openfire.user.UserManager;
import org.jivesoftware.wildfire.user.UserNotFoundException; import org.jivesoftware.openfire.user.UserNotFoundException;
import org.jivesoftware.wildfire.user.User; import org.jivesoftware.openfire.user.User;
import org.jivesoftware.wildfire.group.Group; import org.jivesoftware.openfire.group.Group;
import org.jivesoftware.wildfire.group.GroupManager; import org.jivesoftware.openfire.group.GroupManager;
import org.jivesoftware.wildfire.group.GroupNotFoundException; import org.jivesoftware.openfire.group.GroupNotFoundException;
import org.jivesoftware.wildfire.gateway.GatewayPlugin; import org.jivesoftware.openfire.gateway.GatewayPlugin;
import org.jivesoftware.wildfire.gateway.TransportType; import org.jivesoftware.openfire.gateway.TransportType;
import org.jivesoftware.wildfire.gateway.PermissionManager; import org.jivesoftware.openfire.gateway.PermissionManager;
import org.jivesoftware.wildfire.gateway.Registration; import org.jivesoftware.openfire.gateway.Registration;
import org.jivesoftware.util.Log; import org.jivesoftware.util.Log;
import org.jivesoftware.util.JiveGlobals; import org.jivesoftware.util.JiveGlobals;
import org.jivesoftware.util.NotFoundException; import org.jivesoftware.util.NotFoundException;
......
src/java/org/jivesoftware/wildfire/gateway/web/ConnectionTester.java → src/java/org/jivesoftware/openfire/gateway/web/ConnectionTester.java
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway.web; package org.jivesoftware.openfire.gateway.web;
import java.net.Socket; import java.net.Socket;
......
src/java/org/jivesoftware/wildfire/gateway/web/GatewayDWR.java → src/java/org/jivesoftware/openfire/gateway/web/GatewayDWR.java
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* a copy of which is included in this distribution. * a copy of which is included in this distribution.
*/ */
package org.jivesoftware.wildfire.gateway.web; package org.jivesoftware.openfire.gateway.web;
import uk.ltd.getahead.dwr.DWRServlet; import uk.ltd.getahead.dwr.DWRServlet;
import uk.ltd.getahead.dwr.Configuration; import uk.ltd.getahead.dwr.Configuration;
...@@ -43,8 +43,8 @@ public class GatewayDWR extends DWRServlet { ...@@ -43,8 +43,8 @@ public class GatewayDWR extends DWRServlet {
document.appendChild(root); document.appendChild(root);
Element allowElement = document.createElement("allow"); Element allowElement = document.createElement("allow");
allowElement.appendChild(buildCreator("ConfigManager", "org.jivesoftware.wildfire.gateway.web.ConfigManager")); allowElement.appendChild(buildCreator("ConfigManager", "org.jivesoftware.openfire.gateway.web.ConfigManager"));
allowElement.appendChild(buildCreator("ConnectionTester", "org.jivesoftware.wildfire.gateway.web.ConnectionTester")); allowElement.appendChild(buildCreator("ConnectionTester", "org.jivesoftware.openfire.gateway.web.ConnectionTester"));
root.appendChild(allowElement); root.appendChild(allowElement);
} }
......
src/test/java/org/jivesoftware/util/MSNTransportTest.java
View file @ 4234ed48
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
package org.jivesoftware.util; package org.jivesoftware.util;
import org.jivesoftware.wildfire.gateway.PresenceType; import org.jivesoftware.openfire.gateway.PresenceType;
import org.jivesoftware.wildfire.gateway.Registration; import org.jivesoftware.openfire.gateway.Registration;
import org.jivesoftware.wildfire.gateway.TransportSession; import org.jivesoftware.openfire.gateway.TransportSession;
import org.jivesoftware.wildfire.gateway.TransportType; import org.jivesoftware.openfire.gateway.TransportType;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
import org.jivesoftware.wildfire.gateway.protocols.msn.MSNTransport; import org.jivesoftware.openfire.gateway.protocols.msn.MSNTransport;
public class MSNTransportTest public class MSNTransportTest
{ {
......
src/web/WEB-INF/web-custom.xml
View file @ 4234ed48
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<servlet-name>dwr-invoker</servlet-name> <servlet-name>dwr-invoker</servlet-name>
<display-name>DWR Servlet</display-name> <display-name>DWR Servlet</display-name>
<description>Direct Web Remoter Servlet</description> <description>Direct Web Remoter Servlet</description>
<servlet-class>org.jivesoftware.wildfire.gateway.web.GatewayDWR</servlet-class> <servlet-class>org.jivesoftware.openfire.gateway.web.GatewayDWR</servlet-class>
<init-param> <init-param>
<param-name>LogLevel</param-name> <param-name>LogLevel</param-name>
<param-value>FATAL</param-value> <param-value>FATAL</param-value>
......
src/web/error.jsp
View file @ 4234ed48
<%@ page import="java.io.*, <%@ page import="java.io.*,
org.jivesoftware.util.JiveGlobals, org.jivesoftware.util.JiveGlobals,
org.jivesoftware.wildfire.auth.UnauthorizedException" org.jivesoftware.openfire.auth.UnauthorizedException"
isErrorPage="true" isErrorPage="true"
%> %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %> <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
......
src/web/gateway-registrations.jsp
View file @ 4234ed48
<%@ page import="org.jivesoftware.util.ParamUtils, <%@ page import="org.jivesoftware.util.ParamUtils,
org.jivesoftware.wildfire.SessionManager, org.jivesoftware.openfire.SessionManager,
org.jivesoftware.wildfire.XMPPServer, org.jivesoftware.openfire.XMPPServer,
org.jivesoftware.wildfire.gateway.GatewayPlugin, org.jivesoftware.openfire.gateway.GatewayPlugin,
org.jivesoftware.wildfire.gateway.Registration, org.jivesoftware.openfire.gateway.Registration,
org.jivesoftware.wildfire.gateway.RegistrationManager, org.jivesoftware.openfire.gateway.RegistrationManager,
org.jivesoftware.wildfire.session.ClientSession, org.jivesoftware.openfire.session.ClientSession,
org.xmpp.packet.JID" org.xmpp.packet.JID"
errorPage="error.jsp" errorPage="error.jsp"
%> %>
......
src/web/gateway-settings.jsp
View file @ 4234ed48
<%@ page import="javax.servlet.jsp.JspWriter, <%@ page import="javax.servlet.jsp.JspWriter,
org.jivesoftware.wildfire.XMPPServer, org.jivesoftware.openfire.XMPPServer,
org.jivesoftware.wildfire.gateway.GatewayPlugin, org.jivesoftware.openfire.gateway.GatewayPlugin,
org.jivesoftware.wildfire.gateway.TransportType" org.jivesoftware.openfire.gateway.TransportType"
errorPage="error.jsp" errorPage="error.jsp"
%> %>
<%@ page import="org.jivesoftware.util.LocaleUtils"%> <%@ page import="org.jivesoftware.util.LocaleUtils"%>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<%@ page import="org.dom4j.Document" %> <%@ page import="org.dom4j.Document" %>
<%@ page import="org.jivesoftware.util.JiveGlobals" %> <%@ page import="org.jivesoftware.util.JiveGlobals" %>
<%@ page import="java.util.ArrayList" %> <%@ page import="java.util.ArrayList" %>
<%@ page import="org.jivesoftware.wildfire.gateway.PermissionManager" %> <%@ page import="org.jivesoftware.openfire.gateway.PermissionManager" %>
<%@ page import="java.util.Collection" %> <%@ page import="java.util.Collection" %>
<%@ page import="java.util.Iterator" %> <%@ page import="java.util.Iterator" %>
......
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