Author: mattmann
Date: Fri Nov 18 03:36:18 2011
New Revision: 1203476
URL: http://svn.apache.org/viewvc?rev=1203476&view=rev
Log:
- flow through properties for PCS trace widget: OODT-157
Modified:
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/ProductBrowserPage.java
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/pedigree/TraceableProductBrowser.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/OpsuiApp.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java?rev=1203476&r1=1203475&r2=1203476&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
Fri Nov 18 03:36:18 2011
@@ -141,12 +141,12 @@ public class OpsuiApp extends WebApplica
return PathUtils.replaceEnvVariables(getServletContext().getInitParameter(
"ganglia.url"));
}
-
- public String getSkin(){
+
+ public String getSkin() {
return getServletContext().getInitParameter("opsui.skin");
}
-
- public String getHomePageClass(){
+
+ public String getHomePageClass() {
return getServletContext().getInitParameter("opsui.homepage");
}
@@ -166,6 +166,24 @@ public class OpsuiApp extends WebApplica
"org.apache.oodt.pcs.opsui.winst.metFields.filePath"));
}
+ public boolean isEnabledTraceNotCatProducts() {
+ return Boolean.valueOf(getServletContext().getInitParameter(
+ "org.apache.oodt.pcs.trace.enableNotCat"));
+ }
+
+ public List<String> getTraceExcludedProductTypeList() {
+ String[] types = getServletContext().getInitParameter(
+ "org.apache.oodt.pcs.trace.excludeList").split(",");
+ List<String> excludes = new Vector<String>();
+
+ for (String type : types) {
+ excludes.add(type);
+ }
+
+ return excludes;
+
+ }
+
/*
* (non-Javadoc)
*
@@ -216,13 +234,11 @@ public class OpsuiApp extends WebApplica
mountSharedResource("/images/selleftcorner.gif", new ResourceReference(
BasePage.class, "selleftcorner.gif").getSharedResourceKey());
-
- mountSharedResource("/images/open.gif", new ResourceReference(
- Trace.class, "open.gif").getSharedResourceKey());
+ mountSharedResource("/images/open.gif", new ResourceReference(Trace.class,
+ "open.gif").getSharedResourceKey());
mountSharedResource("/images/closed.gif", new ResourceReference(
Trace.class, "closed.gif").getSharedResourceKey());
-
}
}
Modified:
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/ProductBrowserPage.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/ProductBrowserPage.java?rev=1203476&r1=1203475&r2=1203476&view=diff
==============================================================================
---
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/ProductBrowserPage.java
(original)
+++
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/ProductBrowserPage.java
Fri Nov 18 03:36:18 2011
@@ -39,6 +39,7 @@ public class ProductBrowserPage extends
super(parameters);
add(new TraceableProductBrowser("prod_browser_component",
app.getFmUrlStr(),
- parameters.getString("id")));
+ parameters.getString("id"), app.isEnabledTraceNotCatProducts(),
+ app.getTraceExcludedProductTypeList()));
}
}
Modified:
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/pedigree/TraceableProductBrowser.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/pedigree/TraceableProductBrowser.java?rev=1203476&r1=1203475&r2=1203476&view=diff
==============================================================================
---
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/pedigree/TraceableProductBrowser.java
(original)
+++
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/pedigree/TraceableProductBrowser.java
Fri Nov 18 03:36:18 2011
@@ -19,6 +19,7 @@ package org.apache.oodt.pcs.opsui.pedigr
//JDK imports
import java.util.Collections;
+import java.util.List;
//OODT imports
import org.apache.oodt.cas.filemgr.structs.Product;
@@ -50,7 +51,7 @@ public class TraceableProductBrowser ext
* @param productId
*/
public TraceableProductBrowser(String componentId, final String fmUrlStr,
- String productId) {
+ String productId, final boolean enableNotCat, final List<String>
excludes) {
super(componentId, fmUrlStr, productId);
FileManagerConn fm = new FileManagerConn(fmUrlStr);
final Product product = fm.safeGetProductById(productId);
@@ -64,8 +65,8 @@ public class TraceableProductBrowser ext
*/
@Override
public void onSubmit() {
- Trace tracer = new Trace("pedigree", fmUrlStr, true,
- Collections.EMPTY_LIST, product);
+ Trace tracer = new Trace("pedigree", fmUrlStr, enableNotCat,
+ excludes, product);
tracer.setVisible(true);
getParent().getParent().replace(tracer);
setVisible(false);
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=1203476&r1=1203475&r2=1203476&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 Fri Nov 18
03:36:18 2011
@@ -40,6 +40,12 @@ the License.
<Parameter name="org.apache.oodt.pcs.health.workflow.statuses.filePath"
value="[PCS_HOME]/aux/pcs/pcs-workflow-statuses.xml"/>
+
+ <Parameter name="org.apache.oodt.pcs.trace.excludeList"
+ value=""/>
+
+ <Parameter name="org.apache.oodt.pcs.trace.enableNotCat"
+ value="true"/>
<Parameter name="ganglia.url" value="[GANGLIA_URL]"/>
<Parameter name="contact.email" value="[email protected]"/>
