[jboss-svn-commits] JBL Code SVN: r10279 - in labs/jbosslabs/trunk/portal-extensions/forge-portlets/src: java/org/jboss/forge/projects/admin and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Mar 16 14:33:32 EDT 2007
Author: wrzep
Date: 2007-03-16 14:33:32 -0400 (Fri, 16 Mar 2007)
New Revision: 10279
Added:
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminConstants.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminTools.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectInfoAdminBean.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectInfoTypesBean.java
Removed:
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoConstants.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoEditBean.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTools.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTypesBean.java
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/faces-config.xml
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/portlet.xml
Log:
JBLAB-849
moving prj info edit to admin package
Added: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminConstants.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminConstants.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminConstants.java 2007-03-16 18:33:32 UTC (rev 10279)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.forge.projects.admin;
+
+import org.jboss.forge.common.projects.project.BuildType;
+import org.jboss.forge.common.projects.project.DocumentationType;
+import org.jboss.forge.common.projects.project.IssueTrackerType;
+import org.jboss.forge.common.projects.project.MonitorType;
+import org.jboss.forge.common.projects.project.RepoType;
+import org.jboss.forge.common.projects.project.rw.BuildTypeRW;
+import org.jboss.forge.common.projects.project.rw.DocumentationTypeRW;
+import org.jboss.forge.common.projects.project.rw.IssueTrackerTypeRW;
+import org.jboss.forge.common.projects.project.rw.MonitorTypeRW;
+import org.jboss.forge.common.projects.project.rw.RepoTypeRW;
+
+/**
+ * @author Pawel Wrzeszcz (pawel . wrzeszcz [at] jboss . com)
+ */
+
+public class ProjectAdminConstants {
+
+ public static final String EDIT_ACTION = "edit";
+ public static final String APPLY_ACTION = "back";
+ public static final String BACK_ACTION = "back";
+ public static final String ERR_ACTION = "";
+ public static final String ADD_REMOVE_ACTION = "";
+
+ public static final RepoType DEFAULT_REPO_TYPE = RepoTypeRW.SVN;
+ public static final MonitorType DEFAULT_REPO_MONITOR_TYPE
+ = MonitorTypeRW.FISHEYE;
+ public static final IssueTrackerType DEFAULT_ISSUE_TRACKER_TYPE
+ = IssueTrackerTypeRW.JIRA;
+ public static final BuildType DEFAULT_BUILD_TYPE = BuildTypeRW.CRUISE_CONTROL;
+ public static final DocumentationType DEFAULT_DOCUMENTATION_TYPE
+ = DocumentationTypeRW.MANUAL;
+
+ public static final String DEL_REPO_PARAM = "delRepoId";
+ public static final String DEL_REPO_MONITOR_PARAM = "delRepoMonitorId";
+ public static final String DEL_ISSUE_TRACKER_PARAM = "delIssueTrackerId";
+ public static final String DEL_BUILD_RESULTS_PARAM = "delBuildResultsId";
+ public static final String DEL_FORUM_PARAM = "delForumId";
+ public static final String DEL_DOC_PARAM = "delDocumentationId";
+
+
+ private ProjectAdminConstants() {};
+}
Added: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminTools.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminTools.java 2007-03-16 18:33:32 UTC (rev 10279)
@@ -0,0 +1,139 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.forge.projects.admin;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.model.SelectItem;
+import javax.management.MalformedObjectNameException;
+
+import org.jboss.forge.common.ejb3.LabsServices;
+import org.jboss.forge.common.ejb3.ProjectsService;
+import org.jboss.forge.common.ejb3.ProjectsServiceRW;
+import org.jboss.forge.common.projects.project.Documentation;
+import org.jboss.forge.common.projects.project.DocumentationType;
+import org.jboss.forge.common.projects.project.Project;
+import org.jboss.forge.common.exceptions.ServiceRetrievalException;
+import org.jboss.logging.Logger;
+
+
+public class ProjectAdminTools {
+
+ private static Logger log = Logger.getLogger(ProjectAdminTools.class);
+
+ private static ProjectsService projectsService = null;
+ private static ProjectsServiceRW projectsServiceRW = null;
+
+ static {
+ try {
+ projectsServiceRW = LabsServices.getProjectsServiceRW();
+ projectsService = LabsServices.getProjectsService();
+ } catch (MalformedObjectNameException e) {
+ log.warn("Cannot get ProjectsServiceRW");
+ } catch (ServiceRetrievalException e) {
+ log.warn("Cannot get ProjectsServiceRW");
+ }
+ }
+
+ public static Project getProjectByName(String projectId) {
+
+ return projectsServiceRW.getProjectByNameRW(projectId);
+ }
+
+ public static Project getProjectRWByName(String projectId) {
+
+ return projectsServiceRW.getProjectByNameRW(projectId);
+ }
+
+ public static Collection<?> getAllProjectIds() {
+
+ return projectsService.getProjectsIds();
+ }
+
+ public static List<SelectItem> getAllProjects() {
+
+ List<SelectItem> projects = new ArrayList<SelectItem>();
+
+ List<String> ids = new ArrayList<String>(projectsService.getProjectsIds());
+ ids.remove("default");
+ ids.add("(none)");
+
+ Collections.sort(ids);
+
+ for (String projectId : ids) {
+
+ projects.add(new SelectItem(projectId,projectId));
+ }
+
+ return projects;
+ }
+
+ public static void saveProject(Project project) {
+
+ projectsServiceRW.persistProject(project);
+ }
+
+ //////////////////////////////
+
+ public static List<Documentation> getAllDocumentation(Project prj) {
+
+ Map<DocumentationType,Documentation> docMap = getDocumentationMap(prj);
+ List<Documentation> ret = new ArrayList<Documentation>();
+ /*
+ for (DocumentationType dt : DocumentationType.values()) {
+
+ Documentation d = docMap.get(dt);
+ if (d != null) {
+ ret.add(d);
+ } else {
+ d = new Documentation();
+ d.setType(dt);
+ ret.add(d);
+ }
+ }
+ */
+ return ret;
+ }
+
+ public static Map<DocumentationType, Documentation> getDocumentationMap(Project project) {
+
+ return null;
+
+ /*
+ Map<DocumentationType, Documentation> map =
+ new EnumMap<DocumentationType, Documentation>(DocumentationType.class);
+
+ List<Documentation> docList = project.getDocumentation();
+ for (Documentation d : docList) {
+ map.put(d.getType(), d);
+ }
+
+ return map; */
+ }
+
+ private ProjectAdminTools() { }
+
+}
Added: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectInfoAdminBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectInfoAdminBean.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectInfoAdminBean.java 2007-03-16 18:33:32 UTC (rev 10279)
@@ -0,0 +1,154 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.forge.projects.admin;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.jboss.forge.common.FacesTools;
+import org.jboss.forge.common.projects.project.BuildResult;
+import org.jboss.forge.common.projects.project.BuildType;
+import org.jboss.forge.common.projects.project.Documentation;
+import org.jboss.forge.common.projects.project.Project;
+
+
+public class ProjectInfoAdminBean implements Serializable {
+
+ private static final long serialVersionUID = 6261935821363811158L;
+
+ private Project project;
+
+ private List<String> jems;
+ //private List<Documentation> documentation;
+
+ //private String newBuildResultsURL;
+ //private BuildType newBuildResultsType =
+ // ProjectInfoConstants.DEFAULT_BUILD_TYPE;
+
+
+ public ProjectInfoAdminBean() {
+
+ project = ProjectAdminTools.getProjectByName(FacesTools.getSelectedProjectId());
+ //TODO get projectId by parameter
+
+ jems = project.getJems();
+
+ //documentation = ProjectInfoTools.getAllDocumentation(project);
+ }
+
+ /* Business methods */
+
+ public String applyChanges() {
+
+ List<String> projectJems = project.getJems();
+ projectJems.removeAll(ProjectAdminTools.getAllProjectIds());
+
+ jems.remove("(none)");
+ projectJems.addAll(jems);
+
+ ProjectAdminTools.saveProject(project);
+
+ FacesTools.addMessage("Your changes have been saved");
+
+ return ProjectAdminConstants.APPLY_ACTION;
+ }
+
+ /*
+ public String addBuildResults() {
+
+ if ((newBuildResultsURL == null) || (newBuildResultsURL == "")) {
+ FacesTools.addMessage("Please provide Continuous Integration Tool URL.");
+ return ProjectInfoConstants.ERR_ACTION;
+ }
+
+ BuildResult rm = new BuildResult();
+ rm.setType(newBuildResultsType);
+ rm.setValue(newBuildResultsURL);
+
+ project.getBuildResults().add(rm);
+ newBuildResultsURL = "";
+ newBuildResultsType = ProjectInfoConstants.DEFAULT_BUILD_TYPE;
+
+ return ProjectInfoConstants.ADD_REMOVE_ACTION;
+ }
+
+ public String delBuildResults() {
+
+ String delBuildResultId = FacesTools.getRequestParameter(
+ ProjectInfoConstants.DEL_BUILD_RESULTS_PARAM);
+
+ List<? extends BuildResult> buildResults = project.getBuildResults();
+ for (BuildResult br : buildResults) {
+
+ if (delBuildResultId.equals(br.getValue())) {
+ buildResults.remove(br);
+ return ProjectInfoConstants.ADD_REMOVE_ACTION;
+ }
+ }
+
+ FacesTools.addMessage("Unknown error");
+ return ProjectInfoConstants.ERR_ACTION;
+ }*/
+
+ /* Getters and setters */
+
+ public Project getProject() {
+ return project;
+ }
+
+ public void setProject(Project project) {
+ this.project = project;
+ }
+
+ public List<String> getJems() {
+ return jems;
+ }
+
+ public void setJems(List<String> jems) {
+ this.jems = jems;
+ }
+
+ /*
+ public List<Documentation> getDocumentation() {
+ return documentation;
+ }
+
+ public void setDocumentation(List<Documentation> documentation) {
+ this.documentation = documentation;
+ }
+
+ public String getNewBuildResultsURL() {
+ return newBuildResultsURL;
+ }
+
+ public void setNewBuildResultsURL(String newBuildResultsURL) {
+ this.newBuildResultsURL = newBuildResultsURL;
+ }
+
+ public BuildType getNewBuildResultsType() {
+ return newBuildResultsType;
+ }
+
+ public void setNewBuildResultsType(BuildType newBuildType) {
+ this.newBuildResultsType = newBuildType;
+ } */
+}
Added: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectInfoTypesBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectInfoTypesBean.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectInfoTypesBean.java 2007-03-16 18:33:32 UTC (rev 10279)
@@ -0,0 +1,102 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.forge.projects.admin;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.faces.model.SelectItem;
+
+import org.jboss.forge.common.projects.project.rw.BuildTypeRW;
+import org.jboss.forge.common.projects.project.rw.IssueTrackerTypeRW;
+import org.jboss.forge.common.projects.project.rw.MonitorTypeRW;
+import org.jboss.forge.common.projects.project.rw.RepoTypeRW;
+
+/**
+ * @author Pawel Wrzeszcz (pawel . wrzeszcz [at] jboss . com)
+ */
+
+public class ProjectInfoTypesBean {
+
+ public List<SelectItem> getAllProjects() {
+
+ return ProjectAdminTools.getAllProjects();
+ }
+
+ public List<SelectItem> getIssueTrackerTypes() {
+
+ List<SelectItem> list = new ArrayList<SelectItem>();
+
+ list.add(new SelectItem(IssueTrackerTypeRW.JIRA,
+ IssueTrackerTypeRW.JIRA.toString()));
+ list.add(new SelectItem(IssueTrackerTypeRW.BUGZILLA,
+ IssueTrackerTypeRW.BUGZILLA.toString()));
+
+ return list;
+ }
+
+ public List<SelectItem> getRepoTypes() {
+
+ List<SelectItem> list = new ArrayList<SelectItem>();
+
+ list.add(new SelectItem(RepoTypeRW.SVN,
+ RepoTypeRW.SVN.toString()));
+ list.add(new SelectItem(RepoTypeRW.CVS,
+ RepoTypeRW.CVS.toString()));
+
+ return list;
+ }
+
+ public List<SelectItem> getRepoMonitorTypes() {
+
+ List<SelectItem> list = new ArrayList<SelectItem>();
+
+ list.add(new SelectItem(MonitorTypeRW.VIEWVC,
+ MonitorTypeRW.VIEWVC.toString()));
+ list.add(new SelectItem(MonitorTypeRW.FISHEYE,
+ MonitorTypeRW.FISHEYE.toString()));
+
+ return list;
+ }
+
+ public List<SelectItem> getBuildResultsTypes() {
+
+ List<SelectItem> list = new ArrayList<SelectItem>();
+
+ list.add(new SelectItem(BuildTypeRW.CRUISE_CONTROL,
+ BuildTypeRW.CRUISE_CONTROL.toString()));
+ list.add(new SelectItem(BuildTypeRW.CONTINUUM,
+ BuildTypeRW.CONTINUUM.toString()));
+
+ return list;
+ }
+
+ /*
+ public Map<String,DocumentationType> getDocumentationTypes() {
+
+ Map<String,DocumentationType> typesMap = new HashMap<String,DocumentationType>();
+ for (DocumentationType ft : DocumentationType.values()) {
+ typesMap.put(ft.value(), ft);
+ }
+ return typesMap;
+ }
+ */
+}
Deleted: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoConstants.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoConstants.java 2007-03-16 18:30:44 UTC (rev 10278)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoConstants.java 2007-03-16 18:33:32 UTC (rev 10279)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.forge.projects.info;
-
-import org.jboss.forge.common.projects.project.BuildType;
-import org.jboss.forge.common.projects.project.DocumentationType;
-import org.jboss.forge.common.projects.project.IssueTrackerType;
-import org.jboss.forge.common.projects.project.MonitorType;
-import org.jboss.forge.common.projects.project.RepoType;
-import org.jboss.forge.common.projects.project.rw.BuildTypeRW;
-import org.jboss.forge.common.projects.project.rw.DocumentationTypeRW;
-import org.jboss.forge.common.projects.project.rw.IssueTrackerTypeRW;
-import org.jboss.forge.common.projects.project.rw.MonitorTypeRW;
-import org.jboss.forge.common.projects.project.rw.RepoTypeRW;
-
-/**
- * @author Pawel Wrzeszcz (pawel . wrzeszcz [at] jboss . com)
- */
-
-public class ProjectInfoConstants {
-
- public static final String EDIT_ACTION = "edit";
- public static final String APPLY_ACTION = "back";
- public static final String BACK_ACTION = "back";
- public static final String ERR_ACTION = "";
- public static final String ADD_REMOVE_ACTION = "";
-
- public static final RepoType DEFAULT_REPO_TYPE = RepoTypeRW.SVN;
- public static final MonitorType DEFAULT_REPO_MONITOR_TYPE
- = MonitorTypeRW.FISHEYE;
- public static final IssueTrackerType DEFAULT_ISSUE_TRACKER_TYPE
- = IssueTrackerTypeRW.JIRA;
- public static final BuildType DEFAULT_BUILD_TYPE = BuildTypeRW.CRUISE_CONTROL;
- public static final DocumentationType DEFAULT_DOCUMENTATION_TYPE
- = DocumentationTypeRW.MANUAL;
-
- public static final String DEL_REPO_PARAM = "delRepoId";
- public static final String DEL_REPO_MONITOR_PARAM = "delRepoMonitorId";
- public static final String DEL_ISSUE_TRACKER_PARAM = "delIssueTrackerId";
- public static final String DEL_BUILD_RESULTS_PARAM = "delBuildResultsId";
- public static final String DEL_FORUM_PARAM = "delForumId";
- public static final String DEL_DOC_PARAM = "delDocumentationId";
-
-
- private ProjectInfoConstants() {};
-}
Deleted: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoEditBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoEditBean.java 2007-03-16 18:30:44 UTC (rev 10278)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoEditBean.java 2007-03-16 18:33:32 UTC (rev 10279)
@@ -1,154 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.forge.projects.info;
-
-import java.io.Serializable;
-import java.util.List;
-
-import org.jboss.forge.common.FacesTools;
-import org.jboss.forge.common.projects.project.BuildResult;
-import org.jboss.forge.common.projects.project.BuildType;
-import org.jboss.forge.common.projects.project.Documentation;
-import org.jboss.forge.common.projects.project.Project;
-
-
-public class ProjectInfoEditBean implements Serializable {
-
- private static final long serialVersionUID = 6261935821363811158L;
-
- private Project project;
-
- private List<String> jems;
- //private List<Documentation> documentation;
-
- //private String newBuildResultsURL;
- //private BuildType newBuildResultsType =
- // ProjectInfoConstants.DEFAULT_BUILD_TYPE;
-
-
- public ProjectInfoEditBean() {
-
- project = ProjectInfoTools.getProjectByName(FacesTools.getSelectedProjectId());
- //TODO get projectId by parameter
-
- jems = project.getJems();
-
- //documentation = ProjectInfoTools.getAllDocumentation(project);
- }
-
- /* Business methods */
-
- public String applyChanges() {
-
- List<String> projectJems = project.getJems();
- projectJems.removeAll(ProjectInfoTools.getAllProjectIds());
-
- jems.remove("(none)");
- projectJems.addAll(jems);
-
- ProjectInfoTools.saveProject(project);
-
- FacesTools.addMessage("Your changes have been saved");
-
- return ProjectInfoConstants.APPLY_ACTION;
- }
-
- /*
- public String addBuildResults() {
-
- if ((newBuildResultsURL == null) || (newBuildResultsURL == "")) {
- FacesTools.addMessage("Please provide Continuous Integration Tool URL.");
- return ProjectInfoConstants.ERR_ACTION;
- }
-
- BuildResult rm = new BuildResult();
- rm.setType(newBuildResultsType);
- rm.setValue(newBuildResultsURL);
-
- project.getBuildResults().add(rm);
- newBuildResultsURL = "";
- newBuildResultsType = ProjectInfoConstants.DEFAULT_BUILD_TYPE;
-
- return ProjectInfoConstants.ADD_REMOVE_ACTION;
- }
-
- public String delBuildResults() {
-
- String delBuildResultId = FacesTools.getRequestParameter(
- ProjectInfoConstants.DEL_BUILD_RESULTS_PARAM);
-
- List<? extends BuildResult> buildResults = project.getBuildResults();
- for (BuildResult br : buildResults) {
-
- if (delBuildResultId.equals(br.getValue())) {
- buildResults.remove(br);
- return ProjectInfoConstants.ADD_REMOVE_ACTION;
- }
- }
-
- FacesTools.addMessage("Unknown error");
- return ProjectInfoConstants.ERR_ACTION;
- }*/
-
- /* Getters and setters */
-
- public Project getProject() {
- return project;
- }
-
- public void setProject(Project project) {
- this.project = project;
- }
-
- public List<String> getJems() {
- return jems;
- }
-
- public void setJems(List<String> jems) {
- this.jems = jems;
- }
-
- /*
- public List<Documentation> getDocumentation() {
- return documentation;
- }
-
- public void setDocumentation(List<Documentation> documentation) {
- this.documentation = documentation;
- }
-
- public String getNewBuildResultsURL() {
- return newBuildResultsURL;
- }
-
- public void setNewBuildResultsURL(String newBuildResultsURL) {
- this.newBuildResultsURL = newBuildResultsURL;
- }
-
- public BuildType getNewBuildResultsType() {
- return newBuildResultsType;
- }
-
- public void setNewBuildResultsType(BuildType newBuildType) {
- this.newBuildResultsType = newBuildType;
- } */
-}
Deleted: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTools.java 2007-03-16 18:30:44 UTC (rev 10278)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTools.java 2007-03-16 18:33:32 UTC (rev 10279)
@@ -1,139 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.forge.projects.info;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.faces.model.SelectItem;
-import javax.management.MalformedObjectNameException;
-
-import org.jboss.forge.common.ejb3.LabsServices;
-import org.jboss.forge.common.ejb3.ProjectsService;
-import org.jboss.forge.common.ejb3.ProjectsServiceRW;
-import org.jboss.forge.common.projects.project.Documentation;
-import org.jboss.forge.common.projects.project.DocumentationType;
-import org.jboss.forge.common.projects.project.Project;
-import org.jboss.forge.common.exceptions.ServiceRetrievalException;
-import org.jboss.logging.Logger;
-
-
-public class ProjectInfoTools {
-
- private static Logger log = Logger.getLogger(ProjectInfoTools.class);
-
- private static ProjectsService projectsService = null;
- private static ProjectsServiceRW projectsServiceRW = null;
-
- static {
- try {
- projectsServiceRW = LabsServices.getProjectsServiceRW();
- projectsService = LabsServices.getProjectsService();
- } catch (MalformedObjectNameException e) {
- log.warn("Cannot get ProjectsServiceRW");
- } catch (ServiceRetrievalException e) {
- log.warn("Cannot get ProjectsServiceRW");
- }
- }
-
- public static Project getProjectByName(String projectId) {
-
- return projectsServiceRW.getProjectByNameRW(projectId);
- }
-
- public static Project getProjectRWByName(String projectId) {
-
- return projectsServiceRW.getProjectByNameRW(projectId);
- }
-
- public static Collection<?> getAllProjectIds() {
-
- return projectsService.getProjectsIds();
- }
-
- public static List<SelectItem> getAllProjects() {
-
- List<SelectItem> projects = new ArrayList<SelectItem>();
-
- List<String> ids = new ArrayList<String>(projectsService.getProjectsIds());
- ids.remove("default");
- ids.add("(none)");
-
- Collections.sort(ids);
-
- for (String projectId : ids) {
-
- projects.add(new SelectItem(projectId,projectId));
- }
-
- return projects;
- }
-
- public static void saveProject(Project project) {
-
- projectsServiceRW.persistProject(project);
- }
-
- //////////////////////////////
-
- public static List<Documentation> getAllDocumentation(Project prj) {
-
- Map<DocumentationType,Documentation> docMap = getDocumentationMap(prj);
- List<Documentation> ret = new ArrayList<Documentation>();
- /*
- for (DocumentationType dt : DocumentationType.values()) {
-
- Documentation d = docMap.get(dt);
- if (d != null) {
- ret.add(d);
- } else {
- d = new Documentation();
- d.setType(dt);
- ret.add(d);
- }
- }
- */
- return ret;
- }
-
- public static Map<DocumentationType, Documentation> getDocumentationMap(Project project) {
-
- return null;
-
- /*
- Map<DocumentationType, Documentation> map =
- new EnumMap<DocumentationType, Documentation>(DocumentationType.class);
-
- List<Documentation> docList = project.getDocumentation();
- for (Documentation d : docList) {
- map.put(d.getType(), d);
- }
-
- return map; */
- }
-
- private ProjectInfoTools() { }
-
-}
Deleted: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTypesBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTypesBean.java 2007-03-16 18:30:44 UTC (rev 10278)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTypesBean.java 2007-03-16 18:33:32 UTC (rev 10279)
@@ -1,102 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.forge.projects.info;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.faces.model.SelectItem;
-
-import org.jboss.forge.common.projects.project.rw.BuildTypeRW;
-import org.jboss.forge.common.projects.project.rw.IssueTrackerTypeRW;
-import org.jboss.forge.common.projects.project.rw.MonitorTypeRW;
-import org.jboss.forge.common.projects.project.rw.RepoTypeRW;
-
-/**
- * @author Pawel Wrzeszcz (pawel . wrzeszcz [at] jboss . com)
- */
-
-public class ProjectInfoTypesBean {
-
- public List<SelectItem> getAllProjects() {
-
- return ProjectInfoTools.getAllProjects();
- }
-
- public List<SelectItem> getIssueTrackerTypes() {
-
- List<SelectItem> list = new ArrayList<SelectItem>();
-
- list.add(new SelectItem(IssueTrackerTypeRW.JIRA,
- IssueTrackerTypeRW.JIRA.toString()));
- list.add(new SelectItem(IssueTrackerTypeRW.BUGZILLA,
- IssueTrackerTypeRW.BUGZILLA.toString()));
-
- return list;
- }
-
- public List<SelectItem> getRepoTypes() {
-
- List<SelectItem> list = new ArrayList<SelectItem>();
-
- list.add(new SelectItem(RepoTypeRW.SVN,
- RepoTypeRW.SVN.toString()));
- list.add(new SelectItem(RepoTypeRW.CVS,
- RepoTypeRW.CVS.toString()));
-
- return list;
- }
-
- public List<SelectItem> getRepoMonitorTypes() {
-
- List<SelectItem> list = new ArrayList<SelectItem>();
-
- list.add(new SelectItem(MonitorTypeRW.VIEWVC,
- MonitorTypeRW.VIEWVC.toString()));
- list.add(new SelectItem(MonitorTypeRW.FISHEYE,
- MonitorTypeRW.FISHEYE.toString()));
-
- return list;
- }
-
- public List<SelectItem> getBuildResultsTypes() {
-
- List<SelectItem> list = new ArrayList<SelectItem>();
-
- list.add(new SelectItem(BuildTypeRW.CRUISE_CONTROL,
- BuildTypeRW.CRUISE_CONTROL.toString()));
- list.add(new SelectItem(BuildTypeRW.CONTINUUM,
- BuildTypeRW.CONTINUUM.toString()));
-
- return list;
- }
-
- /*
- public Map<String,DocumentationType> getDocumentationTypes() {
-
- Map<String,DocumentationType> typesMap = new HashMap<String,DocumentationType>();
- for (DocumentationType ft : DocumentationType.values()) {
- typesMap.put(ft.value(), ft);
- }
- return typesMap;
- }
- */
-}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/faces-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/faces-config.xml 2007-03-16 18:30:44 UTC (rev 10278)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/faces-config.xml 2007-03-16 18:33:32 UTC (rev 10279)
@@ -6,46 +6,63 @@
<faces-config>
+ <!-- Admin portlet -->
+
+ <!-- info edit -->
<navigation-rule>
- <from-view-id>/repo-access/default/prj-info/info.jsp</from-view-id>
+ <from-view-id>*</from-view-id>
<navigation-case>
- <from-outcome>edit</from-outcome>
- <to-view-id>/repo-access/default/prj-info/info-edit.jsp</to-view-id>
+ <from-outcome>edit-info</from-outcome>
+ <to-view-id>/repo-access/default/prj-admin/info-edit.jsp</to-view-id>
</navigation-case>
</navigation-rule>
-
+ <navigation-rule>
+ <from-view-id>*</from-view-id>
+ <navigation-case>
+ <from-outcome>edit-pages</from-outcome>
+ <to-view-id>/repo-access/default/prj-admin/pages-edit.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <navigation-rule>
+ <from-view-id>*</from-view-id>
+ <navigation-case>
+ <from-outcome>edit-nav</from-outcome>
+ <to-view-id>/repo-access/default/prj-admin/nav-edit.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
<navigation-rule>
- <from-view-id>/repo-access/default/prj-info/info-edit.jsp</from-view-id>
+ <from-view-id>*</from-view-id>
<navigation-case>
- <from-outcome>back</from-outcome>
- <to-view-id>/repo-access/default/prj-info/info.jsp</to-view-id>
+ <from-outcome>save</from-outcome>
+ <to-view-id>/repo-access/default/prj-admin/admin.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<managed-bean>
+ <managed-bean-name>pedit</managed-bean-name>
+ <managed-bean-class>org.jboss.forge.projects.admin.ProjectInfoAdminBean</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
+ <managed-bean-name>types</managed-bean-name>
+ <managed-bean-class>org.jboss.forge.projects.admin.ProjectInfoTypesBean</managed-bean-class>
+ <managed-bean-scope>application</managed-bean-scope>
+ </managed-bean>
+
+ <!-- Project info porlet / common beans -->
+
+ <managed-bean>
<managed-bean-name>p</managed-bean-name>
<managed-bean-class>org.jboss.forge.projects.info.ProjectInfoBean</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
-
- <managed-bean>
+ <managed-bean>
<managed-bean-name>projectInfoAccessBean</managed-bean-name>
<managed-bean-class>org.jboss.forge.projects.info.ProjectInfoAccessBean</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
- <managed-bean>
- <managed-bean-name>pedit</managed-bean-name>
- <managed-bean-class>org.jboss.forge.projects.info.ProjectInfoEditBean</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
-
- <managed-bean>
- <managed-bean-name>types</managed-bean-name>
- <managed-bean-class>org.jboss.forge.projects.info.ProjectInfoTypesBean</managed-bean-class>
- <managed-bean-scope>application</managed-bean-scope>
- </managed-bean>
-
+ <!-- Converters -->
<converter>
<converter-id>enumConverter</converter-id>
<converter-class>org.jboss.forge.common.EnumTypeConverter</converter-class>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/portlet.xml 2007-03-16 18:30:44 UTC (rev 10278)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/portlet.xml 2007-03-16 18:33:32 UTC (rev 10279)
@@ -99,7 +99,7 @@
<portlet-class>org.apache.myfaces.portlet.MyFacesGenericPortlet</portlet-class>
<init-param>
<name>default-view</name>
- <value>/repo-access/default/prj-admin/admin.jsp</value>
+ <value>/repo-access/default/prj-admin/info-edit.jsp</value>
</init-param>
<expiration-cache>0</expiration-cache>
<supports>
More information about the jboss-svn-commits
mailing list