[jboss-svn-commits] JBL Code SVN: r7149 - labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor

[jboss-svn-commits at lists.jboss.org]

Author: dejp
Date: 2006-10-26 13:37:30 -0400 (Thu, 26 Oct 2006)
New Revision: 7149

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java
   labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java
Log:
contributors app

Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java	2006-10-26 16:59:52 UTC (rev 7148)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java	2006-10-26 17:37:30 UTC (rev 7149)
@@ -29,9 +29,12 @@
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIData;
 import javax.faces.context.FacesContext;
+import javax.management.MalformedObjectNameException;
 
 import org.jboss.forge.common.Constants;
 import org.jboss.forge.common.SearchTools;
+import org.jboss.forge.common.soa.LabsServices;
+import org.jboss.forge.common.soa.projects.ProjectsService;
 
 /**
  * @author adamw
@@ -140,6 +143,7 @@
 	}
 	
 	public String processApplication() {
+		
 		String error = null;
 		
 		if (committer) {

Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java	2006-10-26 16:59:52 UTC (rev 7148)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java	2006-10-26 17:37:30 UTC (rev 7149)
@@ -34,6 +34,9 @@
 
 import org.jboss.forge.common.ForgeHelper;
 import org.jboss.forge.common.projects.ProjectsHelper;
+import org.jboss.forge.common.projects.test.Developers;
+import org.jboss.forge.common.soa.LabsServices;
+import org.jboss.forge.common.soa.projects.ProjectsService;
 import org.jboss.portal.api.node.PortalNodeURL;
 import org.jboss.shotoku.ContentManager;
 import org.jboss.shotoku.Node;
@@ -164,20 +167,27 @@
 			}
 			
 			org.jboss.portal.identity.User projectLead = ConTools.getUser();
-			String projectLeadEmail = projectLead.getRealEmail();
 			
-			// email to project lead
-			ForgeHelper.postMail(
-					projectLeadEmail,
-					messages.getString("acceptedMailSubject"),
-					getFormattedMessage("acceptedMailTextAdmin", 
-							new Object[] { contributor.getName(),
-							contributor.getEmail(), contributor.getType(),
-							contributor.getLogin(), contributor.getProjects() }),
-					"labs-robot at labs.jboss.com");
+			if (projectLead != null) {
+				String projectLeadEmail = projectLead.getRealEmail();
+				
+				if (projectLeadEmail != null) {
+					
+					// email to project lead
+					ForgeHelper.postMail(
+							projectLeadEmail,
+							messages.getString("acceptedMailSubject"),
+							getFormattedMessage("acceptedMailTextAdmin", 
+									new Object[] { contributor.getName(),
+									contributor.getEmail(), contributor.getType(),
+									contributor.getLogin(), contributor.getProjects() }),
+							"labs-robot at labs.jboss.com");
+				}
+			}
 			
 			return true;
 		} catch (Exception e) {
+			e.printStackTrace();
 			return false;
 		}
 	}
@@ -419,28 +429,43 @@
 			String adminURL = ConTools.getBaseServerAddress() + 
 				url.toString();
 			
-			/*for (String projectId : toConfirm.getProjectsInfo().keySet()) {
-				// TODO Retrieve project lead username
-				String username = "";
-			
-				org.jboss.portal.identity.User projectLead = 
-					LabsServices.getPrimatesService().getUser(username);
-				
-				// Sending an email to project lead
-				if (projectLead != null && projectLead.getRealEmail() != null) {
-					ForgeHelper.postMail(
-						projectLead.getRealEmail(),
-						messages.getString("adminMailSubject"),
-						getFormattedMessage("adminMailText", 
-								new Object[] { newXml, adminURL }),
-						"labs-admin at jboss.com");
+			try {
+				ProjectsService projectsService = LabsServices.getProjectsService();
+
+				for (String projectId : toConfirm.getProjectsInfo().keySet()) {
+					Developers developers = projectsService.getProjectDevelopers(projectId);
+
+					if (developers != null) {
+						String username = developers.getLeadDeveloper();
+
+						if (username != null) {
+							org.jboss.portal.identity.User projectLead = 
+								LabsServices.getPrimatesService().getUser(username);
+
+							// Sending an email to project lead
+							if (projectLead != null && projectLead.getRealEmail() != null) {
+								System.out.println(projectLead.getRealEmail());
+								ForgeHelper.postMail(
+									projectLead.getRealEmail(),
+									messages.getString("adminMailSubject"),
+									getFormattedMessage("adminMailText", 
+											new Object[] { newXml, adminURL }),
+									"labs-admin at jboss.com");
+							}
+						}
+					}
 				}
-			}*/
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
 
 		} catch (Exception e) {
+			e.printStackTrace();
 			return messages.getString("unableToConfirm");
 		} 
+
 		
+		
 		return null;
 	}