Updated domain names.

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

src/java/org/jivesoftware/messenger/audit/spi/AuditorImpl.java

@@ -112,7 +112,7 @@ public class AuditorImpl implements Auditor {
             try {
                 prepareAuditFile();
                 xmlSerializer.writeStartElement("packet");
-                xmlSerializer.writeDefaultNamespace("http://jivesoftware.com");
+                xmlSerializer.writeDefaultNamespace("http://jivesoftware.org");
                 Session session = packet.getOriginatingSession();
                 if (session != null) {
                     if (session.getStreamID() != null) {
@@ -200,7 +200,7 @@ public class AuditorImpl implements Auditor {
         writer = new FileWriter(currentAuditFile);
         xmlSerializer = XMLOutputFactory.newInstance().createXMLStreamWriter(writer);
         xmlSerializer.setDefaultNamespace("jabber:client");
-        xmlSerializer.writeStartElement("jive", "jive", "http://jivesoftware.com");
-        xmlSerializer.writeNamespace("jive", "http://jivesoftware.com");
+        xmlSerializer.writeStartElement("jive", "jive", "http://jivesoftware.org");
+        xmlSerializer.writeNamespace("jive", "http://jivesoftware.org");
     }
 }

src/java/org/jivesoftware/messenger/auth/package.html

@@ -17,8 +17,6 @@ Messenger user system is based. Messenger 1.1 does not actively use
 groups but group support was kept in Messenger to ease future
 integration with Forums. Custom data provider implementors are
 discouraged from implementing custom GroupProvider classes as the
-interface may change. Contact <a href="http://www.jivesoftware.com">Jive
-Software</a> if group support
-is needed in your deployment.</p>
+interface may change.</p>
 </body>
 </html>

src/java/org/jivesoftware/messenger/disco/IQDiscoItemsHandler.java

@@ -247,7 +247,7 @@ public class IQDiscoItemsHandler extends IQDiscoHandler implements ServerFeature
 
     /**
      * Returns the server portion of a XMPP address. For example, for the
-     * address "matt@jivesoftware.com/Smack", "jivesoftware.com" would be returned.
+     * address "matt@example.org/Smack", "example.org" would be returned.
      * If no server is present in the address, the empty string will be returned.
      *
      * @param XMPPAddress the XMPP address.

src/java/org/jivesoftware/messenger/muc/MultiUserChatServer.java

@@ -175,7 +175,7 @@ public interface MultiUserChatServer {
      * 
      * @param room the room that received the message.
      * @param message the message to log as part of the conversation in the room.
-     * @param sender the real XMPPAddress of the sender (e.g. john@jivesoftware.com). 
+     * @param sender the real XMPPAddress of the sender (e.g. john@example.org). 
      */
     void logConversation(MUCRoom room, Message message, XMPPAddress sender);
 }
\ No newline at end of file

src/java/org/jivesoftware/messenger/muc/spi/ConversationLogEntry.java

@@ -44,7 +44,7 @@ class ConversationLogEntry {
      * @param date the date when the message was sent to the room.
      * @param room the room that received the message.
      * @param message the message to log as part of the conversation in the room.
-     * @param sender the real XMPPAddress of the sender (e.g. john@jivesoftware.com). 
+     * @param sender the real XMPPAddress of the sender (e.g. john@example.org). 
      */
     public ConversationLogEntry(Date date, MUCRoom room, Message message, XMPPAddress sender) {
         this.date = date;

src/java/org/jivesoftware/messenger/spi/XMPPServerInfoImpl.java

@@ -35,11 +35,10 @@ public class XMPPServerInfoImpl implements XMPPServerInfo {
     /**
      * Simple constructor
      *
-     * @param serverName The server's serverName (e.g. jivesoftware.com)
-     * @param version    The server's version number
-     * @param startDate  The server's last start time (can be null indicating it hasn't been started)
-     * @param stopDate   The server's last stop time (can be null indicating it is running or hasn't been started)
-     * @param portIter   The portIter active on the server
+     * @param serverName the server's serverName (e.g. example.org).
+     * @param version the server's version number.
+     * @param startDate the server's last start time (can be null indicating it hasn't been started).     * @param stopDate   The server's last stop time (can be null indicating it is running or hasn't been started)
+     * @param portIter the portIter active on the server.
      */
     public XMPPServerInfoImpl(String serverName, Version version, Date startDate, Date stopDate,
             Iterator portIter)

src/java/org/jivesoftware/messenger/user/package.html

@@ -19,9 +19,6 @@ data with custom providers to integrate Messenger with a CRM or ERP
 user system, while leaving roster storage in Jive's standard JDBC
 database tables. (Note: Messenger comes with JDBC and LDAP user account
 providers 'out of the box'. It is expected that LDAP will accomodate
-many enterprise integration needs). If you feel a need to implement a
-custom RosterProvider please contact <a
- href="http://www.jivesoftware.com">Jive Software</a> for more
-information.</p>
+many enterprise integration needs).</p>
 </body>
 </html>

src/java/org/jivesoftware/util/StringUtils.java

@@ -873,98 +873,97 @@ public class StringUtils {
     }
 
     /**
-         * Returns the name portion of a XMPP address. For example, for the
-         * address "matt@jivesoftware.com/Smack", "matt" would be returned. If no
-         * username is present in the address, the empty string will be returned.
-         *
-         * @param XMPPAddress the XMPP address.
-         * @return the name portion of the XMPP address.
-         */
-        public static String parseName(String XMPPAddress) {
-            if (XMPPAddress == null) {
-                return null;
-            }
-            int atIndex = XMPPAddress.indexOf("@");
-            if (atIndex <= 0) {
-                return "";
-            }
-            else {
-                return XMPPAddress.substring(0, atIndex);
-            }
+     * Returns the name portion of a XMPP address. For example, for the
+     * address "matt@example.org/Smack", "matt" would be returned. If no
+     * username is present in the address, the empty string will be returned.
+     *
+     * @param XMPPAddress the XMPP address.
+     * @return the name portion of the XMPP address.
+     */
+    public static String parseName(String XMPPAddress) {
+        if (XMPPAddress == null) {
+            return null;
         }
-
-        /**
-         * Returns the server portion of a XMPP address. For example, for the
-         * address "matt@jivesoftware.com/Smack", "jivesoftware.com" would be returned.
-         * If no server is present in the address, the empty string will be returned.
-         *
-         * @param XMPPAddress the XMPP address.
-         * @return the server portion of the XMPP address.
-         */
-        public static String parseServer(String XMPPAddress) {
-            if (XMPPAddress == null) {
-                return null;
-            }
-            int atIndex = XMPPAddress.indexOf("@");
-            // If the String ends with '@', return the empty string.
-            if (atIndex + 1 > XMPPAddress.length()) {
-                return "";
-            }
-            if (atIndex < 0) {
-                atIndex = 0;
-            }
-            int slashIndex = XMPPAddress.indexOf("/");
-            if (slashIndex > 0) {
-                return XMPPAddress.substring(atIndex + 1, slashIndex);
-            }
-            else {
-                return XMPPAddress.substring(atIndex + 1);
-            }
+        int atIndex = XMPPAddress.indexOf("@");
+        if (atIndex <= 0) {
+            return "";
+        }
+        else {
+            return XMPPAddress.substring(0, atIndex);
         }
+    }
 
-        /**
-         * Returns the resource portion of a XMPP address. For example, for the
-         * address "matt@jivesoftware.com/Smack", "Smack" would be returned. If no
-         * resource is present in the address, the empty string will be returned.
-         *
-         * @param XMPPAddress the XMPP address.
-         * @return the resource portion of the XMPP address.
-         */
-        public static String parseResource(String XMPPAddress) {
-            if (XMPPAddress == null) {
-                return null;
-            }
-            int slashIndex = XMPPAddress.indexOf("/");
-            if (slashIndex + 1 > XMPPAddress.length() || slashIndex < 0) {
-                return "";
-            }
-            else {
-                return XMPPAddress.substring(slashIndex + 1);
-            }
+    /**
+     * Returns the server portion of a XMPP address. For example, for the
+     * address "matt@example.org/Smack", "example.org" would be returned.
+     * If no server is present in the address, the empty string will be returned.
+     *
+     * @param XMPPAddress the XMPP address.
+     * @return the server portion of the XMPP address.
+     */
+    public static String parseServer(String XMPPAddress) {
+        if (XMPPAddress == null) {
+            return null;
+        }
+        int atIndex = XMPPAddress.indexOf("@");
+        // If the String ends with '@', return the empty string.
+        if (atIndex + 1 > XMPPAddress.length()) {
+            return "";
         }
+        if (atIndex < 0) {
+            atIndex = 0;
+        }
+        int slashIndex = XMPPAddress.indexOf("/");
+        if (slashIndex > 0) {
+            return XMPPAddress.substring(atIndex + 1, slashIndex);
+        }
+        else {
+            return XMPPAddress.substring(atIndex + 1);
+        }
+    }
 
-        /**
-         * Returns the XMPP address with any resource information removed. For example,
-         * for the address "matt@jivesoftware.com/Smack", "matt@jivesoftware.com" would
-         * be returned.
-         *
-         * @param XMPPAddress the XMPP address.
-         * @return the bare XMPP address without resource information.
-         */
-        public static String parseBareAddress(String XMPPAddress) {
-            if (XMPPAddress == null) {
-                return null;
-            }
-            int slashIndex = XMPPAddress.indexOf("/");
-            if (slashIndex < 0) {
-                return XMPPAddress;
-            }
-            else if (slashIndex == 0) {
-                return "";
-            }
-            else {
-                return XMPPAddress.substring(0, slashIndex);
-            }
+    /**
+     * Returns the resource portion of a XMPP address. For example, for the
+     * address "matt@example.org/Smack", "Smack" would be returned. If no
+     * resource is present in the address, the empty string will be returned.
+     *
+     * @param XMPPAddress the XMPP address.
+     * @return the resource portion of the XMPP address.
+     */
+    public static String parseResource(String XMPPAddress) {
+        if (XMPPAddress == null) {
+            return null;
         }
+        int slashIndex = XMPPAddress.indexOf("/");
+        if (slashIndex + 1 > XMPPAddress.length() || slashIndex < 0) {
+            return "";
+        }
+        else {
+            return XMPPAddress.substring(slashIndex + 1);
+        }
+    }
 
+    /**
+     * Returns the XMPP address with any resource information removed. For example,
+     * for the address "matt@example.org/Smack", "matt@example.org" would
+     * be returned.
+     *
+     * @param XMPPAddress the XMPP address.
+     * @return the bare XMPP address without resource information.
+     */
+    public static String parseBareAddress(String XMPPAddress) {
+        if (XMPPAddress == null) {
+            return null;
+        }
+        int slashIndex = XMPPAddress.indexOf("/");
+        if (slashIndex < 0) {
+            return XMPPAddress;
+        }
+        else if (slashIndex == 0) {
+            return "";
+        }
+        else {
+            return XMPPAddress.substring(0, slashIndex);
+        }
+    }
 }
\ No newline at end of file

src/web/WEB-INF/admin.tld

@@ -7,7 +7,7 @@
 	<tlibversion>1.0</tlibversion>
 	<jspversion>1.1</jspversion>
 	<shortname>Tag Library for Jive Messenger 2.0</shortname>
-	<uri>http://www.jivesoftware.com/</uri>
+	<uri>http://www.jivesoftware.org/</uri>
 	<info>Tab Library for Jive Messenger Admin Console</info>
 	<tag>
 		<name>tabs</name>