[jboss-svn-commits] JBL Code SVN: r12288 - in labs/jbosslabs/trunk/portal-extensions: forge-common/src/java/org/jboss/forge/common/ejb3 and 3 other directories.

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

Author: wrzep
Date: 2007-06-01 13:44:34 -0400 (Fri, 01 Jun 2007)
New Revision: 12288

Modified:
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/kosmos/jars/kosmos-portlet.jar
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectFactoryService.java
   labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectFactoryServiceImpl.java
   labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/portlet.xml
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/pages/PagesAdminTools.java
Log:
JBLAB-870 (uniqueWindowId, done)
JBLAB-868

-Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/kosmos/jars/kosmos-portlet.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectFactoryService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectFactoryService.java	2007-06-01 17:14:38 UTC (rev 12287)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectFactoryService.java	2007-06-01 17:44:34 UTC (rev 12288)
@@ -24,6 +24,7 @@
 
 import java.util.Map;
 
+import org.jboss.forge.common.projects.portlets.ProjectsPortletPreference;
 import org.jboss.forge.common.projects.project.IssueTracker;
 import org.jboss.forge.common.projects.project.Link;
 import org.jboss.forge.common.projects.project.Page;
@@ -56,6 +57,10 @@
     
     public Link createLink(String name, String value);
     
+    // TODO move to separate factory
+    public ProjectsPortletPreference createProjectsPortletPreference();
+    public ProjectsPortletPreference createProjectsPortletPreference(String name, String defaultValue);
+    
     //	 Life cycle methods
 	
     public void start () throws Exception;

Modified: labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectFactoryServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectFactoryServiceImpl.java	2007-06-01 17:14:38 UTC (rev 12287)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectFactoryServiceImpl.java	2007-06-01 17:44:34 UTC (rev 12288)
@@ -31,6 +31,7 @@
 import org.jboss.annotation.ejb.Service;
 
 
+import org.jboss.forge.common.projects.portlets.ProjectsPortletPreference;
 import org.jboss.forge.common.projects.project.IssueTracker;
 import org.jboss.forge.common.projects.project.Link;
 import org.jboss.forge.common.projects.project.Page;
@@ -43,7 +44,6 @@
 import org.jboss.forge.common.projects.project.rw.PortletRW;
 import org.jboss.forge.common.projects.project.rw.PreferenceRW;
 import org.jboss.forge.common.projects.project.rw.ProjectRW;
-import org.jboss.forge.common.projects.proxies.ObjectRWProxy;
 import org.jboss.forge.common.projects.proxies.SyncProxy;
 
 import org.jboss.forge.common.ejb3.ProjectFactoryService;
@@ -147,6 +147,22 @@
 		return page;
 	}
 
+	public ProjectsPortletPreference createProjectsPortletPreference() {
+		
+		ProjectsPortletPreference p = new ProjectsPortletPreference();
+		
+		return p;
+	}
+
+	public ProjectsPortletPreference createProjectsPortletPreference(String name, String defaultValue) {
+		
+		ProjectsPortletPreference p = createProjectsPortletPreference();
+		p.setName(name);
+		p.setDefault(defaultValue);
+		
+		return p;
+	}
+	
     
     // Lifecycle methods
         
@@ -159,5 +175,4 @@
 		
 		log.info("ProjectFactory service stopped");
 	}
-	
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/portlet.xml	2007-06-01 17:14:38 UTC (rev 12287)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/portlet.xml	2007-06-01 17:44:34 UTC (rev 12288)
@@ -106,7 +106,7 @@
     	</init-param>
     	<init-param>
       		<name>jsp.page</name>
-      		<value>kosmos/svn_monitoring_commiter_details.jsp</value>
+      		<value>kosmos/svn_monitoring_committer_details.jsp</value>
     	</init-param>
         <supports>
             <mime-type>text/html</mime-type>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/pages/PagesAdminTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/pages/PagesAdminTools.java	2007-06-01 17:14:38 UTC (rev 12287)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/pages/PagesAdminTools.java	2007-06-01 17:44:34 UTC (rev 12288)
@@ -198,6 +198,10 @@
 			}
 		}
 		
+		// add "windowUniqueId" property
+		ret.add(new PreferenceBean(factory.createPreference("windowUniqueId", ""),
+								   factory.createProjectsPortletPreference("windowUniqueId", "")));
+		
 		return ret;
 	}