[jboss-svn-commits] JBL Code SVN: r9518 - in labs/jbosslabs/trunk/portal-extensions/forge-portlets: src/java/org/jboss/forge/projects/info and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 15 05:26:40 EST 2007
Author: wrzep
Date: 2007-02-15 05:26:39 -0500 (Thu, 15 Feb 2007)
New Revision: 9518
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-portlets/maven.xml
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoAccessBean.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java
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
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/faces-config.xml
Log:
JBLAB-838
base prj info portlet should work fine now.
-Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/maven.xml 2007-02-15 09:10:20 UTC (rev 9517)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/maven.xml 2007-02-15 10:26:39 UTC (rev 9518)
@@ -11,9 +11,7 @@
</goal>
<goal name="build">
-<!--
<attainGoal name="prj-war-build" />
--->
</goal>
<goal name="deploy">
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoAccessBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoAccessBean.java 2007-02-15 09:10:20 UTC (rev 9517)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoAccessBean.java 2007-02-15 10:26:39 UTC (rev 9518)
@@ -33,11 +33,9 @@
public boolean isProjectAdminLogged() {
- return true; //DEBUG
+ System.out.println("PAL");
- /*
- FacesTools.isProjectAdminLogged();
- */
+ return FacesTools.isProjectAdminLogged();
}
public boolean isUserLogged() {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java 2007-02-15 09:10:20 UTC (rev 9517)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java 2007-02-15 10:26:39 UTC (rev 9518)
@@ -43,8 +43,6 @@
private String username = null;
private String projectURL;
- private static String previousProjectId = "default";
-
private static Logger log = Logger.getLogger(ProjectInfoBean.class);
@Inject
@@ -66,23 +64,9 @@
if (req.getUser() != null) {
username = req.getUser().getUserName();
}
-
- if (ProjectInfoBean.previousProjectId != projectId) {
-
- resetSessionBean(projectId);
- }
}
}
- private static void resetSessionBean(String projectId) {
-
- FacesContext fc = FacesContext.getCurrentInstance();
- fc.getApplication().createValueBinding("#{pedit}").setValue(fc, null );
- System.out.println("Reset session bean! " + projectId);
-
- previousProjectId = projectId;
- }
-
private static Project getProjectById(String projectId) {
ProjectsService service = ProjectsHelper.getProjectsService();
@@ -90,8 +74,6 @@
return service.getProjectByName(projectId);
}
-
-
public Project getProject() {
return project;
}
Modified: 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-02-15 09:10:20 UTC (rev 9517)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoConstants.java 2007-02-15 10:26:39 UTC (rev 9518)
@@ -23,11 +23,9 @@
import org.jboss.forge.common.projects.project.BuildType;
import org.jboss.forge.common.projects.project.DocumentationType;
-import org.jboss.forge.common.projects.project.ForumType;
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.SupportType;
/**
* @author Pawel Wrzeszcz (pawel . wrzeszcz [at] jboss . com)
@@ -47,8 +45,6 @@
public static final IssueTrackerType DEFAULT_ISSUE_TRACKER_TYPE
= IssueTrackerType.JIRA;
public static final BuildType DEFAULT_BUILD_TYPE = BuildType.CRUISE_CONTROL;
- public static final SupportType DEFAULT_SUPPORT_TYPE = SupportType.SUPPORT;
- public static final ForumType DEFAULT_FORUM_TYPE = ForumType.USER;
public static final DocumentationType DEFAULT_DOCUMENTATION_TYPE
= DocumentationType.MANUAL;
Modified: 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-02-15 09:10:20 UTC (rev 9517)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoEditBean.java 2007-02-15 10:26:39 UTC (rev 9518)
@@ -28,14 +28,12 @@
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.ForumType;
import org.jboss.forge.common.projects.project.IssueTracker;
import org.jboss.forge.common.projects.project.IssueTrackerType;
import org.jboss.forge.common.projects.project.MonitorType;
import org.jboss.forge.common.projects.project.Project;
import org.jboss.forge.common.projects.project.RepoMonitor;
import org.jboss.forge.common.projects.project.RepoType;
-import org.jboss.forge.common.projects.project.SupportType;
public class ProjectInfoEditBean {
@@ -68,9 +66,9 @@
ProjectInfoConstants.DEFAULT_BUILD_TYPE;
public ProjectInfoEditBean() {
-
+ /*
project = ProjectInfoTools.getProjectByName(FacesTools.getSelectedProjectId());
-
+
IssueTracker it = (IssueTracker) ProjectInfoTools.getFirst(project.getIssueTrackers());
if (it != null) {
issueTrackerURL = it.getValue();
@@ -101,15 +99,16 @@
Map<ForumType,String> forumsMap = ProjectInfoTools.getForumsMap(project);
devForumURL = forumsMap.get(ForumType.DEV);
userForumURL = forumsMap.get(ForumType.USER);
-
+
documentation = ProjectInfoTools.getAllDocumentation(project);
+ */
}
/* Business methods */
public String applyChanges() {
- ProjectInfoTools.applyProjectChanges(this);
+ //ProjectInfoTools.applyProjectChanges(this);
FacesTools.addMessage("Your changes have been saved");
Modified: 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-02-15 09:10:20 UTC (rev 9517)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTools.java 2007-02-15 10:26:39 UTC (rev 9518)
@@ -32,21 +32,18 @@
import org.jboss.forge.common.projects.ProjectsHelper;
import org.jboss.forge.common.projects.project.Documentation;
import org.jboss.forge.common.projects.project.DocumentationType;
-import org.jboss.forge.common.projects.project.Forum;
-import org.jboss.forge.common.projects.project.ForumType;
import org.jboss.forge.common.projects.project.IssueTracker;
import org.jboss.forge.common.projects.project.IssueTrackerType;
import org.jboss.forge.common.projects.project.MonitorType;
import org.jboss.forge.common.projects.project.Project;
import org.jboss.forge.common.projects.project.RepoMonitor;
import org.jboss.forge.common.projects.project.RepoType;
-import org.jboss.forge.common.projects.project.Repository;
-import org.jboss.forge.common.projects.project.SupportService;
-import org.jboss.forge.common.projects.project.SupportType;
+
public class ProjectInfoTools {
-
+
+ /*
private static ProjectsService projectsService = null;
public static void applyProjectChanges(ProjectInfoEditBean bean) {
@@ -66,10 +63,11 @@
setDocumentation(project, bean.getDocumentation());
projectsService.persistProject(project);
+
}
-
+ */
/* get */
-
+/*
public static Project getProjectByName(String projectId) {
if (projectsService == null) {
@@ -165,6 +163,7 @@
return list.get(0);
}
+ */
/* set */
// TODO methods below will change
@@ -186,7 +185,7 @@
//TODO project.setIssueTrackers(list);
}
-
+ /*
private static void setForums(Project project, String devForumURL, String userForumURL) {
List<Forum> forumsList = new ArrayList<Forum>();
@@ -277,5 +276,5 @@
private ProjectInfoTools() { }
-
+ */
}
Modified: 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-02-15 09:10:20 UTC (rev 9517)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTypesBean.java 2007-02-15 10:26:39 UTC (rev 9518)
@@ -29,11 +29,9 @@
import org.jboss.forge.common.projects.project.BuildType;
import org.jboss.forge.common.projects.project.DocumentationType;
-import org.jboss.forge.common.projects.project.ForumType;
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.SupportType;
/**
* @author Pawel Wrzeszcz (pawel . wrzeszcz [at] jboss . com)
@@ -43,7 +41,8 @@
public List<SelectItem> getAllProjects() {
- return ProjectInfoTools.getAllProjects();
+ // return ProjectInfoTools.getAllProjects();
+ return null;
}
public Map<String,RepoType> getRepoTypes() {
@@ -90,7 +89,7 @@
}
return typesMap;
}
-
+ /*
public Map<String,SupportType> getSupportServiceTypes() {
Map<String,SupportType> typesMap = new HashMap<String,SupportType>();
@@ -117,4 +116,5 @@
}
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-02-15 09:10:20 UTC (rev 9517)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/faces-config.xml 2007-02-15 10:26:39 UTC (rev 9518)
@@ -37,7 +37,7 @@
<managed-bean>
<managed-bean-name>pedit</managed-bean-name>
<managed-bean-class>org.jboss.forge.projects.info.ProjectInfoEditBean</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
+ <managed-bean-scope>request</managed-bean-scope>
</managed-bean>
<managed-bean>
More information about the jboss-svn-commits
mailing list