Changeset 19984 for greenstone3/trunk/src/java/org/greenstone/gsdl3/service/BerryBasket.java

Timestamp:

2009-07-13T10:25:21+12:00 (15 years ago)

Author:

oranfry

Message:

initial implementation of support for site-level metadata

File:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/service/BerryBasket.java (modified) (2 diffs)

greenstone3/trunk/src/java/org/greenstone/gsdl3/service/BerryBasket.java

@@ -32 +32 @@
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.GSPath;
+import org.greenstone.gsdl3.util.GlobalProperties;
 
 import java.net.InetAddress;
@@ -483 +484 @@
 
 
-    public Element processSendMail(Element request){
-    // Create a new (empty) result message
-    Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
-    
-    // Get the parameters of the request
-    Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-        
-        GSXML.printXMLNode(param_list);
-     
-    if (param_list == null) {
-        logger.error("BerryBasket Error: SendMail request had no paramList.");
-        return result;  // Return the empty result
-    }
-
-    HashMap params = GSXML.extractParams(param_list, false);
-      
-    String to = (String)params.get("address");
-        String subject = (String)params.get("subject");
-    String mailhost = (String)params.get("host");
-        String content =  (String)params.get("content");
-        String cc = (String)params.get("cc");
-        String bcc = (String)params.get("bcc");
-        username = (String)params.get("user");
-        password = (String)params.get("password");
-    String mailer = "msgsend";        
-       
-    try {
-       
-        Properties props = System.getProperties();
-        // XXX - could use Session.getTransport() and Transport.connect()
-        // XXX - assume we're using SMTP
-        // TODO: need to get Mail server info from the configuration file
-        if (mailhost != null && mailhost.trim().equals(""))
-        props.put("mail.smtp.host", mailhost);
-        else{
-        props.put("mail.smtp.host", "webmail.cs.waikato.ac.nz"); 
-        }
-
-        // TODO: need to get account info from the configuration file
-            Authenticator auth = new Authenticator(){
-         protected  PasswordAuthentication  getPasswordAuthentication(){
-             if (username == null || username.equals("")){
-             username = "xxxxx";
-                         password = "xxxxx";
-             }
-              return new PasswordAuthentication(username,password);
-          }
-            };
-    
-           Session session = Session.getInstance(props, auth);
-
-       Message msg = new MimeMessage(session);
-       msg.setFrom();
-
-       msg.setRecipients(Message.RecipientType.TO,
-                 InternetAddress.parse(to, false));
-       if (cc != null)
-           msg.setRecipients(Message.RecipientType.CC,
-                 InternetAddress.parse(cc, false));
-        if (bcc != null)
-        msg.setRecipients(Message.RecipientType.BCC,
-                  InternetAddress.parse(bcc, false));
-
-        msg.setSubject(subject);
-        
-            msg.setText(content.replaceAll("-------","&"));
-        msg.setHeader("X-Mailer", mailer);
-        msg.setSentDate(new Date());
-
-        // send the thing off
-        Transport.send(msg);
-        
-        logger.info("\nMail was sent successfully.");
-            result.appendChild(this.doc.createTextNode("Mail was sent successfully."));
-    } catch (Exception e) {
-        e.printStackTrace();
-            result.appendChild(this.doc.createTextNode(e.getMessage()));
-    }
-    
-    return result;
-    }
-
-    protected class Item {
-
-    public String collection;
-    public String docid;
-        public String title="";
-        public String query="";
-        public String date="";
-        public String rootTitle="";
-
-    public Item(String coll, String id) {
-        this.collection = coll;
-        this.docid = id;
-        }
+    public Element processSendMail(Element request){
+        // Create a new (empty) result message
+        Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        
+        // Get the parameters of the request
+        Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+        
+        GSXML.printXMLNode(param_list);
+        
+        if (param_list == null) {
+            logger.error("BerryBasket Error: SendMail request had no paramList.");
+            return result;  // Return the empty result
+        }
+        
+        HashMap params = GSXML.extractParams(param_list, false);
+        
+        String to = (String)params.get("address");
+        String subject = (String)params.get("subject");
+        String content = (String)params.get("content");
+        String cc = (String)params.get("cc");
+        String bcc = (String)params.get("bcc");
+        
+        String mailhost = GlobalProperties.getProperty("mail.smtp.host");
+        username = GlobalProperties.getProperty("mail.smtp.username");
+        password = GlobalProperties.getProperty("mail.smtp.password");
+        String from = GlobalProperties.getProperty("mail.from");
+        
+        String mailer = "msgsend";
+        
+        try {
+            
+            Properties props = System.getProperties();
+            
+            //Setup smtp host and from address
+            // XXX - could use Session.getTransport() and Transport.connect()
+            // XXX - assume we're using SMTP
+            if ( mailhost != null && !mailhost.trim().equals("") ) {
+                props.put("mail.smtp.host", mailhost);
+            } else {
+                props.put("mail.smtp.host", "localhost");
+            }
+            if ( from != null && !from.trim().equals("") ) {
+                props.put("mail.from", from);
+            }
+            
+            //setup username and password to the smtp server
+            if ( username == null || username.trim().equals("") ) username = "";
+            if ( password == null || password.trim().equals("") ) password = "";
+            Authenticator auth = new Authenticator() {
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication( username, password );
+                }
+            };
+            
+            Session session = Session.getInstance(props, auth);
+            
+            Message msg = new MimeMessage(session);
+            msg.setFrom();
+            msg.setRecipients( Message.RecipientType.TO, InternetAddress.parse(to, false) );
+            if ( cc != null ) {
+                msg.setRecipients(Message.RecipientType.CC, InternetAddress.parse(cc, false) );
+            }
+            if ( bcc != null ) {
+                msg.setRecipients(Message.RecipientType.BCC, InternetAddress.parse(bcc, false) );
+            }
+            msg.setSubject(subject);
+            msg.setText(content.replaceAll("-------","&"));
+            msg.setHeader("X-Mailer", mailer);
+            msg.setSentDate(new Date());
+            
+            // send the thing off
+            Transport.send(msg);
+            
+            logger.info("\nMail was sent successfully.");
+            result.appendChild(this.doc.createTextNode("Mail was sent successfully."));
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.appendChild(this.doc.createTextNode(e.getMessage()));
+        }
+        
+        return result;
+    }
+
+
+    protected class Item {
+        public String collection;
+        public String docid;
+        public String title="";
+        public String query="";
+        public String date="";
+        public String rootTitle="";
+        
+        public Item(String coll, String id) {
+            this.collection = coll;
+            this.docid = id;
+        }
 
         public boolean equals(Object o){