Changeset 2298


Ignore:
Timestamp:
Mar 18, 2014, 3:20:00 PM (9 years ago)
Author:
Nicklas Nordborg
Message:

References #533: Add secondary analysis section to Reggie

Reorganize a few files.

Location:
extensions/net.sf.basedb.reggie/trunk
Files:
1 added
2 edited
5 moved

Legend:

Unmodified
Added
Removed

  • extensions/net.sf.basedb.reggie/trunk/META-INF/servlets.xml

    r2295 r2298  
    102102  </servlet>
    103103  <servlet>
    104     <servlet-name>Ogs</servlet-name>
    105     <servlet-class>net.sf.basedb.reggie.servlet.OgsServlet</servlet-class>
     104    <servlet-name>OpenGrid</servlet-name>
     105    <servlet-class>net.sf.basedb.reggie.grid.OpenGridServlet</servlet-class>
    106106  </servlet>
    107107</servlets>

  • extensions/net.sf.basedb.reggie/trunk/resources/admin/grid/list-clusters.js

    r2297 r2298  
    2929    rows.appendChild(wait);
    3030
    31     var url = '../Ogs.servlet?ID='+App.getSessionId();
     31    var url = '../../OpenGrid.servlet?ID='+App.getSessionId();
    3232    url += '&cmd=GetHostInfo';
    3333    if (reload) url += '&reload=1';
    … …  
    112112          var img = info.exitStatus == 0 ? 'ok.png' : 'error.png';
    113113          cell.className = 'ogs-status';
    114           cell.innerHTML = '<img src="../images/'+img + '">';
     114          cell.innerHTML = '<img src="../../images/'+img + '">';
    115115        }
    116116        row.appendChild(cell);
    … …  
    125125  {
    126126    var clusterId = Data.get(event.currentTarget, 'cluster-id');
    127     var url = 'ogs-cluster.jsp?ID='+App.getSessionId();
     127    var url = 'view-cluster.jsp?ID='+App.getSessionId();
    128128    url += '&clusterId='+encodeURIComponent(clusterId);
    129129    location.href = url;

  • extensions/net.sf.basedb.reggie/trunk/resources/admin/grid/list-clusters.jsp

    r2297 r2298  
    2727<base:page type="default" >
    2828<base:head
    29   scripts="~../reggie.js,~ogs-clusters.js"
    30   styles="path.css,table.css,toolbar.css,~../css/reggie.css">
     29  scripts="~../../reggie.js,~list-clusters.js"
     30  styles="path.css,table.css,toolbar.css,~../../css/reggie.css">
    3131<style>
    3232.ogs-status
    … …  
    4040
    4141  <p:path><p:pathelement
    42     title="Reggie" href="<%="../index.jsp?ID="+ID%>"
    43     /><p:pathelement title="Open Grid Scheduler clusters"
     42    title="Reggie" href="<%="../../index.jsp?ID="+ID%>"
     43    /><p:pathelement title="Open Grid Scheduler"
    4444    /></p:path>
    4545

  • extensions/net.sf.basedb.reggie/trunk/resources/admin/grid/view-cluster.js

    r2297 r2298  
    99  ogs.initPage = function()
    1010  {
    11     var url = '../Ogs.servlet?ID='+App.getSessionId();
     11    var url = '../../OpenGrid.servlet?ID='+App.getSessionId();
    1212    url += '&cmd=GetHostInfo';
    1313    url += '&clusterId='+Data.get('page-data', 'cluster-id');
    … …  
    100100    }
    101101   
    102     var url = '../Ogs.servlet?ID='+App.getSessionId();
     102    var url = '../../OpenGrid.servlet?ID='+App.getSessionId();
    103103    url += '&cmd=ExecuteCmd';
    104104    var request = Ajax.getXmlHttpRequest();

  • extensions/net.sf.basedb.reggie/trunk/resources/admin/grid/view-cluster.jsp

    r2297 r2298  
    2828<base:page type="default" >
    2929<base:head
    30   scripts="~../reggie.js,~ogs-cluster.js"
    31   styles="path.css,table.css,toolbar.css,~../css/reggie.css">
     30  scripts="~../../reggie.js,~view-cluster.js"
     31  styles="path.css,table.css,toolbar.css,~../../css/reggie.css">
    3232<style>
    3333
    … …  
    8181
    8282  <p:path><p:pathelement
    83     title="Reggie" href="<%="../index.jsp?ID="+ID%>"
    84     /><p:pathelement title="Open Grid Scheduler clusters"
    85       href="<%="ogs-clusters.jsp?ID="+ID%>"
     83    title="Reggie" href="<%="../../index.jsp?ID="+ID%>"
     84    /><p:pathelement title="Open Grid Scheduler"
     85      href="<%="list-clusters.jsp?ID="+ID%>"
    8686    /><p:pathelement title="<%=clusterId%>"
    8787    /></p:path>

  • extensions/net.sf.basedb.reggie/trunk/resources/index.jsp

    r2295 r2298  
    771771          <dt>
    772772            <base:icon image="<%=home + "/images/ogs-cluster.png"%>" />
    773             <span class="require-permission" data-role="Administrator" data-link="admin/ogs-clusters.jsp?ID=<%=ID%>">Open Grid Scheduler cluster</span>
     773            <span class="require-permission" data-role="Administrator" data-link="admin/grid/list-clusters.jsp?ID=<%=ID%>">Open Grid Scheduler</span>
    774774          </dl>
    775775          <%

  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/grid/OpenGridServlet.java

    r2297 r2298  
    1 package net.sf.basedb.reggie.servlet;
     1package net.sf.basedb.reggie.grid;
    22
    33import java.io.IOException;
    … …  
    1717import net.sf.basedb.core.SessionControl;
    1818import net.sf.basedb.reggie.dao.ReggieRole;
    19 import net.sf.basedb.reggie.grid.OpenGridCluster;
    20 import net.sf.basedb.reggie.grid.OpenGridService;
    2119import net.sf.basedb.reggie.ssh.CmdResult;
    2220import net.sf.basedb.util.Values;
    … …  
    2927  @since 2.16
    3028 */
    31 public class OgsServlet
     29public class OpenGridServlet
    3230  extends HttpServlet
    3331{
    … …  
    3634  private static final long serialVersionUID = 7976046697638443809L;
    3735
    38   public OgsServlet()
     36  public OpenGridServlet()
    3937  {}
    4038
Note: See TracChangeset for help on using the changeset viewer.