[jboss-svn-commits] JBL Code SVN: r7042 - in labs/jbosslabs/trunk/portal-extensions/forge-contributor/src: etc java/org/jboss/forge/contributor web/WEB-INF
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Oct 23 17:48:07 EDT 2006
Author: dejp
Date: 2006-10-23 17:48:00 -0400 (Mon, 23 Oct 2006)
New Revision: 7042
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/etc/Messages.properties
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
labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/faces-config.xml
Log:
contributors portlet
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/etc/Messages.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/etc/Messages.properties 2006-10-23 21:25:30 UTC (rev 7041)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/etc/Messages.properties 2006-10-23 21:48:00 UTC (rev 7042)
@@ -8,7 +8,8 @@
adminMailText New application added to agreements.xml; please accept it or delete\: \n {0} \nTo accept/delete the application go to the following website and click the "Administer applications" link\: \n{1}
deletedMailSubject Application deletion
-deletedMailText Dear {0}, \n\nI am sorry to inform you that your application to become \na contributor to JBoss has been rejected. \n\nThe JBoss Labs team.
+deletedMailText Dear {0}, \n\nI am sorry to inform you that your application to become \na contributor to JBoss has been rejected. \n{1}\nThe JBoss Labs team.
+deletedMailTextWithComment Dear {0}, \n\nI am sorry to inform you that your application to become \na contributor to JBoss has been rejected. \n{1}\n\nThe JBoss Labs team.
acceptedMailSubject Application acceptation
acceptedMailText Dear {0}, \n\nI am happy to inform you that your application to become \na contributor to JBoss has been accepted. Your name should \nnow be visible on the contributor's list on labs.jboss.com. \n\nThe JBoss Labs team.
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-23 21:25:30 UTC (rev 7041)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java 2006-10-23 21:48:00 UTC (rev 7042)
@@ -64,6 +64,10 @@
private ConServer server;
+ private String comment;
+
+ private ConDataBean contributorForDel;
+
private void addMessage(String message) {
FacesContext.getCurrentInstance().addMessage(null,
new FacesMessage(message));
@@ -84,7 +88,7 @@
return null;
}
- public String accept() {
+ public String acceptByAdmin() {
ConDataBean conDataBean = (ConDataBean) adminDataTable.getRowData();
if (getServer().accept(conDataBean)) {
addMessage(getServer().getMessages().getString("applicationAccepted"));
@@ -95,24 +99,42 @@
return null;
}
- public String delete() {
- ConDataBean conDataBean = (ConDataBean) adminDataTable.getRowData();
- if (getServer().delete(conDataBean)) {
+ public String adminDelete() {
+ setContributorForDel((ConDataBean) adminDataTable.getRowData());
+ return "adminDelete";
+ }
+
+ public String leadDelete() {
+ setContributorForDel((ConDataBean) leadDataTable.getRowData());
+ return "leadDelete";
+ }
+
+ public String deleteByAdmin() {
+ if (getServer().delete(getContributorForDel(), getComment())) {
addMessage(getServer().getMessages().getString("applicationDeleted"));
+ setContributorForDel(null);
+ setComment(null);
+ return "admin";
} else {
addMessage(getServer().getMessages().getString("commitError"));
}
+
+ setComment(null);
getServer().resetDesc(ConTools.getPortalName());
return null;
}
- public String deleteByLead() {
- ConDataBean conDataBean = (ConDataBean) leadDataTable.getRowData();
- if (getServer().delete(conDataBean)) {
+ public String deleteByProjectLead() {
+ if (getServer().deleteByLead(getContributorForDel(), getComment())) {
addMessage(getServer().getMessages().getString("applicationDeleted"));
+ setContributorForDel(null);
+ setComment(null);
+ return "admin";
} else {
addMessage(getServer().getMessages().getString("commitError"));
}
+
+ setComment(null);
getServer().resetDesc(ConTools.getPortalName());
return null;
}
@@ -162,12 +184,10 @@
getServer().getDesc(ConTools.getPortalName()).getData();
for (ConDataBean bean : allData) {
- if ((SearchTools.searchInString(bean.getName(),
- SearchTools.prepareTokens(searchName, " "))) ||
- (SearchTools.searchInString(bean.getProjects(),
- SearchTools.prepareTokens(searchProjects, " "))) ||
- (SearchTools.searchInString(bean.getEmail(),
- SearchTools.prepareTokens(searchEmail, " ")))) {
+ if ((SearchTools.searchInString(bean.getName(), SearchTools.prepareTokens(searchName, " "))) ||
+ (SearchTools.searchInString(bean.getProjects(), SearchTools.prepareTokens(searchProjects, " "))) ||
+ //(SearchTools.searchInString(bean.getProjects(), new String[] { searchProjects.toLowerCase().trim() })) ||
+ (SearchTools.searchInString(bean.getEmail(), SearchTools.prepareTokens(searchEmail, " ")))) {
filteredList.add(bean);
}
}
@@ -349,7 +369,23 @@
public Map<String, String> getProjectsNameId() {
return server.getProjectsNameId();
}
-
+
+ public String getComment() {
+ return comment;
+ }
+
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
+
+ public ConDataBean getContributorForDel() {
+ return contributorForDel;
+ }
+
+ public void setContributorForDel(ConDataBean contributorForDel) {
+ this.contributorForDel = contributorForDel;
+ }
+
public List<ConDataBean> getLeadData() {
Set<String> projectIds = ConTools.getLeadProjectIds();
return getServer().getDesc(ConTools.getPortalName()).getNotAcceptedByLeadData(projectIds);
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-23 21:25:30 UTC (rev 7041)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java 2006-10-23 21:48:00 UTC (rev 7042)
@@ -245,7 +245,7 @@
* @param dataBean Application to delete.
* @return True iff deleting was successfull.
*/
- synchronized boolean delete(ConDataBean dataBean) {
+ synchronized boolean delete(ConDataBean dataBean, String comment) {
String oldXml = dataBean.getXml();
try {
@@ -276,11 +276,19 @@
} finally {
// Sending the "you-are-reject" email no matter exception or not.
try {
- ForgeHelper.postMail(dataBean.getEmail(),
+ if (comment != null && comment.length() != 0) {
+ ForgeHelper.postMail(dataBean.getEmail(),
+ messages.getString("deletedMailSubject"),
+ getFormattedMessage("deletedMailTextWithComment",
+ new Object[] { dataBean.getName(), comment }),
+ "forge-robot at labs.jboss.com");
+ } else {
+ ForgeHelper.postMail(dataBean.getEmail(),
messages.getString("deletedMailSubject"),
getFormattedMessage("deletedMailText",
new Object[] { dataBean.getName() }),
"forge-robot at labs.jboss.com");
+ }
} catch (Exception e) {
// Nothing to do here. No mail... well.
}
@@ -292,7 +300,7 @@
* @param dataBean Application to delete.
* @return True iff deleting was successfull.
*/
- synchronized boolean deleteByLead(ConDataBean dataBean) {
+ synchronized boolean deleteByLead(ConDataBean dataBean, String comment) {
String oldXml = dataBean.getXml();
try {
@@ -323,11 +331,19 @@
} finally {
// Sending the "you-are-reject" email no matter exception or not.
try {
- ForgeHelper.postMail(dataBean.getEmail(),
+ if (comment != null && comment.length() != 0) {
+ ForgeHelper.postMail(dataBean.getEmail(),
+ messages.getString("deletedMailSubject"),
+ getFormattedMessage("deletedMailTextWithComment",
+ new Object[] { dataBean.getName(), comment }),
+ "forge-robot at labs.jboss.com");
+ } else {
+ ForgeHelper.postMail(dataBean.getEmail(),
messages.getString("deletedMailSubject"),
getFormattedMessage("deletedMailText",
new Object[] { dataBean.getName() }),
"forge-robot at labs.jboss.com");
+ }
} catch (Exception e) {
// Nothing to do here. No mail... well.
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/faces-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/faces-config.xml 2006-10-23 21:25:30 UTC (rev 7041)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/faces-config.xml 2006-10-23 21:48:00 UTC (rev 7042)
@@ -23,9 +23,41 @@
<from-outcome>back</from-outcome>
<to-view-id>/repo-access/default/contributor/contributor.jsp</to-view-id>
</navigation-case>
+ <navigation-case>
+ <from-outcome>adminDelete</from-outcome>
+ <to-view-id>/repo-access/default/contributor/adminDelete.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>leadDelete</from-outcome>
+ <to-view-id>/repo-access/default/contributor/leadDelete.jsp</to-view-id>
+ </navigation-case>
</navigation-rule>
<navigation-rule>
+ <from-view-id>/repo-access/default/contributor/adminDelete.jsp</from-view-id>
+ <navigation-case>
+ <from-outcome>back</from-outcome>
+ <to-view-id>/repo-access/default/contributor/admin.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>admin</from-outcome>
+ <to-view-id>/repo-access/default/contributor/admin.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/repo-access/default/contributor/leadDelete.jsp</from-view-id>
+ <navigation-case>
+ <from-outcome>back</from-outcome>
+ <to-view-id>/repo-access/default/contributor/admin.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>admin</from-outcome>
+ <to-view-id>/repo-access/default/contributor/admin.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
<from-view-id>/repo-access/default/contributor/apply.jsp</from-view-id>
<navigation-case>
<from-outcome>back</from-outcome>
More information about the jboss-svn-commits
mailing list