[jboss-svn-commits] JBL Code SVN: r9765 - in labs/jbosslabs/trunk/portal-extensions: forge-common/src/java/org/jboss/forge/common/projects and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Feb 26 10:49:28 EST 2007
Author: wrzep
Date: 2007-02-26 10:49:28 -0500 (Mon, 26 Feb 2007)
New Revision: 9765
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/PodcastPortlet.java
Log:
JBLAB-840
Further changes due to introduction of interfaces.
Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java 2007-02-26 15:05:42 UTC (rev 9764)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java 2007-02-26 15:49:28 UTC (rev 9765)
@@ -46,7 +46,7 @@
public static final String PROJECTS_SERVICE = "labs:service=projects";
- public Collection<Project> getProjects();
+ public Collection<? extends Project> getProjects();
public Collection<String> getProjectsIds();
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2007-02-26 15:05:42 UTC (rev 9764)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2007-02-26 15:49:28 UTC (rev 9765)
@@ -88,7 +88,6 @@
/**
* Project id --> Corresponding NEW project descriptor object
*/
- private Map<String, Project> newProjects;
private Map<String, ProjectRW> newProjectsRW;
/**
@@ -137,7 +136,6 @@
public ProjectsDescriptor(XmlInputFactory isf, String portalName) {
this.portalName = portalName;
projects = new LinkedHashMap<String, ProjectDescriptor>();
- newProjects = new LinkedHashMap<String, Project>();
newProjectsRW = new LinkedHashMap<String,ProjectRW>();
projectWithErrorsDescriptors = new HashSet<String>();
@@ -343,39 +341,6 @@
}
}
}
-
- private void unmarshallProject(String projectId, XmlInputFactory isf, DomToXmlTransformer xht, String portalName2, PropertiesMap adminProperties, JAXBContext projectJC) {
-
- ProjectDescriptor pd;
-
- try {
- pd = new ProjectDescriptor(projectId, isf, xht, opm,
- portalName, adminProperties);
- projects.put(projectId, pd);
-
- if (projectJC!=null) {
- try {
- Unmarshaller un = projectJC.createUnmarshaller();
- Project newProject = (Project)un.unmarshal(
- isf.getInputSource(projectId+"/" + ProjectsHelper.PROJECT_DESC));
- newProjects.put(projectId,newProject);
- log.info("Project "+projectId+" created.");
- } catch (Exception e) {
- log.warn("I could not create Project "+projectId+".",e);
- }
- }
-
- } catch (Exception e) {
- // In case of any exception, we just don't put the
- // project into the map. We only add its descriptor
- // to the set of projects with errors to monitor
- // any changes in it.
- projectWithErrorsDescriptors.add(projectId + "/"
- + ProjectsHelper.PROJECT_DESC);
-
- log.warn("Project " + projectId + " parse error.", e);
- }
- }
private void unmarshallProjectRW(String projectId, XmlInputFactory isf, DomToXmlTransformer xht, String portalName2, PropertiesMap adminProperties, JAXBContext projectRWJC) {
@@ -387,7 +352,7 @@
ProjectRW newProject = (ProjectRW)un.unmarshal(
isf.getInputSource(projectId+"/" + ProjectsHelper.PROJECT_DESC));
newProjectsRW.put(projectId,newProject);
- log.info("Project "+projectId+" (RW mode) created.");
+ log.info("Project "+projectId+" created.");
} catch (Exception e) {
log.warn("I could not create Project "+projectId+" (RW mode).",e);
}
@@ -846,10 +811,6 @@
return ret;
}
- public Map<String,Project> getNewProjects() {
- return newProjects;
- }
-
public Map<String,ProjectRW> getNewProjectsRW() {
return newProjectsRW;
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java 2007-02-26 15:05:42 UTC (rev 9764)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java 2007-02-26 15:49:28 UTC (rev 9765)
@@ -86,9 +86,9 @@
@Inject
private ContentManager cm;
- public Collection<Project> getProjects() {
+ public Collection<? extends Project> getProjects() {
Projects projectsClass = ProjectsHelper.getProjects(Constants.LABS_PORTAL);
- Map<String,Project> projects = projectsClass.getProjectsDescriptor().getNewProjects();
+ Map<String,? extends Project> projects = projectsClass.getProjectsDescriptor().getNewProjectsRW();
return projects.values();
}
@@ -320,7 +320,7 @@
Collection<String> projectsIds = new ArrayList<String>();
- Collection<Project> projects = getProjects();
+ Collection<? extends Project> projects = getProjects();
for (Project project : projects) {
projectsIds.add(project.getId());
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/PodcastPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/PodcastPortlet.java 2007-02-26 15:05:42 UTC (rev 9764)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/PodcastPortlet.java 2007-02-26 15:49:28 UTC (rev 9765)
@@ -28,6 +28,7 @@
import javax.portlet.PortletRequestDispatcher;
import org.jboss.forge.common.ForgeHelper;
+import org.jboss.forge.common.projects.ProjectsHelper;
import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
@@ -66,8 +67,9 @@
// Displaying the JSP
request.setAttribute(PortalJsp.CTX_REQUEST, context);
+ //debug
+ System.out.println("PODCAST " + ProjectsHelper.getSelectedProjectId(request));
-
PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher(
ForgeHelper.createRepoAccessPath(portalName, jspPath));
rd.include(request, response);
More information about the jboss-svn-commits
mailing list