[jboss-svn-commits] JBL Code SVN: r6770 - labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 12 18:01:43 EDT 2006
Author: dejp
Date: 2006-10-12 18:01:37 -0400 (Thu, 12 Oct 2006)
New Revision: 6770
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDataBean.java
labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDescriptor.java
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/ConNodeWatcher.java
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/ConTools.java
Log:
contributors app
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDataBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDataBean.java 2006-10-12 21:35:07 UTC (rev 6769)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDataBean.java 2006-10-12 22:01:37 UTC (rev 6770)
@@ -162,14 +162,24 @@
}
public String getProjects() {
+ if (this.projects == null) {
+ String projects = new String();
+ Projects prjs = ProjectsHelper.getProjects(ConTools.getPortalName());
+
+ for (String projectId : projectsInfo.keySet()) {
+ projectsInfo.put(projectId, "0");
+
+ if (projects.length() > 0)
+ projects = projects + ", " + prjs.getProjectName(projectId);
+ else
+ projects = prjs.getProjectName(projectId);
+ }
+ this.projects = projects;
+ }
return projects;
}
- public void setProjects(String projects) {
- this.projects = projects;
- }
-
- public void setProjects(Map<String, String> projectsInfo) {
+ /*public void setProjects(Map<String, String> projectsInfo) {
Projects prjs = ProjectsHelper.getProjects(ConTools.getPortalName());
String projects = new String();
@@ -182,7 +192,7 @@
projects = prjs.getProjectName(projectId);
}
this.projects = projects;
- }
+ }*/
public String getSince() {
return since;
@@ -240,4 +250,9 @@
this.projectsInfo = projectsInfo;
}
+ public boolean isAcceptedByProjectLeads() {
+
+ return !projectsInfo.containsValue("0");
+ }
+
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDescriptor.java 2006-10-12 21:35:07 UTC (rev 6769)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDescriptor.java 2006-10-12 22:01:37 UTC (rev 6770)
@@ -68,7 +68,8 @@
private Map<String, List<ConDataBean>> ascSort;
private Map<String, List<ConDataBean>> descSort;
- private List<ConDataBean> unConfirmedData;
+ private List<ConDataBean> unconfirmedData;
+ private List<ConDataBean> notAcceptedByLeadsData;
/**
* Makes a copy of the given list and sorts it with respect to the given
@@ -113,6 +114,11 @@
return copy;
}
+ public ConDescriptor(ContentManager cm) {
+
+ this(cm, ConServer.AGREEMENTS_XML);
+ }
+
/**
* Creates a new contributors descriptor.
* @param cm A contetnt manager prefixed with the contributors directory.
@@ -128,7 +134,8 @@
ascSort = new HashMap<String, List<ConDataBean>>();
descSort = new HashMap<String, List<ConDataBean>>();
- unConfirmedData = new ArrayList<ConDataBean>();
+ unconfirmedData = new ArrayList<ConDataBean>();
+ notAcceptedByLeadsData = new ArrayList<ConDataBean>();
try {
// Filling data & notAcceptedData
@@ -148,7 +155,8 @@
NodeList nodes = node.getChildNodes();
Node n = null;
- for (int i = 0; i < nodes.getLength(); i++) {
+
+ for (int i = 0; i < nodes.getLength(); i++) {
n = nodes.item(i);
if ((n.getNodeType() == Node.ELEMENT_NODE) && (n.getNodeName().equals(AGREEMENT_TAG))) {
@@ -157,10 +165,13 @@
if ("1".equals(contributor.getAccepted())) {
data.add(contributor);
- } else if ("0".equals(contributor.getAccepted())) {
+ } else if ("0".equals(contributor.getAccepted()) &&
+ contributor.isAcceptedByProjectLeads()) {
notAcceptedData.add(contributor);
- } else {
- unConfirmedData.add(contributor);
+ } else if ("0".equals(contributor.getAccepted())) {
+ notAcceptedByLeadsData.add(contributor);
+ } else {
+ unconfirmedData.add(contributor);
}
takenIds.add(contributor.getName());
@@ -199,6 +210,10 @@
return notAcceptedData;
}
+ public List<ConDataBean> getNotAcceptedByLeadsData() {
+ return notAcceptedByLeadsData;
+ }
+
public Set getTakenIds() {
return takenIds;
}
@@ -244,7 +259,6 @@
}
contributor.setProjectsInfo(map);
- contributor.setProjects(map);
} else if (LOGIN_TAG.equals(nodeName)) {
contributor.setLogin(XmlTools.unmarshallText(n));
} else if (EMAIL_TAG.equals(nodeName)) {
@@ -265,30 +279,30 @@
public ConDataBean getUnconfirmedContributor(String code) {
- for (ConDataBean contributor : unConfirmedData) {
+ for (ConDataBean contributor : unconfirmedData) {
if (contributor.getName().equals(code)) {
return contributor;
}
}
return null;
-
}
public List<ConDataBean> getNotAcceptedByLeadData(Set<String> projectIds) {
List<ConDataBean> contributors = new ArrayList<ConDataBean>();
- for (ConDataBean contributor : notAcceptedData) {
+ for (ConDataBean contributor : notAcceptedByLeadsData) {
Map<String, String> projectInfo = contributor.getProjectsInfo();
for (String projectId : projectIds) {
- if (projectInfo.containsValue(projectId)) {
+
+ if (projectInfo.containsKey(projectId)) {
contributors.add(contributor);
break;
}
}
}
-
+
return contributors;
}
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-12 21:35:07 UTC (rev 6769)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java 2006-10-12 22:01:37 UTC (rev 6770)
@@ -35,6 +35,7 @@
/**
* @author adamw
+ * @author dejp
* Main, session-scoped bean for holding user's sort order and new application
* information.
*/
@@ -48,6 +49,8 @@
private String searchEmail;
private String searchProjects;
+ private boolean committer;
+
private boolean ascending;
private String sort;
@@ -71,9 +74,9 @@
*/
public String acceptByProjectLead() {
- ConDataBean conDataBean = (ConDataBean) adminDataTable.getRowData();
+ ConDataBean conDataBean = (ConDataBean) leadDataTable.getRowData();
if (getServer().acceptByProjectLead(conDataBean)) {
- getServer().getDesc(ConTools.getPortalName()).getNotAcceptedData().remove(conDataBean);
+ //getServer().getDesc(ConTools.getPortalName()).getNotAcceptedByLeadsData().remove(conDataBean);
addMessage(getServer().getMessages().getString("applicationAccepted"));
} else {
addMessage(getServer().getMessages().getString("commitError"));
@@ -97,7 +100,7 @@
public String delete() {
ConDataBean conDataBean = (ConDataBean) adminDataTable.getRowData();
if (getServer().delete(conDataBean)) {
- //getServer().getDesc(ConTools.getPortalName()).getNotAcceptedData().remove(conDataBean);
+ getServer().getDesc(ConTools.getPortalName()).getNotAcceptedData().remove(conDataBean);
addMessage(getServer().getMessages().getString("applicationDeleted"));
} else {
addMessage(getServer().getMessages().getString("commitError"));
@@ -322,13 +325,13 @@
this.leadDataTable = leadDataTable;
}
- /*public boolean isCommitter() {
+ public boolean isCommitter() {
return committer;
}
public void setCommitter(boolean committer) {
this.committer = committer;
- }*/
+ }
public Map<String, String> getProjectsNameId() {
return server.getProjectsNameId();
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConNodeWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConNodeWatcher.java 2006-10-12 21:35:07 UTC (rev 6769)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConNodeWatcher.java 2006-10-12 22:01:37 UTC (rev 6770)
@@ -29,7 +29,7 @@
public class ConNodeWatcher extends ShotokuResourceWatcher<String, ConDescriptor> {
private ConDescriptor getDesc(String key) {
- return new ConDescriptor(getContentManager(key), ConServer.AGREEMENTS_XML);
+ return new ConDescriptor(getContentManager(key));
}
public ConDescriptor init(String key) {
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-12 21:35:07 UTC (rev 6769)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java 2006-10-12 22:01:37 UTC (rev 6770)
@@ -34,7 +34,6 @@
import org.jboss.forge.common.ForgeHelper;
import org.jboss.forge.common.projects.ProjectsHelper;
-import org.jboss.forge.common.soa.LabsServices;
import org.jboss.portal.api.node.PortalNodeURL;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.Node;
@@ -146,7 +145,6 @@
confirmed.setContent(newContent);
confirmed.save("New application accepted");
-
if (!projectsInfo.containsValue("0")) {
PortalNodeURL url = ConTools.createRenderURL();
@@ -166,14 +164,14 @@
String projectLeadEmail = projectLead.getRealEmail();
// email to project lead
- ForgeHelper.postMail(
+ /*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");
+ "labs-robot at labs.jboss.com");*/
return true;
} catch (Exception e) {
@@ -284,7 +282,7 @@
//ElementDescriptor toConfirm;
ConDataBean toConfirm;
try {
- ConDescriptor desc = new ConDescriptor(cm, UNCONFIRMED_XML);
+ ConDescriptor desc = new ConDescriptor(cm, getUnconfirmedFilePath());
toConfirm = desc.getUnconfirmedContributor(code);
/*toConfirm = new ElementsDescriptor(
@@ -304,7 +302,7 @@
// Generating xml representations of the agreement - before
// and after confirmation.
String oldXml = toConfirm.getXml();
- System.out.println(oldXml);
+
String newXml = new ConDataBean("0",
toConfirm.getEmail(),
toConfirm.getAccepted(),
@@ -312,24 +310,7 @@
toConfirm.getSince(),
toConfirm.getType(),
toConfirm.getLogin()).getXml();
- System.out.println(newXml);
- /*String oldXml = new ConDataBean(
- toConfirm.getProperty("accepted"),
- toConfirm.getProperty("e-mail"),
- code,
- toConfirm.getProperty("name"),
- toConfirm.getProperty("since"),
- toConfirm.getProperty("type"),
- toConfirm.getProperty("login")).getXml();
- String newXml = new ConDataBean("0",
- toConfirm.getProperty("e-mail"),
- toConfirm.getProperty("accepted"),
- toConfirm.getProperty("name"),
- toConfirm.getProperty("since"),
- toConfirm.getProperty("type"),
- toConfirm.getProperty("login")).getXml();*/
-
// Writing changes to xml files.
try {
Node confirmed = cm.getNode(confirmedXmlFilePath);
@@ -356,7 +337,7 @@
String adminURL = ConTools.getBaseServerAddress() +
url.toString();
- for (String projectId : toConfirm.getProjectsInfo().keySet()) {
+ /*for (String projectId : toConfirm.getProjectsInfo().keySet()) {
// TODO Retrieve project lead username
String username = "";
@@ -372,7 +353,7 @@
new Object[] { newXml, adminURL }),
"labs-admin at jboss.com");
}
- }
+ }*/
} catch (Exception e) {
return messages.getString("unableToConfirm");
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java 2006-10-12 21:35:07 UTC (rev 6769)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java 2006-10-12 22:01:37 UTC (rev 6770)
@@ -32,7 +32,6 @@
import org.jboss.forge.common.ForgeHelper;
import org.jboss.forge.common.PermissionTools;
import org.jboss.forge.common.projects.ProjectsHelper;
-import org.jboss.forge.common.soa.LabsServices;
import org.jboss.portal.api.node.PortalNodeURL;
import org.jboss.portlet.JBossActionRequest;
import org.jboss.portlet.JBossActionResponse;
More information about the jboss-svn-commits
mailing list