[mashup-dev] svn commit r9745 - in trunk/mashup/java/modules: core/src/org/wso2/mashup hostobjects/src/org/wso2/mashup/hostobjects/email

[svn at wso2.org]

Author: keith
Date: Tue Nov 13 22:15:29 2007
New Revision: 9745

Modified:
   trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
   trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/email/Email.java
Log:
Renaming a cpl of constants



Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
==============================================================================
--- trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java	(original)
+++ trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java	Tue Nov 13 22:15:29 2007
@@ -19,9 +19,16 @@
     public static String MASHUP_JS_SERVICE = "MashupJSService";
     public static String CONTENT_TYPE_QUERY_PARAM = "content-type";
     public static String EMAIL_CONFIG = "EmailConfig";
-    public static String USERNAME = EMAIL_CONFIG + "." + "username";
-    public static String PASSWORD = EMAIL_CONFIG + "." + "password";
+    public static String IM_CONFIG = "IMConfig";
+    public static String USERNAME = "username";
+    public static String PASSWORD = "password";
+    public static String EMAIL_USERNAME = EMAIL_CONFIG + "." + USERNAME;
+    public static String EMAIL_PASSWORD = EMAIL_CONFIG + "." + PASSWORD;
     public static String HOST = EMAIL_CONFIG + "." + "host";
     public static String PORT = EMAIL_CONFIG + "." + "port";
     public static String FROM = EMAIL_CONFIG + "." + "from";
+    public static String MSN = IM_CONFIG + "." + "MSN";
+    public static String AIM = IM_CONFIG + "." + "AIM";
+    public static String ICQ = IM_CONFIG + "." + "ICQ";
+    public static String JABBER = IM_CONFIG + "." + "Jabber";
 }

Modified: trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/email/Email.java
==============================================================================
--- trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/email/Email.java	(original)
+++ trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/email/Email.java	Tue Nov 13 22:15:29 2007
@@ -206,11 +206,11 @@
             String username, password;
             ServerConfiguration serverConfig = ServerConfiguration.getInstance();
 
-            username = serverConfig.getFirstProperty(MashupConstants.USERNAME);
+            username = serverConfig.getFirstProperty(MashupConstants.EMAIL_USERNAME);
             if (username == null) {
                 return null;
             }
-            password = serverConfig.getFirstProperty(MashupConstants.PASSWORD);
+            password = serverConfig.getFirstProperty(MashupConstants.EMAIL_PASSWORD);
             return new PasswordAuthentication(username, password);
         }
     }