You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2011/11/07 04:51:08 UTC
svn commit: r1198618 - in /oodt/trunk/pcs/opsui/src/main:
java/org/apache/oodt/pcs/opsui/ java/org/apache/oodt/pcs/opsui/status/
webapp/META-INF/
Author: mattmann
Date: Mon Nov 7 03:51:07 2011
New Revision: 1198618
URL: http://svn.apache.org/viewvc?rev=1198618&view=rev
Log:
- progress towards OODT-157: PCS Operator User Interface web application
- integrated WMonitor component
- almost done with Status page
Added:
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowConditionViewerPage.html (with props)
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowConditionViewerPage.java
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowCrumbedPage.java
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowInstanceViewerPage.html (with props)
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowInstanceViewerPage.java
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowTaskViewerPage.html (with props)
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowTaskViewerPage.java
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowViewerPage.html (with props)
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowViewerPage.java
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowsViewerPage.html (with props)
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowsViewerPage.java
Modified:
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.html
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/java/org/apache/oodt/pcs/opsui/ProductBrowserPage.java
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/ProductMetBrowserPage.java
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/ProductRefBrowserPage.java
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/TypeBrowserPage.java
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/TypesPage.java
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.html
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.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.html
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.html?rev=1198618&r1=1198617&r2=1198618&view=diff
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.html (original)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.html Mon Nov 7 03:51:07 2011
@@ -85,7 +85,7 @@
onMouseOver="menuSelected(this)"
onMouseOut="menuNotSelected(this)">
- <a href="#" id="wmonitor_link" class="blackLink">
+ <a href="#" wicket:id="wmonitor_link" id="wmonitor_link" class="blackLink">
<span style="text-align:center;color:white;font-weight:bold;">
Workflow Monitor
</span>
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=1198618&r1=1198617&r2=1198618&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 Mon Nov 7 03:51:07 2011
@@ -35,7 +35,10 @@ import org.apache.wicket.markup.html.lin
*/
public class BasePage extends WebPage {
- public BasePage(PageParameters parameters){
+ protected OpsuiApp app;
+
+ public BasePage(PageParameters parameters){
+ this.app = (OpsuiApp)getApplication();
add(new Link("home_link"){
/* (non-Javadoc)
* @see org.apache.wicket.markup.html.link.Link#onClick()
@@ -68,6 +71,20 @@ public class BasePage extends WebPage {
}
});
+ add(new Link("wmonitor_link"){
+ /* (non-Javadoc)
+ * @see org.apache.wicket.markup.html.link.Link#onClick()
+ */
+ @Override
+ public void onClick() {
+ PageParameters params = new PageParameters();
+ params.add("status", "ALL");
+ params.add("pageNum", "1");
+ setResponsePage(WorkflowInstanceViewerPage.class, params);
+
+ }
+ });
+
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=1198618&r1=1198617&r2=1198618&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 Mon Nov 7 03:51:07 2011
@@ -18,6 +18,10 @@
package org.apache.oodt.pcs.opsui;
//OODT imports
+import java.util.Arrays;
+import java.util.List;
+import java.util.Vector;
+
import org.apache.oodt.cas.metadata.util.PathUtils;
import org.apache.oodt.cas.webcomponents.filemgr.FMBrowserSession;
import org.apache.oodt.cas.webcomponents.workflow.instance.WorkflowInstancesViewer;
@@ -45,19 +49,40 @@ public class OpsuiApp extends WebApplica
public OpsuiApp() {
MixedParamUrlCodingStrategy types = new MixedParamUrlCodingStrategy(
"types", TypesPage.class, new String[] {});
- mount(types);
MixedParamUrlCodingStrategy typeBrowser = new MixedParamUrlCodingStrategy(
"type", TypeBrowserPage.class, new String[] { "name", "pageNum" });
- mount(typeBrowser);
MixedParamUrlCodingStrategy prodBrowser = new MixedParamUrlCodingStrategy(
"product", ProductBrowserPage.class, new String[] { "id" });
- mount(prodBrowser);
MixedParamUrlCodingStrategy pcsStatus = new MixedParamUrlCodingStrategy(
"status", StatusPage.class, new String[] {});
+
+ MixedParamUrlCodingStrategy taskPageMount = new MixedParamUrlCodingStrategy(
+ "task", WorkflowTaskViewerPage.class, new String[] { "id" });
+ MixedParamUrlCodingStrategy condPageMount = new MixedParamUrlCodingStrategy(
+ "condition", WorkflowConditionViewerPage.class, new String[] { "id" });
+
+ MixedParamUrlCodingStrategy workflowPageMount = new MixedParamUrlCodingStrategy(
+ "workflow", WorkflowViewerPage.class, new String[] { "id" });
+
+ MixedParamUrlCodingStrategy workflowsPageMount = new MixedParamUrlCodingStrategy(
+ "workflows", WorkflowsViewerPage.class, new String[] {});
+
+ MixedParamUrlCodingStrategy workflowInstsPageMount = new MixedParamUrlCodingStrategy(
+ "instances", WorkflowInstanceViewerPage.class, new String[] { "status",
+ "pageNum" });
+
mount(pcsStatus);
+ mount(types);
+ mount(typeBrowser);
+ mount(prodBrowser);
+ mount(taskPageMount);
+ mount(condPageMount);
+ mount(workflowPageMount);
+ mount(workflowsPageMount);
+ mount(workflowInstsPageMount);
}
/*
@@ -99,6 +124,27 @@ public class OpsuiApp extends WebApplica
"org.apache.oodt.pcs.health.workflow.statuses.filePath"));
}
+ public String getWorkflowLifecycleFilePath() {
+ return PathUtils.replaceEnvVariables(getServletContext().getInitParameter(
+ "org.apache.oodt.pcs.opsui.workflow.lifecycleFilePath"));
+ }
+
+ public List<String> getWorkflowInstStatues() {
+ String[] statuses = getServletContext().getInitParameter(
+ "org.apache.oodt.pcs.opsui.winst.statuses").split(",");
+ List<String> statusList = new Vector<String>();
+ for (String status : statuses) {
+ statusList.add(status.trim());
+ }
+ statusList.add("ALL");
+ return statusList;
+ }
+
+ public String getWorkflowInstMetFieldsFilePath() {
+ return PathUtils.replaceEnvVariables(getServletContext().getInitParameter(
+ "org.apache.oodt.pcs.opsui.winst.metFields.filePath"));
+ }
+
/*
* (non-Javadoc)
*
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=1198618&r1=1198617&r2=1198618&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 Mon Nov 7 03:51:07 2011
@@ -38,7 +38,7 @@ public class ProductBrowserPage extends
public ProductBrowserPage(PageParameters parameters){
super(parameters);
add(new ProductBrowser("prod_browser_component",
- ((OpsuiApp)getApplication()).getFmUrlStr(),
+ app.getFmUrlStr(),
parameters.getString("id")));
}
}
Modified: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/ProductMetBrowserPage.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/ProductMetBrowserPage.java?rev=1198618&r1=1198617&r2=1198618&view=diff
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/ProductMetBrowserPage.java (original)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/ProductMetBrowserPage.java Mon Nov 7 03:51:07 2011
@@ -36,7 +36,7 @@ public class ProductMetBrowserPage exten
public ProductMetBrowserPage(PageParameters parameters){
super(parameters);
- add(new MetadataBrowser("met_browser_component", ((OpsuiApp)getApplication()).getFmUrlStr(),
+ add(new MetadataBrowser("met_browser_component", app.getFmUrlStr(),
parameters.getString("id")));
}
Modified: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/ProductRefBrowserPage.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/ProductRefBrowserPage.java?rev=1198618&r1=1198617&r2=1198618&view=diff
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/ProductRefBrowserPage.java (original)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/ProductRefBrowserPage.java Mon Nov 7 03:51:07 2011
@@ -38,7 +38,7 @@ public class ProductRefBrowserPage exten
public ProductRefBrowserPage(PageParameters parameters){
super(parameters);
add(new ProductRefsBrowser("refs_component",
- ((OpsuiApp)getApplication()).getFmUrlStr(),
+ app.getFmUrlStr(),
parameters.getString("id")));
}
Modified: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/TypeBrowserPage.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/TypeBrowserPage.java?rev=1198618&r1=1198617&r2=1198618&view=diff
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/TypeBrowserPage.java (original)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/TypeBrowserPage.java Mon Nov 7 03:51:07 2011
@@ -38,7 +38,7 @@ public class TypeBrowserPage extends Bas
public TypeBrowserPage(PageParameters parameters){
super(parameters);
- add(new TypeBrowser("type_browser_component", ((OpsuiApp)getApplication()).getFmUrlStr(),
+ add(new TypeBrowser("type_browser_component", app.getFmUrlStr(),
parameters.getString("name"), parameters.getInt("pageNum", 1),
TypeBrowserPage.class, ProductBrowserPage.class, ProductRefBrowserPage.class,
ProductMetBrowserPage.class));
Modified: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/TypesPage.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/TypesPage.java?rev=1198618&r1=1198617&r2=1198618&view=diff
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/TypesPage.java (original)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/TypesPage.java Mon Nov 7 03:51:07 2011
@@ -37,6 +37,6 @@ public class TypesPage extends BasePage
public TypesPage(PageParameters parameters) {
super(parameters);
add(new Types("types_component",
- ((OpsuiApp) getApplication()).getFmUrlStr(), TypeBrowserPage.class));
+ app.getFmUrlStr(), TypeBrowserPage.class));
}
}
Added: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowConditionViewerPage.html
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowConditionViewerPage.html?rev=1198618&view=auto
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowConditionViewerPage.html (added)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowConditionViewerPage.html Mon Nov 7 03:51:07 2011
@@ -0,0 +1,4 @@
+<wicket:extend>
+<div id="breadcrumbs"><a href="#" wicket:id="crumb_home_link">Home</a> <span id="divider">/</span> Conditions <span id="divider">/</span> <span wicket:id="cond_id">urn:oodt:TestCondition</span></div>
+<div wicket:id="cond_viewer"/>
+</wicket:extend>
\ No newline at end of file
Propchange: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowConditionViewerPage.html
------------------------------------------------------------------------------
svn:executable = *
Added: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowConditionViewerPage.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowConditionViewerPage.java?rev=1198618&view=auto
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowConditionViewerPage.java (added)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowConditionViewerPage.java Mon Nov 7 03:51:07 2011
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.oodt.pcs.opsui;
+
+//OODT imports
+import org.apache.oodt.cas.webcomponents.workflow.conditions.WorkflowConditionViewer;
+
+//Wicket imports
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.html.basic.Label;
+
+/**
+ *
+ * Page controller for the WorkflowConditionViewerPage.html file.
+ *
+ * @author mattmann
+ * @version $Revision$
+ *
+ */
+public class WorkflowConditionViewerPage extends WorkflowCrumbedPage {
+
+ /**
+ * @param parameters
+ */
+ public WorkflowConditionViewerPage(PageParameters parameters) {
+ super(parameters);
+ add(new WorkflowConditionViewer("cond_viewer", app.getWmUrlStr(),
+ parameters.getString("id")));
+ add(new Label("cond_id", parameters.getString("id")));
+ }
+
+}
Added: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowCrumbedPage.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowCrumbedPage.java?rev=1198618&view=auto
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowCrumbedPage.java (added)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowCrumbedPage.java Mon Nov 7 03:51:07 2011
@@ -0,0 +1,55 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.oodt.pcs.opsui;
+
+//OODT imports
+import org.apache.oodt.pcs.opsui.status.StatusPage;
+
+//Wicket imports
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.html.link.Link;
+
+/**
+ *
+ * Adds a bread crumb link to the OPSUI app home,
+ * the PCS status page.
+ *
+ * @author mattmann
+ * @version $Revision$
+ *
+ */
+public class WorkflowCrumbedPage extends BasePage {
+
+ /**
+ * @param parameters
+ */
+ public WorkflowCrumbedPage(PageParameters parameters) {
+ super(parameters);
+ add(new Link("crumb_home_link"){
+ /* (non-Javadoc)
+ * @see org.apache.wicket.markup.html.link.Link#onClick()
+ */
+ @Override
+ public void onClick() {
+ setResponsePage(StatusPage.class);
+ }
+ });
+ }
+
+}
Added: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowInstanceViewerPage.html
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowInstanceViewerPage.html?rev=1198618&view=auto
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowInstanceViewerPage.html (added)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowInstanceViewerPage.html Mon Nov 7 03:51:07 2011
@@ -0,0 +1,4 @@
+<wicket:extend>
+<div id="breadcrumbs"><a href="#" wicket:id="crumb_home_link">Home</a> <span id="divider">/</span> Instances </div>
+<div wicket:id="instance_viewer"/>
+</wicket:extend>
\ No newline at end of file
Propchange: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowInstanceViewerPage.html
------------------------------------------------------------------------------
svn:executable = *
Added: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowInstanceViewerPage.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowInstanceViewerPage.java?rev=1198618&view=auto
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowInstanceViewerPage.java (added)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowInstanceViewerPage.java Mon Nov 7 03:51:07 2011
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.oodt.pcs.opsui;
+
+//OODT imports
+import org.apache.oodt.cas.webcomponents.workflow.instance.WorkflowInstancesViewer;
+
+//Wicket imports
+import org.apache.wicket.PageParameters;
+
+/**
+ *
+ * Shows a set of workflow instances.
+ *
+ * @author mattmann
+ * @version $Revision$
+ *
+ */
+public class WorkflowInstanceViewerPage extends WorkflowCrumbedPage {
+
+ /**
+ * @param parameters
+ */
+ public WorkflowInstanceViewerPage(PageParameters parameters) {
+ super(parameters);
+ OpsuiApp app = (OpsuiApp)getApplication();
+ add(new WorkflowInstancesViewer("instance_viewer",
+ app.getWmUrlStr(), parameters.getString("status"),
+ parameters.getInt("pageNum", 1),
+ app.getWorkflowInstStatues(), app.getWorkflowLifecycleFilePath(),
+ app.getWorkflowInstMetFieldsFilePath(), WorkflowViewerPage.class,
+ WorkflowTaskViewerPage.class, WorkflowInstanceViewerPage.class));
+ }
+
+}
Added: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowTaskViewerPage.html
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowTaskViewerPage.html?rev=1198618&view=auto
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowTaskViewerPage.html (added)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowTaskViewerPage.html Mon Nov 7 03:51:07 2011
@@ -0,0 +1,4 @@
+<wicket:extend>
+<div id="breadcrumbs"><a href="#" wicket:id="crumb_home_link">Home</a> <span id="divider">/</span> Tasks <span id="divider">/</span> <span wicket:id="task_id">urn:oodt:LongTask</span></div>
+<div wicket:id="task_viewer" id="task_viewer"/>
+</wicket:extend>
\ No newline at end of file
Propchange: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowTaskViewerPage.html
------------------------------------------------------------------------------
svn:executable = *
Added: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowTaskViewerPage.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowTaskViewerPage.java?rev=1198618&view=auto
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowTaskViewerPage.java (added)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowTaskViewerPage.java Mon Nov 7 03:51:07 2011
@@ -0,0 +1,48 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.oodt.pcs.opsui;
+
+//OODT imports
+import org.apache.oodt.cas.webcomponents.workflow.tasks.WorkflowTaskViewer;
+
+//Wicket imports
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.html.basic.Label;
+
+/**
+ *
+ * Controller for the TaskViewerPage.html.
+ *
+ * @author mattmann
+ * @version $Revision$
+ *
+ */
+public class WorkflowTaskViewerPage extends WorkflowCrumbedPage {
+
+ /**
+ * @param parameters
+ */
+ public WorkflowTaskViewerPage(PageParameters parameters) {
+ super(parameters);
+ add(new WorkflowTaskViewer("task_viewer", app.getWmUrlStr(),
+ parameters.getString("id"), WorkflowConditionViewerPage.class));
+ add(new Label("task_id", parameters.getString("id")));
+ }
+
+}
Added: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowViewerPage.html
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowViewerPage.html?rev=1198618&view=auto
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowViewerPage.html (added)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowViewerPage.html Mon Nov 7 03:51:07 2011
@@ -0,0 +1,4 @@
+<wicket:extend>
+<div id="breadcrumbs"><a href="#" wicket:id="crumb_home_link">Home</a> <span id="divider">/</span> <a href="#" wicket:id="workflows_viewer_link">Workflows</a> <span id="divider">/</span> <span wicket:id="workflow_id">urn:oodt:LongWorkflow</span></div>
+<div wicket:id="workflow_viewer" id="workflow_viewer"/>
+</wicket:extend>
\ No newline at end of file
Propchange: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowViewerPage.html
------------------------------------------------------------------------------
svn:executable = *
Added: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowViewerPage.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowViewerPage.java?rev=1198618&view=auto
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowViewerPage.java (added)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowViewerPage.java Mon Nov 7 03:51:07 2011
@@ -0,0 +1,58 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.oodt.pcs.opsui;
+
+//OODT imports
+import org.apache.oodt.cas.webcomponents.workflow.model.WorkflowViewer;
+
+//Wicket imports
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.Link;
+
+/**
+ *
+ * Controller for the WorkflowViewerPage.html.
+ *
+ * @author mattmann
+ * @version $Revision$
+ *
+ */
+public class WorkflowViewerPage extends WorkflowCrumbedPage {
+
+ /**
+ * @param parameters
+ */
+ public WorkflowViewerPage(PageParameters parameters) {
+ super(parameters);
+ add(new WorkflowViewer("workflow_viewer", app.getWmUrlStr(),
+ parameters.getString("id"), WorkflowTaskViewerPage.class));
+ add(new Link("workflows_viewer_link"){
+ /* (non-Javadoc)
+ * @see org.apache.wicket.markup.html.link.Link#onClick()
+ */
+ @Override
+ public void onClick() {
+ setResponsePage(WorkflowsViewerPage.class);
+ }
+ });
+
+ add(new Label("workflow_id", parameters.getString("id")));
+ }
+
+}
Added: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowsViewerPage.html
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowsViewerPage.html?rev=1198618&view=auto
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowsViewerPage.html (added)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowsViewerPage.html Mon Nov 7 03:51:07 2011
@@ -0,0 +1,4 @@
+<wicket:extend>
+<div id="breadcrumbs"><a href="#" wicket:id="crumb_home_link">Home</a> <span id="divider">/</span> Workflows </div>
+<div wicket:id="workflows_viewer" id="workflows_viewer"/>
+</wicket:extend>
\ No newline at end of file
Propchange: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowsViewerPage.html
------------------------------------------------------------------------------
svn:executable = *
Added: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowsViewerPage.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowsViewerPage.java?rev=1198618&view=auto
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowsViewerPage.java (added)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkflowsViewerPage.java Mon Nov 7 03:51:07 2011
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.oodt.pcs.opsui;
+
+//OODT imports
+import org.apache.oodt.cas.webcomponents.workflow.model.WorkflowsViewer;
+
+//Wicket imports
+import org.apache.wicket.PageParameters;
+
+/**
+ *
+ * Page controller for the WorkflowsViewerPage.html.
+ *
+ * @author mattmann
+ * @version $Revision$
+ *
+ */
+public class WorkflowsViewerPage extends WorkflowCrumbedPage {
+
+ /**
+ * @param parameters
+ */
+ public WorkflowsViewerPage(PageParameters parameters) {
+ super(parameters);
+ add(new WorkflowsViewer("workflows_viewer", app.getWmUrlStr(),
+ WorkflowViewerPage.class));
+
+ }
+
+}
Modified: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.html
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.html?rev=1198618&r1=1198617&r2=1198618&view=diff
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.html (original)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.html Mon Nov 7 03:51:07 2011
@@ -105,7 +105,7 @@
<span wicket:id="status_name" class="status_name">QUEUED</span> pipelines
</td>
<td style="text-align:right">
- <a href="#" wicket:id="jobstatus_count_link">250</a>
+ <a href="#" wicket:id="jobstatus_count_link"><span id="status_num_jobs" wicket:id="status_num_jobs">250</span></a>
</td>
</tr>
<wicket:remove>
@@ -143,7 +143,7 @@
<div class="roundtable">
<table>
<tr>
- <td class="nowrap"><span wicket:id="crawler_name" class="crawler_name">Local File Crawler</span> Number of Crawls: <span wicket:id="num_crawls" class="num_crawls">32</span> Avg Time: <span wicket:id="avg_crawl_time" class="avg_crawl_time">5 sec</span>
+ <td class="nowrap"><span class="crawler_name">Local File Crawler</span> Number of Crawls: <span class="num_crawls">32</span> Avg Time: <span class="avg_crawl_time">5 sec</span>
</td>
</tr>
<tr>
Modified: oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.java?rev=1198618&r1=1198617&r2=1198618&view=diff
==============================================================================
--- oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.java (original)
+++ oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/status/StatusPage.java Mon Nov 7 03:51:07 2011
@@ -24,20 +24,29 @@ import java.util.List;
import java.util.Vector;
//OODT imports
+import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.pcs.opsui.ProductBrowserPage;
+import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.pcs.health.CrawlerStatus;
+import org.apache.oodt.pcs.health.JobHealthStatus;
import org.apache.oodt.pcs.health.PCSDaemonStatus;
import org.apache.oodt.pcs.health.PCSHealthMonitorReport;
import org.apache.oodt.pcs.opsui.BasePage;
import org.apache.oodt.pcs.opsui.OpsuiApp;
+import org.apache.oodt.pcs.opsui.WorkflowInstanceViewerPage;
import org.apache.oodt.pcs.tools.PCSHealthMonitor;
+import org.apache.oodt.pcs.util.FileManagerUtils;
//Wicket imports
import org.apache.wicket.PageParameters;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.image.Image;
+import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.model.Model;
/**
*
@@ -99,6 +108,89 @@ public class StatusPage extends BasePage
}
});
+ List<PCSDaemonStatus> batchStubStatusList = report.getBatchStubStatus();
+ add(new ListView<PCSDaemonStatus>("batch_stub_list", batchStubStatusList) {
+
+ @Override
+ protected void populateItem(ListItem<PCSDaemonStatus> item) {
+ item.add(new Label("batch_stub_url", item.getModelObject().getUrlStr()));
+ item.add(new Image("batch_stub_status_icon", getUpOrDownArrowRef(item
+ .getModelObject().getStatus())));
+
+ }
+ });
+
+ List<JobHealthStatus> jobHealthStatusList = report.getJobHealthStatus();
+ add(new ListView<JobHealthStatus>("jobstatus_list", jobHealthStatusList) {
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.wicket.markup.html.list.ListView#populateItem(org.apache
+ * .wicket.markup.html.list.ListItem)
+ */
+ @Override
+ protected void populateItem(final ListItem<JobHealthStatus> item) {
+ item.add(new Label("status_name", item.getModelObject().getStatus()));
+ Link<String> countLink = new Link<String>("jobstatus_count_link",
+ new Model<String>(item.getModelObject().getStatus())) {
+
+ @Override
+ public void onClick() {
+ PageParameters params = new PageParameters();
+ params.add("pageNum", "1");
+ params.add("status", getModelObject());
+ setResponsePage(WorkflowInstanceViewerPage.class, params);
+ }
+ };
+ countLink.add(new Label("status_num_jobs", String.valueOf(item
+ .getModelObject().getNumPipelines())));
+ item.add(countLink);
+ }
+ });
+
+ List<Product> prodList = report.getLatestProductsIngested();
+ final FileManagerUtils fm = new FileManagerUtils(fmUrlStr);
+
+ add(new ListView<Product>("file_health_list", prodList) {
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.wicket.markup.html.list.ListView#populateItem(org.apache
+ * .wicket.markup.html.list.ListItem)
+ */
+ @Override
+ protected void populateItem(ListItem<Product> item) {
+ final Product product = item.getModelObject();
+ product.setProductType(fm.safeGetProductTypeById(product
+ .getProductType().getProductTypeId()));
+ product.setProductReferences(fm.safeGetProductReferences(product));
+ final Metadata prodMet = fm.safeGetMetadata(product);
+ final String filePath = fm.getFilePath(product);
+
+ Link link = new Link("view_product_link") {
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.wicket.markup.html.link.Link#onClick()
+ */
+ @Override
+ public void onClick() {
+ PageParameters params = new PageParameters();
+ params.add("id", product.getProductId());
+ setResponsePage(ProductBrowserPage.class, params);
+ }
+ };
+
+ link.add(new Label("file_path", filePath));
+ item.add(link);
+ item.add(new Label("file_ingest_datetime", prodMet.getMetadata("CAS."
+ + CoreMetKeys.PRODUCT_RECEVIED_TIME)));
+
+ }
+ });
+
}
private ResourceReference getUpOrDownArrowRef(String status) {
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=1198618&r1=1198617&r2=1198618&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 Mon Nov 7 03:51:07 2011
@@ -26,14 +26,14 @@ the License.
<Parameter name="resmgr.url"
value="[RESMGR_URL]"/>
- <Parameter name="org.apache.oodt.cas.workflow.webapp.lifecycleFilePath"
+ <Parameter name="org.apache.oodt.pcs.opsui.workflow.lifecycleFilePath"
value="[WORKFLOW_HOME]/policy/workflow-lifecycle.xml"/>
- <Parameter name="org.apache.oodt.cas.workflow.inst.statuses"
- value="STARTED, FINISHED, METMISS, PAUSED"/>
+ <Parameter name="org.apache.oodt.pcs.opsui.winst.statuses"
+ value="QUEUED, RSUBMIT, BUILDING CONFIG FILE, PGE EXEC, CRAWLING, STAGING INPUT, FINISHED, STARTED, PAUSED"/>
- <Parameter name="org.apache.oodt.cas.workflow.webapp.inst.metFields.filePath"
- value="[WORKFLOW_HOME]/policy/workflow-instance-met.xml"/>
+ <Parameter name="org.apache.oodt.pcs.opsui.winst.metFields.filePath"
+ value="[WORKFLOW_HOME]/policy/workflow-instance-met.xml"/>
<Parameter name="org.apache.oodt.pcs.health.crawler.conf.filePath"
value="[PCS_HOME]/aux/pcs/pcs-crawlers.xml"/>