[jboss-svn-commits] JBL Code SVN: r9771 - in labs/jbosslabs/trunk/portal-extensions: forge-portlets/src/java/org/jboss/forge/podcast and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: wrzep
Date: 2007-02-26 16:09:58 -0500 (Mon, 26 Feb 2007)
New Revision: 9771

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
   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/projects/info/ProjectInfoBean.java
Log:
JBLAB-840
null selected project id fix.
-Pawel


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 19:04:22 UTC (rev 9770)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java	2007-02-26 21:09:58 UTC (rev 9771)
@@ -319,8 +319,7 @@
             }
         }
         
-        try {
-            //projectJC = JAXBContext.newInstance("org.jboss.forge.common.projects.project");
+        try {           
             projectRWJC = JAXBContext.newInstance("org.jboss.forge.common.projects.project.rw");
         } catch (JAXBException e) {
             log.warn("I could not create JAXBContext.", e);
@@ -336,7 +335,6 @@
 
                 String projectId = XmlTools.unmarshallText(n);
                                
-                //unmarshallProject(projectId, isf, xht, portalName, adminProperties, projectJC);
                 unmarshallProjectRW(projectId, isf, xht, portalName, adminProperties, projectRWJC);
             }
         }
@@ -344,7 +342,12 @@
 	
 	 private void unmarshallProjectRW(String projectId, XmlInputFactory isf, DomToXmlTransformer xht, String portalName2, PropertiesMap adminProperties, JAXBContext projectRWJC) {
 		 	
+		 ProjectDescriptor pd;
+	    	
  	 	try {
+ 	 		pd = new ProjectDescriptor(projectId, isf, xht, opm,
+ 	 											portalName, adminProperties);
+ 	 		projects.put(projectId, pd);
                     
            if (projectRWJC!=null) {
                try {

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 19:04:22 UTC (rev 9770)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/PodcastPortlet.java	2007-02-26 21:09:58 UTC (rev 9771)
@@ -67,9 +67,6 @@
         // 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);

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-26 19:04:22 UTC (rev 9770)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java	2007-02-26 21:09:58 UTC (rev 9771)
@@ -60,14 +60,9 @@
         		JBossRenderRequest req = (JBossRenderRequest) request;
         		String projectId = ProjectsHelper.getSelectedProjectId(req);
         		
-        		projectId = "shotoku"; //DEBUG
-        		
         		project = getProjectById(projectId);
         		portalName = ForgeHelper.getPortalName(req);
         		
-        		System.out.println("PROJECT ID " + ProjectsHelper.getSelectedProjectId(req)
-        				+ " object: " + getProjectById(ProjectsHelper.getSelectedProjectId(req)));
-        		
     			projectURL = "/portal/" + project.getId();
     			
     			if (req.getUser() != null) {