[jboss-svn-commits] JBL Code SVN: r35479 - in labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo: struts and 1 other directory.

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

Author: lkrzyzanek
Date: 2010-10-11 11:04:27 -0400 (Mon, 11 Oct 2010)
New Revision: 35479

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/ProjectInfoManagerImpl.java
   labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/struts/ProjectInfoAction.java
Log:
Added isSpaceProject helper method

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/ProjectInfoManagerImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/ProjectInfoManagerImpl.java	2010-10-11 15:01:31 UTC (rev 35478)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/ProjectInfoManagerImpl.java	2010-10-11 15:04:27 UTC (rev 35479)
@@ -49,6 +49,10 @@
 
   public static final String TAB_TO_HIGHLIGHT = "community";
 
+  public static final String EXCLUDED_SPACES_PROP_NAME = "jbossorg.navigation.excludedspaces";
+
+  public static final String MAGNOLIA_SERVICES_URL_PROP_NAME = "jbossorg.navigation.magnoliaNavigationServiceURL";
+
   /**
    * A cache for space navigations.<br>
    * Key is Space ID in DB (Jive Container ID)<br>
@@ -81,6 +85,20 @@
     };
   };
 
+  public static boolean isSpaceProject(JiveContainer container) {
+    if (container == null) {
+      return false;
+    }
+    if (container.getParentContainer() == null) {
+      return false;
+    }
+    String excludedSpaces = JiveGlobals.getJiveProperty(EXCLUDED_SPACES_PROP_NAME);
+    if (excludedSpaces != null && excludedSpaces.indexOf(container.getDisplayName()) != -1) {
+      return false;
+    }
+    return true;
+  }
+
   @Override
   public String getSpaceNavigation(JiveContainer container) {
     JiveContainer projectSpace = getProjectSpace(container);
@@ -126,8 +144,8 @@
 
   protected MagnoliaWebService getProjectService() throws MalformedURLException {
     if (projectService == null) {
-      final String url = JiveGlobals.getJiveProperty("jbossorg.magnoliaNavigationServiceURL",
-          "http://10.16.93.208:8080/magnoliaPublic-projects-1.0.0/MagnoliaWebService?wsdl");
+      final String url = JiveGlobals.getJiveProperty(MAGNOLIA_SERVICES_URL_PROP_NAME,
+          "http://www.jboss.org/magnoliaPublic-projects-1.0.0/MagnoliaWebService?wsdl");
 
       MagnoliaWebServiceBeanService serviceWrapper = new MagnoliaWebServiceBeanService(new URL(url), new QName(
           "http://ws.services.magnolia.community.jboss.org/", "MagnoliaWebServiceBeanService"));

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/struts/ProjectInfoAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/struts/ProjectInfoAction.java	2010-10-11 15:01:31 UTC (rev 35478)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/struts/ProjectInfoAction.java	2010-10-11 15:04:27 UTC (rev 35479)
@@ -22,9 +22,13 @@
 package org.jboss.labs.sbs.plugin.projectinfo.struts;
 
 import org.jboss.labs.sbs.plugin.projectinfo.ProjectInfoManager;
+import org.jboss.labs.sbs.plugin.projectinfo.ProjectInfoManagerImpl;
 
+import com.jivesoftware.base.UnauthorizedException;
 import com.jivesoftware.community.JiveContainer;
+import com.jivesoftware.community.NotFoundException;
 import com.jivesoftware.community.action.JiveActionSupport;
+import com.jivesoftware.community.lifecycle.JiveApplication;
 
 /**
  * Action for project info
@@ -78,6 +82,22 @@
     return SUCCESS;
   }
 
+  public static String isSpaceProject(int containerType, int containerID) {
+    if (containerType > 0 && containerID > 0) {
+      try {
+        JiveContainer container = JiveApplication.getEffectiveContext().getJiveContainerManager()
+            .getJiveContainer(containerType, containerID);
+        return "" + ProjectInfoManagerImpl.isSpaceProject(container);
+      } catch (UnauthorizedException e) {
+        log.warn("Not authorized to get jive container");
+        return "false";
+      } catch (NotFoundException nfe) {
+        log.warn(nfe);
+      }
+    }
+    return "false";
+  }
+
   public String getData() {
     return data;
   }