[jboss-svn-commits] JBL Code SVN: r8840 - in labs/jbosslabs/trunk/portal-extensions: forge-prj-info/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
Fri Jan 12 12:53:23 EST 2007
Author: wrzep
Date: 2007-01-12 12:53:17 -0500 (Fri, 12 Jan 2007)
New Revision: 8840
Added:
labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java
Removed:
labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/ProjectsServerBean.java
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/IfNotEmptyTag.java
labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/faces-config.xml
labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/portlet.xml
Log:
JBLAB-780
Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/IfNotEmptyTag.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/IfNotEmptyTag.java 2007-01-12 16:55:23 UTC (rev 8839)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/IfNotEmptyTag.java 2007-01-12 17:53:17 UTC (rev 8840)
@@ -38,8 +38,6 @@
public int doStartTag() throws JspException {
- System.out.println("IfNotEmptyTag | value=" + value);
-
if ((value == null) ||
((value instanceof String) && (((String) value).length() == 0)) ||
((value instanceof Collection) && (((Collection)value).size() == 0))
@@ -51,8 +49,6 @@
public int doEndTag() {
- System.out.println("DO END TAG ifn");
-
return EVAL_PAGE;
}
Added: labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java 2007-01-12 16:55:23 UTC (rev 8839)
+++ labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java 2007-01-12 17:53:17 UTC (rev 8840)
@@ -0,0 +1,149 @@
+/*
+ * 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 javax.faces.context.FacesContext;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+
+import org.jboss.forge.common.ForgeHelper;
+import org.jboss.forge.common.projects.ProjectsHelper;
+import org.jboss.forge.common.projects.project.Project;
+import org.jboss.forge.common.soa.projects.ProjectsService;
+import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanProxyExt;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.portlet.JBossRenderRequest;
+import org.jboss.shotoku.ContentManager;
+import org.jboss.shotoku.Node;
+import org.jboss.shotoku.aop.Inject;
+import org.jboss.shotoku.exceptions.RepositoryException;
+import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
+
+public class ProjectInfoBean {
+
+ private Project project;
+ private String portalName;
+ private String description = "";
+ private String username = null;
+ private String projectURL;
+
+ private static Logger log = Logger.getLogger(ProjectInfoBean.class);
+
+ @Inject
+ private ContentManager cm;
+
+ public ProjectInfoBean() {
+
+ Object request = FacesContext.getCurrentInstance().getExternalContext().getRequest();
+ if(request instanceof JBossRenderRequest) {
+
+ JBossRenderRequest req = (JBossRenderRequest) request;
+ String projectId = ProjectsHelper.getSelectedProjectId(req);
+
+ project = getProjectById(projectId);
+ portalName = ForgeHelper.getPortalName(req);
+ projectURL = "/portal/" + project.getId();
+
+ if (req.getUser() != null) {
+ username = req.getUser().getUserName();
+ }
+ }
+ }
+
+ private static Project getProjectById(String projectId) {
+
+ ProjectsService service = getService();
+
+ return service.getProjectByName(projectId);
+ }
+
+ private static ProjectsService getService() {
+
+ ProjectsService service = null;
+
+ try {
+ MBeanServer server = MBeanServerLocator.locate();
+
+ service = (ProjectsService) MBeanProxyExt.create(
+ ProjectsService.class,
+ ProjectsService.PROJECTS_SERVICE,
+ server);
+
+
+ } catch (MalformedObjectNameException e) {
+ log.warn("Unable to get ProjectsService", e);
+ }
+
+ return service;
+ }
+
+ public Project getProject() {
+ return project;
+ }
+
+ public void setProject(Project project) {
+ this.project = project;
+ }
+
+ public String getDescription() {
+
+ String descriptionFreezoneFilePath = project.getDescription();
+
+ if (descriptionFreezoneFilePath != null
+ && descriptionFreezoneFilePath.trim().length() > 0) {
+ String absolutePathToInfo = "/" + portalName + "/"
+ + ProjectsHelper.MEMBERS_DIR + "/" + project.getId() + "/"
+ + ProjectsHelper.FREEZONE_DIR + "/"
+ + descriptionFreezoneFilePath.trim();
+
+ try {
+ Node node = cm.getNode(absolutePathToInfo);
+ description = node.getContent();
+ } catch (RepositoryException e) {
+ log.warn("Error getting node.", e);
+ } catch (ResourceDoesNotExist e) {
+ log.warn("Resource given in description tag of " +
+ project.getId() +
+ "'s project.xml descriptor is not available.");
+ }
+ }
+
+ return description;
+ }
+
+ public void setDescription(String description) { }
+
+ public String getProjectURL() {
+ return projectURL;
+ }
+
+ public void setProjectURL(String projectURL) {}
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {}
+
+
+}
Deleted: labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/ProjectsServerBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/ProjectsServerBean.java 2007-01-12 16:55:23 UTC (rev 8839)
+++ labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/ProjectsServerBean.java 2007-01-12 17:53:17 UTC (rev 8840)
@@ -1,90 +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 javax.faces.context.FacesContext;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-
-import org.jboss.forge.common.projects.ProjectsHelper;
-import org.jboss.forge.common.projects.project.Project;
-import org.jboss.forge.common.soa.projects.ProjectsService;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.portlet.JBossRenderRequest;
-
-public class ProjectsServerBean {
-
- private Project project;
-
- public ProjectsServerBean() {
-
- Object request = FacesContext.getCurrentInstance().getExternalContext().getRequest();
- if(request instanceof JBossRenderRequest) {
-
- JBossRenderRequest req = (JBossRenderRequest) request;
- String projectId = ProjectsHelper.getSelectedProjectId(req);
- project = getProjectById(projectId);
- }
-
- System.out.println("### PROJECT: " + project + " " + (project==null?"x":project.getId()));
- }
-
- private static Project getProjectById(String projectId) {
-
- ProjectsService service = getService();
-
- return service.getProjectByName(projectId);
- }
-
- private static ProjectsService getService() {
-
- ProjectsService service = null;
-
- try {
- MBeanServer server = MBeanServerLocator.locate();
-
- service = (ProjectsService) MBeanProxyExt.create(
- ProjectsService.class,
- ProjectsService.PROJECTS_SERVICE,
- server);
-
-
- } catch (MalformedObjectNameException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- return service;
- }
-
- public Project getProject() {
- return project;
- }
-
- public void setProject(Project project) {
- this.project = project;
- }
-
-
-
-}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/faces-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/faces-config.xml 2007-01-12 16:55:23 UTC (rev 8839)
+++ labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/faces-config.xml 2007-01-12 17:53:17 UTC (rev 8840)
@@ -8,14 +8,8 @@
<managed-bean>
<managed-bean-name>p</managed-bean-name>
- <managed-bean-class>org.jboss.forge.projects.info.ProjectsServerBean</managed-bean-class>
+ <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-name>x</managed-bean-name>
- <managed-bean-class>org.jboss.forge.projects.info.ProjectsServerBean</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
-
</faces-config>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/portlet.xml 2007-01-12 16:55:23 UTC (rev 8839)
+++ labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/web/WEB-INF/portlet.xml 2007-01-12 17:53:17 UTC (rev 8840)
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
+ <!--
<portlet>
<description>Forge project info portlet</description>
<portlet-name>PrjInfoPortlet</portlet-name>
@@ -15,8 +16,8 @@
<title>Project information</title>
</portlet-info>
</portlet>
-
-<!--
+-->
+
<portlet>
<description>Forge project info portlet</description>
<portlet-name>PrjInfoPortlet</portlet-name>
@@ -24,7 +25,7 @@
<portlet-class>org.apache.myfaces.portlet.MyFacesGenericPortlet</portlet-class>
<init-param>
<name>default-view</name>
- <value>/repo-access/default/prj-info/info-jsf.jsp</value>
+ <value>/repo-access/default/prj-info/info.jsp</value>
</init-param>
<expiration-cache>0</expiration-cache>
<supports>
@@ -35,6 +36,6 @@
<title>Project information</title>
</portlet-info>
</portlet>
- -->
+
</portlet-app>
More information about the jboss-svn-commits
mailing list