Updated license header.

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

src/java/org/jivesoftware/messenger/Channel.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.messenger.auth.UnauthorizedException;

src/java/org/jivesoftware/messenger/ChannelHandler.java

@@ -3,10 +3,10 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
 
 package org.jivesoftware.messenger;

src/java/org/jivesoftware/messenger/ChannelNotFoundException.java

@@ -3,10 +3,10 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
 
 package org.jivesoftware.messenger;

src/java/org/jivesoftware/messenger/Connection.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.messenger.auth.UnauthorizedException;

src/java/org/jivesoftware/messenger/ConnectionCloseListener.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 /**

src/java/org/jivesoftware/messenger/ConnectionManager.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import java.net.Socket;

src/java/org/jivesoftware/messenger/Entity.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 /**

src/java/org/jivesoftware/messenger/IQ.java

-/* RCSFile: $
- * Revision: $
- * Date: $
+/**
+ * $RCSfile$
+ * $Revision$
+ * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.dom4j.Element;

src/java/org/jivesoftware/messenger/IQHandlerInfo.java

-/* RCSFile: $
- * Revision: $
- * Date: $
+/**
+ * $RCSfile$
+ * $Revision$
+ * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 /**

src/java/org/jivesoftware/messenger/IQRouter.java

-/* RCSFile: $
- * Revision: $
- * Date: $
+/**
+ * $RCSfile$
+ * $Revision$
+ * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 /**

src/java/org/jivesoftware/messenger/JiveGlobals.java

@@ -3,10 +3,10 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
 
 package org.jivesoftware.messenger;

src/java/org/jivesoftware/messenger/MBeanManager.java

@@ -3,10 +3,10 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
 
 package org.jivesoftware.messenger;

src/java/org/jivesoftware/messenger/Message.java

-/* RCSFile: $
- * Revision: $
- * Date: $
+/**
+ * $RCSfile$
+ * $Revision$
+ * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 /**

src/java/org/jivesoftware/messenger/MessageRouter.java

-/* RCSFile: $
- * Revision: $
- * Date: $
+/**
+ * $RCSfile$
+ * $Revision$
+ * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 /**

src/java/org/jivesoftware/messenger/MetaDataFragment.java

@@ -3,10 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 Jive Software. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of Jive Software. Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.util.XPPWriter;

src/java/org/jivesoftware/messenger/MetaDataUtils.java

+/**
+ * $RCSfile$
+ * $Revision$
+ * $Date$
+ *
+ * Copyright (C) 2004 Jive Software. All rights reserved.
+ *
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
+ */
+
 package org.jivesoftware.messenger;
 
 import java.util.HashMap;

src/java/org/jivesoftware/messenger/NameIDManager.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.messenger.user.UserNotFoundException;

src/java/org/jivesoftware/messenger/NamePrep.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 /**

src/java/org/jivesoftware/messenger/NoSuchRouteException.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import java.io.PrintStream;

src/java/org/jivesoftware/messenger/NodePrep.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 /**

src/java/org/jivesoftware/messenger/OfflineMessageStore.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.messenger.auth.UnauthorizedException;

src/java/org/jivesoftware/messenger/OfflineMessageStrategy.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.messenger.auth.UnauthorizedException;

src/java/org/jivesoftware/messenger/PacketDeliverer.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.messenger.auth.UnauthorizedException;

src/java/org/jivesoftware/messenger/PacketException.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 /**

src/java/org/jivesoftware/messenger/PacketFactory.java

-/* RCSFile: $
- * Revision: $
- * Date: $
+/**
+ * $RCSfile$
+ * $Revision$
+ * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import javax.xml.stream.XMLStreamException;

src/java/org/jivesoftware/messenger/PacketRouter.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 /**

src/java/org/jivesoftware/messenger/PacketTransporter.java

@@ -3,13 +3,13 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
-package org.jivesoftware.messenger;
 
+package org.jivesoftware.messenger;
 
 import org.jivesoftware.messenger.auth.UnauthorizedException;
 import org.jivesoftware.messenger.transport.TransportHandler;

src/java/org/jivesoftware/messenger/PayloadFragment.java

-/* RCSFile: $
- * Revision: $
- * Date: $
+/**
+ * $RCSfile$
+ * $Revision$
+ * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.messenger.spi.AbstractFragment;

src/java/org/jivesoftware/messenger/Presence.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 2002 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.messenger.auth.UnauthorizedException;

src/java/org/jivesoftware/messenger/PresenceManager.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 2002 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.messenger.auth.UnauthorizedException;

src/java/org/jivesoftware/messenger/PresenceRouter.java

-/* RCSFile: $
- * Revision: $
- * Date: $
+/**
+ * $RCSfile$
+ * $Revision$
+ * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 /**

src/java/org/jivesoftware/messenger/PrivateStore.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.messenger.auth.UnauthorizedException;

src/java/org/jivesoftware/messenger/ResourcePrep.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 /**

src/java/org/jivesoftware/messenger/RoutableChannelHandler.java

+/**
+ * $RCSfile$
+ * $Revision$
+ * $Date$
+ *
+ * Copyright (C) 2004 Jive Software. All rights reserved.
+ *
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
+ */
+
 package org.jivesoftware.messenger;
 
 /**

src/java/org/jivesoftware/messenger/RoutingTable.java

-/* RCSFile: $
- * Revision: $
- * Date: $
+/**
+ * $RCSfile$
+ * $Revision$
+ * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import java.util.Iterator;

src/java/org/jivesoftware/messenger/ServerPort.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import java.util.Iterator;

src/java/org/jivesoftware/messenger/ServerSession.java

-/* RCSFile: $
- * Revision: $
- * Date: $
+/**
+ * $RCSfile$
+ * $Revision$
+ * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.messenger.auth.AuthToken;

src/java/org/jivesoftware/messenger/Session.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.messenger.auth.AuthToken;

src/java/org/jivesoftware/messenger/SessionManager.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.messenger.auth.UnauthorizedException;

src/java/org/jivesoftware/messenger/SessionNotFoundException.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import java.io.PrintStream;

src/java/org/jivesoftware/messenger/SessionResultFilter.java

@@ -3,10 +3,10 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2001 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
 
 package org.jivesoftware.messenger;

src/java/org/jivesoftware/messenger/StreamID.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 /**

src/java/org/jivesoftware/messenger/StreamIDFactory.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 /**

src/java/org/jivesoftware/messenger/TransportManager.java

-/* RCSFile: $
- * Revision: $
- * Date: $
+/**
+ * $RCSfile$
+ * $Revision$
+ * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 /**

src/java/org/jivesoftware/messenger/XMPPAddress.java

@@ -3,17 +3,17 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.util.CacheSizes;
 import org.jivesoftware.util.Cacheable;
 
-
 /**
  * Represents a single XMPP delivery node, identified by
  * a XMPPAddress.<p>

src/java/org/jivesoftware/messenger/XMPPBootContainer.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.messenger.chat.spi.ChatServerImpl;

src/java/org/jivesoftware/messenger/XMPPBootServlet.java

@@ -3,10 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 Jive Software. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of Jive Software. Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import javax.servlet.ServletConfig;

src/java/org/jivesoftware/messenger/XMPPDOMFragment.java

-/* RCSFile: $
- * Revision: $
- * Date: $
+/**
+ * $RCSfile$
+ * $Revision$
+ * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.util.XPPWriter;

src/java/org/jivesoftware/messenger/XMPPError.java

-/* RCSFile: $
- * Revision: $
- * Date: $
+/**
+ * $RCSfile$
+ * $Revision$
+ * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.messenger.spi.AbstractFragment;

src/java/org/jivesoftware/messenger/XMPPFragment.java

-/* RCSFile: $
- * Revision: $
- * Date: $
+/**
+ * $RCSfile$
+ * $Revision$
+ * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import java.util.Iterator;

src/java/org/jivesoftware/messenger/XMPPPacket.java

@@ -3,10 +3,10 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
 
 package org.jivesoftware.messenger;

src/java/org/jivesoftware/messenger/XMPPServer.java

-/*
+/**
  * $RCSfile$
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.messenger.container.Module;

src/java/org/jivesoftware/messenger/XMPPServerInfo.java

-/*
+/**
  * $RCSfile$
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 import org.jivesoftware.util.Version;

src/java/org/jivesoftware/messenger/XMPPServerMBean.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger;
 
 /**

src/java/org/jivesoftware/messenger/auth/AuthFactory.java

@@ -3,10 +3,10 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 2002 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
 
 package org.jivesoftware.messenger.auth;

src/java/org/jivesoftware/messenger/auth/AuthProvider.java

@@ -3,10 +3,10 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
 
 package org.jivesoftware.messenger.auth;

src/java/org/jivesoftware/messenger/auth/AuthProviderFactory.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.auth;
 
 import org.jivesoftware.util.ClassUtils;
@@ -15,9 +16,9 @@ import org.jivesoftware.util.Log;
 import org.jivesoftware.messenger.JiveGlobals;
 
 /**
- * <p>Provides a centralized source of the various auth providers.</p>
- * <p/>
- * <p>The auth system has one provider. The provider allows you to
+ * Provides a centralized source of the various auth providers.<p>
+ *
+ * The auth system has one provider. The provider allows you to
  * integrate Messenger with various backend authenication systems without
  * necessarily replacing the Messenger user management system.
  * In other words, you can verify usernames and passwords against a common
@@ -25,24 +26,23 @@ import org.jivesoftware.messenger.JiveGlobals;
  * data in it's own database. This results in a redundant storage of data
  * and can cause 'data skew' where values are not updated in sync. However,
  * it is the simplest and least amount of work to integrate Messenger with
- * existing authentication systems.</p>
- * <p/>
- * <p>Users of Jive that wish to change the AuthProvider implementation
+ * existing authentication systems.<p>
+ *
+ * Users of Jive that wish to change the AuthProvider implementation
  * used to generate users can set the <code>AuthProvider.className</code>
  * Jive property. For example, if you have altered Jive to use LDAP for
  * user information, you'd want to send a custom implementation of
  * AuthProvider classes to make LDAP authetnication queries. After changing the
  * <code>AuthProvider.className</code> Jive property, you must restart
- * Messenger. The valid properties are:<p>
- * <p/>
- * <ul>
- * <li>AuthProvider.className - specifies an AuthProvider class.</li>
- * <li>GroupProvider.className - specifies a GroupProvider class.</li>
+ * Messenger. The valid properties are:<ul>
+ *      <li>AuthProvider.className - specifies an AuthProvider class.</li>
+ *      <li>GroupProvider.className - specifies a GroupProvider class.</li>
  * </ul>
  *
  * @author Iain Shigeoka
  */
 public class AuthProviderFactory {
+
     /**
      * The default class to instantiate is database implementation.
      */
@@ -55,13 +55,13 @@ public class AuthProviderFactory {
     private static GroupProvider groupProvider = null;
 
     /**
-     * <p>Obtains a concrete AuthProvider.<p>
-     * <p/>
-     * <p>By default, the implementation used will be an instance
-     * of DbAuthProvider -- the standard database implementation
-     * that uses the Jive user table. A different authProvider can be
-     * specified by setting the Jive property "AuthProvider.className".
-     * However, you must restart Jive for any change to take effect.</p>
+     * Returns a concrete AuthProvider. By default, the implementation
+     * used will be an instance of DbAuthProvider -- the standard database
+     * implementation that uses the Jive user table. A different authProvider
+     * can be specified by setting the Jive property "AuthProvider.className".
+     * However, you must restart Jive for any change to take effect.
+     *
+     * @return an AuthProvider instance.
      */
     public static AuthProvider getAuthProvider() {
         if (authProvider == null) {

src/java/org/jivesoftware/messenger/auth/AuthToken.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 2002 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.auth;
 
 /**

src/java/org/jivesoftware/messenger/auth/Group.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 2002 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.auth;
 
 import org.jivesoftware.messenger.Entity;

src/java/org/jivesoftware/messenger/auth/GroupAlreadyExistsException.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 2002 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.auth;
 
 import java.io.PrintStream;

src/java/org/jivesoftware/messenger/auth/GroupManager.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.auth;
 
 import org.jivesoftware.util.BasicResultFilter;

src/java/org/jivesoftware/messenger/auth/GroupNotFoundException.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 2002 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.auth;
 
 import java.io.PrintStream;

src/java/org/jivesoftware/messenger/auth/GroupProvider.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.auth;
 
 import org.jivesoftware.util.BasicResultFilter;
@@ -15,15 +16,13 @@ import org.jivesoftware.util.LongList;
 import org.jivesoftware.messenger.user.UserAlreadyExistsException;
 
 /**
- * <p>The group permission interface to implement when creating an
- * authentication service plug-in.</p>
- * <p/>
- * <p>Implementations of group provider handles the persistent
- * storage access for group in Messenger. Groups are associated with
- * Entities (users or chatbots) strictly by the long ID for the
- * entities. This allows groups to be handled by Jive while the user
+ * The group permission interface to implement when creating an
+ * authentication service plug-in. Implementations of group provider
+ * handles the persistent storage access for group in Messenger. Groups
+ * are associated with Entities (users or chatbots) strictly by the long ID
+ * for the entities. This allows groups to be handled by Jive while the user
  * store is in another backend system, or groups can be handled
- * separately from a native Jive user table.</p>
+ * separately from a native Jive user table.
  *
  * @author Iain Shigeoka
  */

src/java/org/jivesoftware/messenger/auth/Permissions.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.auth;
 
 import org.jivesoftware.util.CacheSizes;

src/java/org/jivesoftware/messenger/auth/UnauthorizedException.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 2002 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.auth;
 
 import java.io.PrintStream;

src/java/org/jivesoftware/messenger/auth/spi/GroupImpl.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.auth.spi;
 
 import org.jivesoftware.util.CacheManager;

src/java/org/jivesoftware/messenger/auth/spi/GroupIterator.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2001 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.auth.spi;
 
 import org.jivesoftware.database.DatabaseObjectFactory;

src/java/org/jivesoftware/messenger/auth/spi/GroupIteratorProxy.java

@@ -3,10 +3,10 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 2002 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
 
 package org.jivesoftware.messenger.auth.spi;

src/java/org/jivesoftware/messenger/auth/spi/GroupManagerImpl.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.auth.spi;
 
 import org.jivesoftware.util.CacheManager;

src/java/org/jivesoftware/messenger/auth/spi/GroupManagerProxy.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.auth.spi;
 
 import org.jivesoftware.util.BasicResultFilter;

src/java/org/jivesoftware/messenger/auth/spi/GroupProxy.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2001 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.auth.spi;
 
 import org.jivesoftware.messenger.Entity;

src/java/org/jivesoftware/messenger/chatbot/Chatbot.java

-/* RCSFile: $
- * Revision: $
- * Date: $
+/**
+ * $RCSfile$
+ * $Revision$
+ * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.chatbot;
 
 import org.jivesoftware.messenger.Entity;

src/java/org/jivesoftware/messenger/chatbot/ChatbotAccountProvider.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.chatbot;
 
 import org.jivesoftware.messenger.auth.UnauthorizedException;

src/java/org/jivesoftware/messenger/chatbot/ChatbotIDProvider.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.chatbot;
 
 import org.jivesoftware.util.LongList;

src/java/org/jivesoftware/messenger/chatbot/ChatbotInfo.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.chatbot;
 
 import org.jivesoftware.messenger.auth.UnauthorizedException;

src/java/org/jivesoftware/messenger/chatbot/ChatbotInfoProvider.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.chatbot;
 
 import org.jivesoftware.messenger.auth.UnauthorizedException;

src/java/org/jivesoftware/messenger/chatbot/ChatbotManager.java

-/* RCSFile: $
- * Revision: $
- * Date: $
+/**
+ * $RCSfile$
+ * $Revision$
+ * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.chatbot;
 
 import org.jivesoftware.util.LongList;

src/java/org/jivesoftware/messenger/chatbot/ChatbotProviderFactory.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.chatbot;
 
 import org.jivesoftware.messenger.chatbot.spi.DbChatbotAccountProvider;

src/java/org/jivesoftware/messenger/chatbot/spi/BasicChatbotInfo.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.chatbot.spi;
 
 import org.jivesoftware.messenger.auth.UnauthorizedException;

src/java/org/jivesoftware/messenger/chatbot/spi/ChatbotIterator.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2001 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.chatbot.spi;
 
 import org.jivesoftware.database.DatabaseObjectFactory;

src/java/org/jivesoftware/messenger/chatbot/spi/ChatbotManagerImpl.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.chatbot.spi;
 
 import org.jivesoftware.messenger.container.BasicModule;

src/java/org/jivesoftware/messenger/chatbot/spi/DbChatbotAccountProvider.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.chatbot.spi;
 
 import org.jivesoftware.database.DbConnectionManager;

src/java/org/jivesoftware/messenger/chatbot/spi/DbChatbotIDProvider.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.chatbot.spi;
 
 import org.jivesoftware.database.DbConnectionManager;

src/java/org/jivesoftware/messenger/chatbot/spi/DbChatbotInfoProvider.java

@@ -3,11 +3,12 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.chatbot.spi;
 
 import org.jivesoftware.database.DbConnectionManager;

src/java/org/jivesoftware/messenger/container/BasicModule.java

-/*
+/**
  * $RCSfile$
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.container;
 
 import org.jivesoftware.util.LocaleUtils;

src/java/org/jivesoftware/messenger/container/Container.java

-/*
+/**
  * $RCSfile$
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.container;
 
 import org.jivesoftware.messenger.auth.UnauthorizedException;

src/java/org/jivesoftware/messenger/container/Entry.java

-/*
+/**
  * $RCSfile$
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.container;
 
 import java.io.Serializable;

src/java/org/jivesoftware/messenger/container/Event.java

-/*
+/**
  * $RCSfile$
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.container;
 
 import java.io.Serializable;

src/java/org/jivesoftware/messenger/container/EventListener.java

-/*
+/**
  * $RCSfile$
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.container;
 
 /**

src/java/org/jivesoftware/messenger/container/EventRegistration.java

-/*
+/**
  * $RCSfile$
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.container;
 
 import java.io.Serializable;

src/java/org/jivesoftware/messenger/container/Module.java

-/*
+/**
  * $RCSfile$
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.container;
 
 /**

src/java/org/jivesoftware/messenger/container/ServiceEvent.java

-/*
+/**
  * $RCSfile$
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.container;
 
 import java.io.Serializable;

src/java/org/jivesoftware/messenger/container/ServiceID.java

-/*
+/**
  * $RCSfile$
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.container;
 
 import java.io.Serializable;

src/java/org/jivesoftware/messenger/container/ServiceItem.java

-/*
+/**
  * $RCSfile$
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.container;
 
 import java.io.Serializable;

src/java/org/jivesoftware/messenger/container/ServiceLookup.java

-/*
+/**
  * $RCSfile$
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.container;
 
 /**

src/java/org/jivesoftware/messenger/container/ServiceLookupFactory.java

-/*
+/**
  * $RCSfile$
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.container;
 
 import org.jivesoftware.messenger.auth.AuthToken;

src/java/org/jivesoftware/messenger/container/ServiceLookupProvider.java

-/*
+/**
  * $RCSfile$
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.container;
 
 import org.jivesoftware.messenger.auth.UnauthorizedException;

src/java/org/jivesoftware/messenger/container/ServiceMatches.java

-/*
+/**
  * $RCSfile$
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.container;
 
 import java.io.Serializable;

src/java/org/jivesoftware/messenger/container/ServiceRegistration.java

-/*
+/**
  * $RCSfile$
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.container;
 
 /**

src/java/org/jivesoftware/messenger/container/ServiceTemplate.java

-/*
+/**
  * $RCSfile$
  * $Revision$
  * $Date$
  *
- * Copyright (C) 1999-2003 CoolServlets, Inc. All rights reserved.
+ * Copyright (C) 2004 Jive Software. All rights reserved.
  *
- * This software is the proprietary information of CoolServlets, Inc.
- * Use is subject to license terms.
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
  */
+
 package org.jivesoftware.messenger.container;
 
 import java.io.Serializable;