Author: mattmann
Date: Mon Nov 21 04:24:24 2011
New Revision: 1204348
URL: http://svn.apache.org/viewvc?rev=1204348&view=rev
Log:
- begin to include FM, WM, RM and PGE configuration pages in OPSUI: OODT-157
- set up tabbed panes
- set up outer shell
- begin to flesh out FM page
Realizing this is going to be a LOT of work.....err....fun!
Added:
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/ConfigPage.css
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/ConfigPage.html
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/ConfigPage.java
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.css
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.html
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.java
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/tab_bottom.gif
(with props)
Modified:
oodt/trunk/pcs/opsui/pom.xml
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/BasePage_classic.html
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
Modified: oodt/trunk/pcs/opsui/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/pom.xml?rev=1204348&r1=1204347&r2=1204348&view=diff
==============================================================================
--- oodt/trunk/pcs/opsui/pom.xml (original)
+++ oodt/trunk/pcs/opsui/pom.xml Mon Nov 21 04:24:24 2011
@@ -29,7 +29,7 @@ the License.
</parent>
<name>Process Control System Operator Interface Webapp</name>
<properties>
- <wicket.version>1.4.16</wicket.version>
+ <wicket.version>1.4.17</wicket.version>
<jetty.version>6.1.25</jetty.version>
<slf4j.version>1.5.8</slf4j.version>
<log4j.version>1.2.14</log4j.version>
@@ -41,6 +41,11 @@ the License.
<version>${wicket.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-webapp-components</artifactId>
<version>${project.parent.version}</version>
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=1204348&r1=1204347&r2=1204348&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 21 04:24:24 2011
@@ -85,7 +85,7 @@
Resource Monitor
</span>
</a>
- <a href="#" id="config_link">
+ <a href="#" wicket:id="config_link">
<span>
Configuration
</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=1204348&r1=1204347&r2=1204348&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 21 04:24:24 2011
@@ -19,6 +19,7 @@
package org.apache.oodt.pcs.opsui;
//Wicket imports
+import org.apache.oodt.pcs.opsui.config.ConfigPage;
import org.apache.oodt.pcs.opsui.status.StatusPage;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.WebPage;
@@ -85,6 +86,18 @@ public class BasePage extends WebPage {
}
});
+ add(new Link("config_link"){
+ /* (non-Javadoc)
+ * @see org.apache.wicket.markup.html.link.Link#onClick()
+ */
+ @Override
+ public void onClick() {
+ PageParameters params = new PageParameters();
+ params.add("tab", "File Manager");
+ setResponsePage(ConfigPage.class, params);
+ }
+ });
+
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/BasePage_classic.html
URL:
http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_classic.html?rev=1204348&r1=1204347&r2=1204348&view=diff
==============================================================================
---
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_classic.html
(original)
+++
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_classic.html
Mon Nov 21 04:24:24 2011
@@ -178,7 +178,7 @@
<td
id="menu_inner_tbl_links_cfg"
onMouseOver="menuSelected($(this))"
onMouseOut="menuNotSelected($(this))"><a href="#"
-
id="config_link" class="blackLink"> <span
+
wicket:id="config_link" class="blackLink"> <span
style="color: white; font-weight: bold;">
Configuration </span> </a>
</td>
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=1204348&r1=1204347&r2=1204348&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 21 04:24:24 2011
@@ -27,6 +27,7 @@ import javax.servlet.ServletContext;
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;
+import org.apache.oodt.pcs.opsui.config.ConfigPage;
import org.apache.oodt.pcs.opsui.status.StatusPage;
import org.apache.oodt.pcs.webcomponents.trace.Trace;
@@ -78,6 +79,9 @@ public class OpsuiApp extends WebApplica
MixedParamUrlCodingStrategy workflowInstsPageMount = new
MixedParamUrlCodingStrategy(
"instances", WorkflowInstanceViewerPage.class, new String[] { "status",
"pageNum" });
+
+ MixedParamUrlCodingStrategy configPageMount = new
MixedParamUrlCodingStrategy("config",
+ ConfigPage.class, new String [] {"tab"});
mount(pcsStatus);
mount(types);
@@ -88,6 +92,7 @@ public class OpsuiApp extends WebApplica
mount(workflowPageMount);
mount(workflowsPageMount);
mount(workflowInstsPageMount);
+ mount(configPageMount);
}
/*
@@ -244,6 +249,9 @@ public class OpsuiApp extends WebApplica
"open.gif").getSharedResourceKey());
mountSharedResource("/images/closed.gif", new ResourceReference(
Trace.class, "closed.gif").getSharedResourceKey());
+
+ mountSharedResource("/images/tab_bottom.gif", new
ResourceReference(ConfigPage.class,
+ "tab_bottom.gif").getSharedResourceKey());
}
Added:
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/ConfigPage.css
URL:
http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/ConfigPage.css?rev=1204348&view=auto
==============================================================================
---
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/ConfigPage.css
(added)
+++
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/ConfigPage.css
Mon Nov 21 04:24:24 2011
@@ -0,0 +1,36 @@
+div.tabpanel div.tab-row ul {
+ height: 20px;
+ margin: 0;
+ padding-left: 10px;
+ background: url( ../../images/tab_bottom.gif ) repeat-x bottom;
+}
+
+div.tabpanel div.tab-row li {
+ margin: 0;
+ padding: 0;
+ display: inline;
+ list-style-type: none;
+}
+
+div.tabpanel div.tab-row a:link, div.tabpanel div.tab-row a:visited {
+ float: left;
+ background: #f3f3f3;
+ font-size: 12px;
+ line-height: 14px;
+ font-weight: bold;
+ padding: 2px 10px 2px 10px;
+ margin-right: 4px;
+ border: 1px solid #ccc;
+ text-decoration: none;
+ color: #666;
+}
+
+div.tabpanel div.tab-row li.selected a:link, div.tabpanel div.tab-row
a:visited.active {
+ border-bottom: 1px solid #fff;
+ background: #fff;
+ color: #000;
+}
+
+div.tabpanel div.tab-row a:hover {
+ background: #fff;
+}
\ No newline at end of file
Added:
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/ConfigPage.html
URL:
http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/ConfigPage.html?rev=1204348&view=auto
==============================================================================
---
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/ConfigPage.html
(added)
+++
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/ConfigPage.html
Mon Nov 21 04:24:24 2011
@@ -0,0 +1,7 @@
+<wicket:extend>
+<wicket:link>
+ <link rel="stylesheet" type="text/css" href="ConfigPage.css"/>
+</wicket:link>
+
+<div wicket:id="tabs" class="tabpanel">[tabbed panel will be here]</div>
+</wicket:extend>
Added:
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/ConfigPage.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/ConfigPage.java?rev=1204348&view=auto
==============================================================================
---
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/ConfigPage.java
(added)
+++
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/ConfigPage.java
Mon Nov 21 04:24:24 2011
@@ -0,0 +1,119 @@
+/**
+ * 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.config;
+
+import java.util.List;
+import java.util.Vector;
+
+import org.apache.oodt.pcs.opsui.BasePage;
+import org.apache.oodt.pcs.opsui.config.filemgr.FileManagerConfigPage;
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
+import org.apache.wicket.extensions.markup.html.tabs.ITab;
+import org.apache.wicket.extensions.markup.html.tabs.TabbedPanel;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.Model;
+
+/**
+ *
+ * Describe your class here.
+ *
+ * @author mattmann
+ * @version $Revision$
+ *
+ */
+public class ConfigPage extends BasePage {
+
+ /**
+ * @param parameters
+ */
+ public ConfigPage(PageParameters parameters) {
+ super(parameters);
+
+ List<ITab> tabs = new Vector<ITab>();
+ tabs.add(new AbstractTab(new Model<String>("File Manager")) {
+ @Override
+ public Panel getPanel(String id) {
+ return new FileManagerConfigPage(id);
+ }
+ });
+
+ tabs.add(new AbstractTab(new Model<String>("Workflow Manager")) {
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.wicket.extensions.markup.html.tabs.AbstractTab#getPanel(
+ * java.lang.String)
+ */
+ @Override
+ public Panel getPanel(String id) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ });
+
+ tabs.add(new AbstractTab(new Model<String>("Resource Manager")) {
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.wicket.extensions.markup.html.tabs.AbstractTab#getPanel(
+ * java.lang.String)
+ */
+ @Override
+ public Panel getPanel(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ });
+
+ tabs.add(new AbstractTab(new Model<String>("PGE Configuration")) {
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.wicket.extensions.markup.html.tabs.AbstractTab#getPanel(
+ * java.lang.String)
+ */
+ @Override
+ public Panel getPanel(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ });
+
+ TabbedPanel tabbedPanel = new TabbedPanel("tabs", tabs);
+ tabbedPanel.setSelectedTab(getTabIdx(tabs,
+ parameters.getString("tab", "File Manager")));
+
+ add(tabbedPanel);
+ }
+
+ private int getTabIdx(List<ITab> tabs, String tabName) {
+ for (int i = 0; i < tabs.size(); i++) {
+ ITab tab = tabs.get(i);
+ if (tab.getTitle().getObject().equals(tabName)) {
+ return i;
+ }
+ }
+
+ return -1;
+ }
+
+}
Added:
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.css
URL:
http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.css?rev=1204348&view=auto
==============================================================================
---
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.css
(added)
+++
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.css
Mon Nov 21 04:24:24 2011
@@ -0,0 +1,20 @@
+#fm_cfg_outer_shell{
+ width:100%;
+ height:570px;
+ border-spacing:0px;
+ border: 1px solid #000000;
+}
+
+#sixpadded{
+ width:100px;
+ border:1px solid #000000;
+ border-spacing:0px;
+ padding: 6px;
+}
+
+
+td.fcfg_header{
+ white-space:nowrap;
+ text-align:right;
+ font-weight:bold;
+}
\ No newline at end of file
Added:
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.html
URL:
http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.html?rev=1204348&view=auto
==============================================================================
---
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.html
(added)
+++
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.html
Mon Nov 21 04:24:24 2011
@@ -0,0 +1,88 @@
+<wicket:panel>
+<wicket:link>
+ <link rel="stylesheet" type="text/css" href="FileManagerConfigPage.css"/>
+</wicket:link>
+<div id="form_shell">
+<p> </p>
+ <form>
+ <table id="fm_cfg_outer_shell">
+ <tr style="height:10%">
+ <td>
+ <table id="sixpadded">
+ <tr>
+ <td
class="fcfg_header">Port Number:
+ </td>
+ <td
style="text-align:left;"><input id="port_number" size="20"
+ maxlength="50"
value="9000" />
+ </td>
+ <td
colspan="2"> </td>
+ </tr>
+ <tr>
+ <td
class="fcfg_header">Transfer:
+ </td>
+ <td
colspan="3"> </td>
+ </tr>
+ <tr id="transfer_types">
+ <td> </td>
+ <td> <input
type="radio" id="transfer_type"
value="org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory">Local</input>
+ <wicket:remove>
+ <input type="radio"
id="transfer_type"
value="org.apache.oodt.cas.filemgr.datatransfer.RemoteDataTransferFactory">Remote</input>
+ </wicket:remove>
+ </td>
+ <td
colspan="2"> </td>
+ </tr>
+ <tr>
+ <td
colspan="2"> </td>
+ <td
class="fcfg_header">Chunk Size:
+ </td>
+ <td align="left"><input
type="text" id="remote_chunk_size"
+ size="20"
maxlength="50" value="" />
+ </td>
+ </tr>
+ </table></td>
+ </tr>
+ <tr style="height:25%">
+ <td>
+ <!-- include catalog jsp --></td>
+ </tr>
+ <tr style="height:25%;">
+ <td>
+ <!-- include Repository jsp --></td>
+ </tr>
+ <tr style="height:25%;">
+ <td>
+ <!-- include Validation jsp --></td>
+ </tr>
+ <tr style="height:10%;">
+ <td>
+ <table style="width:100%">
+ <tr>
+ <td colspan="2"
class="fcfg_header"><b>XML-RPL Configuration:</b>
+ </td>
+ </tr>
+ <tr>
+ <td style="width:30%"
class="fcfg_header">Connection Timeout: <input
+ type="text"
id="connection_time_out" size="20" value="20" />
+ </td>
+ <td style="width:30%"
class="fcfg_header">Request Timeout: <input
+ type="text"
id="request_timeout" size="20" value="60" />
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr style="height:5%;">
+ <td>
+ <table style="width:100%">
+ <tr>
+ <td align="right"><input
+ type="submit"
id="save_fm_cfg" value="Save"/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </form>
+</div>
+</wicket:panel>
\ No newline at end of file
Added:
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.java?rev=1204348&view=auto
==============================================================================
---
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.java
(added)
+++
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/filemgr/FileManagerConfigPage.java
Mon Nov 21 04:24:24 2011
@@ -0,0 +1,43 @@
+/**
+ * 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.config.filemgr;
+
+import org.apache.wicket.markup.html.panel.Panel;
+
+/**
+ *
+ * Describe your class here.
+ *
+ * @author mattmann
+ * @version $Revision$
+ *
+ */
+public class FileManagerConfigPage extends Panel {
+
+ private static final long serialVersionUID = 145336240434428919L;
+
+ /**
+ * @param id
+ */
+ public FileManagerConfigPage(String id) {
+ super(id);
+ }
+
+
+}
Added:
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/tab_bottom.gif
URL:
http://svn.apache.org/viewvc/oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/tab_bottom.gif?rev=1204348&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/config/tab_bottom.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
