[jboss-svn-commits] JBL Code SVN: r35489 - 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-12 04:26:20 -0400 (Tue, 12 Oct 2010)
New Revision: 35489

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 GA Code for project spaces

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-12 07:41:24 UTC (rev 35488)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/ProjectInfoManagerImpl.java	2010-10-12 08:26:20 UTC (rev 35489)
@@ -24,6 +24,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Iterator;
+import java.util.Map;
 
 import javax.xml.namespace.QName;
 
@@ -52,6 +53,8 @@
   public static final String EXCLUDED_SPACES_PROP_NAME = "jbossorg.navigation.excludedspaces";
 
   public static final String MAGNOLIA_SERVICES_URL_PROP_NAME = "jbossorg.navigation.magnoliaNavigationServiceURL";
+  
+  public static final String GA_CODE_PROP_NAME = "ga.code";
 
   /**
    * A cache for space navigations.<br>
@@ -126,6 +129,15 @@
     }
     return projectSpace.getDisplayName();
   }
+  
+  public static String getGACode(JiveContainer container, boolean examineParentContainers) {
+    JiveContainer projectSpace = container;
+    if (examineParentContainers) {
+      projectSpace = getProjectSpace(projectSpace);
+    }
+    Map<String, String> properties = projectSpace.getProperties();
+    return properties.get(GA_CODE_PROP_NAME);
+  }
 
   protected static JiveContainer getProjectSpace(JiveContainer c) {
     if (c.getParentContainer() == null) {

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-12 07:41:24 UTC (rev 35488)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/struts/ProjectInfoAction.java	2010-10-12 08:26:20 UTC (rev 35489)
@@ -82,38 +82,72 @@
     return SUCCESS;
   }
 
-  public static String isSpaceProject(int containerType, int containerID) {
+  /**
+   * Get container based on type and ID
+   * 
+   * @param containerType
+   * @param containerID
+   * @return container or null if not found
+   */
+  private static JiveContainer getContainer(int containerType, int containerID) {
     if (containerType > 0 && containerID > 0) {
       try {
-        JiveContainer container = JiveApplication.getEffectiveContext().getJiveContainerManager()
+        return 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 null;
+  }
+
+  /**
+   * Determine if space is project or not (e.g. wiki space is not project)
+   * 
+   * @param containerType
+   * @param containerID
+   * @return "true" or "false"
+   */
+  public static String isSpaceProject(int containerType, int containerID) {
+    JiveContainer container = getContainer(containerType, containerID);
+    if (container != null) {
+      return "" + ProjectInfoManagerImpl.isSpaceProject(container);
+    }
     return "false";
   }
 
+  /**
+   * Get Project ID for specified container
+   * 
+   * @param containerType
+   * @param containerID
+   * @return project ID like "hibernate"
+   */
   public static String getProjectID(int containerType, int containerID) {
-    if (containerType > 0 && containerID > 0) {
-      try {
-        JiveContainer container = JiveApplication.getEffectiveContext().getJiveContainerManager()
-            .getJiveContainer(containerType, containerID);
-        return ProjectInfoManagerImpl.getProjectID(container, true);
-      } catch (UnauthorizedException e) {
-        log.warn("Not authorized to get jive container");
-        return null;
-      } catch (NotFoundException nfe) {
-        log.warn(nfe);
-      }
+    JiveContainer container = getContainer(containerType, containerID);
+    if (container != null) {
+      return ProjectInfoManagerImpl.getProjectID(container, true);
     }
     return null;
   }
 
+  /**
+   * Get GA Code for specified container
+   * 
+   * @param containerType
+   * @param containerID
+   * @return GA Code like "UA-16109419-1"
+   */
+  public static String getGACode(int containerType, int containerID) {
+    JiveContainer container = getContainer(containerType, containerID);
+    if (container != null) {
+      return ProjectInfoManagerImpl.getProjectID(container, true);
+    }
+    return null;
+  }
+
   public String getData() {
     return data;
   }