svn commit: r1199374 - in /oodt/trunk/pcs/opsui/src/main: java/org/apache/oodt/pcs/opsui/BasePage.java java/org/apache/oodt/pcs/opsui/OpsuiApp.java webapp/META-INF/context.xml

[mattmann]

Author: mattmann
Date: Tue Nov  8 18:21:21 2011
New Revision: 1199374

URL: http://svn.apache.org/viewvc?rev=1199374&view=rev
Log:
- add in Ganglia link and flow through OODT-157

Modified:
    oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.java
    oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
    oodt/trunk/pcs/opsui/src/main/webapp/META-INF/context.xml

Modified: 
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.java?rev=1199374&r1=1199373&r2=1199374&view=diff
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.java 
(original)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.java 
Tue Nov  8 18:21:21 2011
@@ -45,7 +45,7 @@ public class BasePage extends WebPage {
        */
       @Override
       public void onClick() {
-        setResponsePage(HomePage.class);
+        setResponsePage(StatusPage.class);
       }
     });
     
@@ -85,6 +85,8 @@ public class BasePage extends WebPage {
       }
     });
     
+    add(new ExternalLink("ganglia_link", app.getGangliaUrl()));
+    
     add(new ExternalLink("contact_link", 
"mailto:"+((OpsuiApp)getApplication()).getEmailContactLink()));
   }
 

Modified: 
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java?rev=1199374&r1=1199373&r2=1199374&view=diff
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java 
(original)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java 
Tue Nov  8 18:21:21 2011
@@ -86,8 +86,6 @@ public class OpsuiApp extends WebApplica
     mount(workflowsPageMount);
     mount(workflowInstsPageMount);
   }
-  
-  
 
   /*
    * (non-Javadoc)
@@ -96,7 +94,7 @@ public class OpsuiApp extends WebApplica
    */
   @Override
   public Class<? extends Page> getHomePage() {
-    return HomePage.class;
+    return StatusPage.class;
   }
 
   public String getFmUrlStr() {
@@ -133,6 +131,11 @@ public class OpsuiApp extends WebApplica
         "org.apache.oodt.pcs.opsui.workflow.lifecycleFilePath"));
   }
 
+  public String getGangliaUrl() {
+    return PathUtils.replaceEnvVariables(getServletContext().getInitParameter(
+        "ganglia.url"));
+  }
+
   public List<String> getWorkflowInstStatues() {
     String[] statuses = getServletContext().getInitParameter(
         "org.apache.oodt.pcs.opsui.winst.statuses").split(",");
@@ -159,8 +162,9 @@ public class OpsuiApp extends WebApplica
   @Override
   public Session newSession(Request request, Response response) {
     FMBrowserSession session = new FMBrowserSession(request);
-    session.setStyle(getServletContext().getInitParameter("opsui.skin") != 
null ? 
-        getServletContext().getInitParameter("opsui.skin"):"classic");
+    session
+        .setStyle(getServletContext().getInitParameter("opsui.skin") != null ? 
getServletContext()
+            .getInitParameter("opsui.skin") : "classic");
     return session;
   }
 
@@ -188,7 +192,6 @@ public class OpsuiApp extends WebApplica
 
     mountSharedResource("/images/icon_arrow_up.gif", new ResourceReference(
         StatusPage.class, "icon_arrow_up.gif").getSharedResourceKey());
-    
 
     mountSharedResource("/images/rightcorner.gif", new ResourceReference(
         BasePage.class, "rightcorner.gif").getSharedResourceKey());
@@ -197,7 +200,7 @@ public class OpsuiApp extends WebApplica
     mountSharedResource("/images/selrightcorner.gif", new ResourceReference(
         BasePage.class, "selrightcorner.gif").getSharedResourceKey());
     mountSharedResource("/images/selleftcorner.gif", new ResourceReference(
-        BasePage.class, "selleftcorner.gif").getSharedResourceKey());    
+        BasePage.class, "selleftcorner.gif").getSharedResourceKey());
 
   }
 

Modified: oodt/trunk/pcs/opsui/src/main/webapp/META-INF/context.xml
URL: 
http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/webapp/META-INF/context.xml?rev=1199374&r1=1199373&r2=1199374&view=diff
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/webapp/META-INF/context.xml (original)
+++ oodt/trunk/pcs/opsui/src/main/webapp/META-INF/context.xml Tue Nov  8 
18:21:21 2011
@@ -40,7 +40,8 @@ the License.
            
        <Parameter name="org.apache.oodt.pcs.health.workflow.statuses.filePath"
            value="[PCS_HOME]/aux/pcs/pcs-workflow-statuses.xml"/>          
-           
+        
+       <Parameter name="ganglia.url" value="[GANGLIA_URL]"/>
        <Parameter name="contact.email" value="u...@oodt.apache.org"/>
        
        <Parameter name="opsui_skin" value="classic"/>