Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3175 - in branches/WebAdmin: . perfSONARWebAdmin/admin/exist perfSONARWebAdmin/admin/service perfSONARWebAdmin/auxiliary/wizard

Subject: perfsonar development work

List archive

perfsonar: r3175 - in branches/WebAdmin: . perfSONARWebAdmin/admin/exist perfSONARWebAdmin/admin/service perfSONARWebAdmin/auxiliary/wizard


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3175 - in branches/WebAdmin: . perfSONARWebAdmin/admin/exist perfSONARWebAdmin/admin/service perfSONARWebAdmin/auxiliary/wizard
  • Date: Thu, 3 Jan 2008 08:11:17 -0500
Author: michalis
Date: 2008-01-03 08:11:16 -0500 (Thu, 03 Jan 2008)
New Revision: 3175

Added:
branches/WebAdmin/default.css
branches/WebAdmin/index.html
branches/WebAdmin/main.css
Modified:
branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
branches/WebAdmin/perfSONARWebAdmin/admin/service/Admin.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
Log:
Committing code changes

Added: branches/WebAdmin/default.css

Added: branches/WebAdmin/index.html

Added: branches/WebAdmin/main.css

Modified: branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
2008-01-02 10:45:23 UTC (rev 3174)
+++ branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
2008-01-03 13:11:16 UTC (rev 3175)
@@ -46,22 +46,31 @@

// Properties file for the admin servlet

- private static String servicePath;
-
+ //The full path where the service is installed
+ private static String servicePath;
+ //The path to the conf directory
private static final String
confPath="/WEB-INF/classes/perfsonar/conf/";
-
+ //The path to the exist properties
private static final String existProperties =
confPath+"servlet.properties";

+ //The driver to use for connecting to exist
public static final String driver = "org.exist.xmldb.DatabaseImpl";

+ //eXist db manager
private xmlDBManager manager;

+ //xmldb collection
private xmlDBCollection collection;

private eXistServletProperties servletProperties;

+ //Authenticator class used for authentication
private Authenticator authenticator;
+
+ //The doctypr of the html document. Currently Html 4.01 transitional
+ private static final String doctype = "<!DOCTYPE HTML PUBLIC
\"-//W3C//DTD HTML 4.01 Transitional//EN\"
\"http://www.w3.org/TR/html4/loose.dtd\";>";

+
//
-----------------------------------------------------------------------
// public methods

@@ -166,7 +175,8 @@
try {
collections_page(out, request);
} catch (Exception e) {
- error_page("Error!\n" + getFault(e),
out, false);
+ error_message("Error!\n" +
getFault(e), out, false);
+ out.close();
}
} else {
login_page(out, false);
@@ -177,8 +187,7 @@

// If a log out is requested the session is
invalidated and the user
// would start all over again
- if (request.getParameter("logout") != null
- &&
!request.getMethod().equals("GET")) {
+ if (request.getParameter("logout") != null) {
session.setAttribute("authenticated", false);
session.invalidate();
login_page(out, false);
@@ -291,41 +300,7 @@
private void collections_page(ServletOutputStream out,
HttpServletRequest request) throws Exception {
// Outputting the page
- out.println("<html>");
- out.println("<head>");
- out.println("<title >");
- out
- .println("perfSONAR eXist database
administration page-User Management.");
- out.println("</title>");
- out
- .println("<h2 align=\"center\" >perfSONAR
exist Administration page-Collections Management</h2>");
- out.println("</head>");
- out
- .println("<body style=\" font-family: arial;
background-color: #4E9258 \" >");
-
- // The left section containing links to the users and
collections
- // management pages
- out
- .println("<div class=\"content\" style=\"
float: left; margin-left: 10px; width: 100px; \" >");
-
- out.println("<p style=\" font-size: 160% \" >");
- out.println("<ul>");
- out
- .println("<li><a
href=\"eXistAdmin?function=collections\" >Manage Collections</a></li>");
- out
- .println("<li><a
href=\"eXistAdmin?function=users\" >Manage Users</a></li>");
-
- out.println("</ul>");
- out.println("</p>");
-
- out.println("<p>");
- out.println("<form action=\"eXistAdmin\" method=\"POST\"> ");
- out
- .println("<input type=\"submit\"
name=\"logout\" value=\"LogOut\" >");
- out.println("</form>");
- out.println("</p>");
- out.println("</div>");
-
+ preempt(out,true);
String create = null;
String edit = null;
String action = null;
@@ -387,9 +362,13 @@
// Outputting the management section. Contains all child and
resources
// of the requests collection starting with the root /db
out
- .println("<div class=\"manage\" style=\"
float: center; margin-left: 300px; background-color: #6495ED; margin-right:
300px \" >");
- out.println("<p><h3>User Management<h3></p>");
- out.println("<p style=\" font-size: 120% \">");
+ .println("<div class=\"manage\" >");
+
+ out
+ .println("<div class=\"showResource\" >");
+
+ out.println("<br><p><h4>Collection Management<h4></p>");
+ out.println("<p>");

try {
// The childCollection parameter states which is the
collection to
@@ -418,7 +397,8 @@
collections = manager.getCollections();
}
} catch (Exception e1) {
- error_page("An error occurred!\n" + getFault(e1),
out, true);
+ error_message("An error occurred!\n" + getFault(e1),
out, true);
+
}

out.println("<form action=\"eXistAdmin\" method=\"GET\"> ");
@@ -450,7 +430,7 @@
out.println("<td/>");
out
.println("<td><a
href=\"eXistAdmin?function=collections&ChildCollection="
- + parent + "\" " +
"\" >Up </a></td>");
+ + parent + "\" " + "
>Up </a></td>");
out.println("<td/>");
out.println("<td/>");
out.println("<td/>");
@@ -488,8 +468,7 @@
out.println("</td>");
out.println("<td>");
out.println(collection.getCreationDate());
- out.println("</td>");
- out.println("</tr>");
+ out.println("</td></tr>");

}
// Get the documents and their info of the current collection
@@ -506,8 +485,7 @@
document =
currentCollection.getBinaryDocument(documents[i]);
}

- out.println("<tr>");
- out.println("<td>");
+ out.println("<tr><td>");
out.println("<input type=\"radio\" name=\"document\"
value=\""
+ documents[i] + "\" >");
out.println("</td>");
@@ -530,8 +508,7 @@
out.println("</td>");
out.println("<td>");
out.println(document.creationDate().toString());
- out.println("</td>");
- out.println("</tr>");
+ out.println("</td></tr>");

}

@@ -866,7 +843,7 @@
} else {
// Present the input fields
out
- .println("<div
class=\"\" style=\" float: center; font-size: 100%; margin-left: 300px;
background-color: #6495ED; margin-right: 300px \" >");
+ .println("<div
class=\"input\" >");

out
.println("<p><form
action=\"eXistAdmin\" method=\"POST\""
@@ -887,15 +864,14 @@
// name or upload the file.
if (action.equals("Create Resource"))
{

- out.println("<p><table
cellpadding=\"5\" >");
+ out.println("<p><table>");

out.println("<tr>");
out.println("<th>Resource
Type</th>");

out.println("<th>Resource</th>");

out.println("<th>Description</th>");
out.println("</tr>");
- out.println("<tr>");
- out.println("<td>");
+ out.println("<tr><td>");
out

.println("<input type=\"radio\" checked=\"yes\" name=\"type\"
value=\"Collection\" > Collection");
out.println("</td>");
@@ -906,10 +882,9 @@
out.println("<td>");
out

.println("Enter the new collections name(/db/newcollection)");
- out.println("</td>");
- out.println("</tr>");
- out.println("<tr>");
- out.println("<td>");
+ out.println("</td></tr>");
+ out.println("<tr><td>");
+
out

.println("<input type=\"radio\" name=\"type\" value=\"Resource\" >
Resource");
out.println("</td>");
@@ -919,13 +894,12 @@
out.println("</td>");
out.println("<td>");
out.println("Upload your
resource(Only xml files will be accepted!)!");
- out.println("</td>");
- out.println("</tr>");
+ out.println("</td></tr>");
out.println("</table></p>");
} else {
// If this is an edit then we
just show the name of the
// resource to be edited
- out.println("<p><h3>Selected
Resource: " + document);
+ out.println("<p><h4>Selected
Resource: " + document+"</h4>");
out

.println("<input type=\"hidden\" name=\"resource\" value=\""

+ document + "\" >");
@@ -935,26 +909,26 @@
}

// The rest are common
- out.println("<p><table
cellpadding=\"5\" >");
+ out.println("<p><table>");
out.println("<tr>");
out.println("<th>Set Owner:</th>");
out.println("<td>");
// option to set owner or group
out
.println("<input
type=\"text\" name=\"owner\" value=\"\" size=20 >");
- out.println("</tr>");
+ out.println("</td></tr>");
out.println("<tr>");
out.println("<th>Set Group:</th>");
out.println("<td>");
out
.println("<input
type=\"text\" name=\"group\" value=\"\" size=20 >");
- out.println("</tr>");
+ out.println("</td></tr>");
out.println("</table></p>");

// Give permissions

out.println("<p><h4>Permissions:</h4></p>");

- out.println("<p><table
cellpadding=\"5\" >");
+ out.println("<p><table >");
out.println("<tr>");
out.println("<th/>");
out.println("<th>Owner</th>");
@@ -974,8 +948,7 @@
out.println("<td>");
out
.println("<input
type=\"checkbox\" checked=\"yes\" name=\"OthersPerm\" value=\"4\" >");
- out.println("</td>");
- out.println("</tr>");
+ out.println("</td></tr>");
out.println("<tr>");
out.println("<th>Write</th>");
out.println("<td>");
@@ -989,8 +962,7 @@
out.println("<td>");
out
.println("<input
type=\"checkbox\" checked=\"yes\" name=\"OthersPerm\" value=\"2\" >");
- out.println("</td>");
- out.println("</tr>");
+ out.println("</td></tr>");
out.println("<tr>");
out.println("<th>Use</th>");
out.println("<td>");
@@ -1004,8 +976,7 @@
out.println("<td>");
out
.println("<input
type=\"checkbox\" checked=\"yes\" name=\"OthersPerm\" value=\"1\" >");
- out.println("</td>");
- out.println("</tr>");
+ out.println("</td></tr>");
out.println("</table></p>");

// The submit button
@@ -1014,6 +985,7 @@
out.println("</form><p> ");

out.println("</div>");
+ out.println("</div>");
}
}

@@ -1036,54 +1008,24 @@
private void users_page(ServletOutputStream out, HttpServletRequest
request)
throws Exception {

- // Starting page
- out.println("<html>");
- out.println("<head>");
- out.println("<title >");
+ preempt(out,true);
+ // Displaying all the users and their information
out
- .println("perfSONAR eXist database
administration page-User Management.");
- out.println("</title>");
+ .println("<div class=\"manage\" >");
+
out
- .println("<h2 align=\"center\" >perfSONAR
exist Administration page-User Management</h2>");
- out.println("</head>");
- out
- .println("<body style=\" font-family: arial;
background-color: #4E9258 \" >");
+ .println("<div class=\"showResource\" >");

- // Showing the options on the left
- out
- .println("<div class=\"content\" style=\"
float: left; margin-left: 10px; width: 100px; \" >");
-
- out.println("<p style=\" font-size: 160% \" >");
- out.println("<ul>");
- out
- .println("<li><a
href=\"eXistAdmin?function=collections\" >Manage Collections</a></li>");
- out
- .println("<li><a
href=\"eXistAdmin?function=users\" >Manage Users</a></li>");
-
- out.println("</ul>");
- out.println("</p>");
-
+ out.println("<br><p><h4>User Management<h4></p>");
out.println("<p>");
- out.println("<form action=\"eXistAdmin\" method=\"POST\"> ");
- out
- .println("<input type=\"submit\"
name=\"logout\" value=\"LogOut\" >");
- out.println("</form>");
- out.println("</p>");
- out.println("</div>");

- // Displaying all the users and their information
- out
- .println("<div class=\"manage\" style=\"
float: center; margin-left: 300px; background-color: #6495ED; margin-right:
300px \" >");
- out.println("<p><h3>User Management<h3></p>");
- out.println("<p style=\" font-size: 120% \">");
-
String[] user = null;

user = manager.getUsers();

out.println("<form action=\"eXistAdmin\" method=\"GET\"> ");

- out.println("<table cellpadding=\"5\" >");
+ out.println("<table>");

out.println("<tr>");
out.println("<th/>");
@@ -1122,8 +1064,7 @@
home = "not specified";

out.println(home);
- out.println("</td>");
- out.println("</tr>");
+ out.println("</td></tr>");

}
out.println("</table>");
@@ -1334,9 +1275,6 @@
// If no execute parameter then the
user just wants the
// interface to edit and create a user
} else {
-
- out
- .println("<div
class=\"change\" style=\" float: center; font-size: 100%; margin-left: 300px;
background-color: #6495ED; margin-right: 300px \" >");
String[] group;
String groups = "";
boolean noUser = false;
@@ -1355,14 +1293,15 @@
}

}
+
// This means that the user wants to
create a new user. We
// add an additional field
if (!noUser) {
+ out.println("<div
class=\"input\">");
out

.println("<form action=\"eXistAdmin\" method=\"POST\"> ");
- out.println("<table
cellspacing=\"5\" >");
- out.println("<tr>");
- out.println("<td>User:</td>");
+ out.println("<p><table>");
+
out.println("<tr><th>User:</th>");
if (action.equals("Edit")) {
out.println("<td>" +
usr + "</td>");
} else {
@@ -1371,44 +1310,39 @@
}
// The goups field
out.println("</tr>");
- out.println("<tr>");
-
out.println("<td>Group:</td>");
+
out.println("<tr><th>Group:</th>");
out

.println("<td><input type=\"text\" name=\"group\" value=\""

+ groups + "\" size=20 ></td>");
out.println("</tr>");
out.println("<tr>");
// The password fields
-
out.println("<td>Password:</td>");
+
out.println("<th>Password:</th>");
out

.println("<td><input type=\"password\" name=\"password\" value=\"\" size=20
></td>");
out.println("</tr>");
- out.println("<tr>");
- out.println("<td>Confirm
Password:</td>");
+ out.println("<tr><th>Confirm
Password:</th>");
out

.println("<td><input type=\"password\" name=\"confirmPassword\" value=\"\"
size=20 ></td>");
out.println("</tr>");
if (action.equals("Edit")) {
- out.println("<tr>");
-
out.println("<td>Don't change password:</td>");
+
out.println("<tr><th>Don't change password:</th>");
out

.println("<td><input type=\"checkbox\" name=\"keep\" value=\"\" size=20
></td>");
out.println("</tr>");
- out.println("<tr>");
+
}
// The home collection fields
- out.println("<td>Home
Collection</td>");
+ out.println("<tr><th>Home
Collection</th>");
out

.println("<td><input type=\"text\" name=\"homeCollection\" value=\"\" size=20
></td>");
out.println("</tr>");
- out.println("<tr>");
+ out.println("</table></p>");
String name =
(action.equals("Edit")) ? "Change"
: "Create";
out
-
.println("<td><input type=\"submit\" name=\"Execute\" value=\""
-
+ name + "\" size=20 ></td>");
- out.println("</tr>");
- out.println("</table>");
+
.println("<input type=\"submit\" name=\"Execute\" value=\""
+
+ name + "\" size=20>");
out

.println("<input type=\"hidden\" name=\"function\" value=\"users\" >");
if (action.equals("Edit")) {
@@ -1426,6 +1360,7 @@
}
out.println("</form>");
out.println("</div>");
+ out.println("</div>");
}
}

@@ -1492,23 +1427,12 @@
private void error_page(String message, ServletOutputStream out,
boolean back) throws IOException {

- out.println("<html>");
- out.println("<head>");
- out.println("<title align=center>");
- out.println("perfSONAR service administration page.");
- out.println("</title>");
- out.println("<h2 align=\"center\" >perfSONAR Administration
page</h2>");
- out.println("</head>");
- out.println("<div class=\"content\">");
- out
- .println("<body style=\" font-family: arial;
background-color: #4E9258\" >");
- out.println("<h2 align=\"center\" >");
- out.println(message);
- out.println("</h2>");
- out.println("<p align=\"center\" > ");
+ preempt(out,true);
+ out.println("<div class=\"info\">");
+ out.println("<br><p><h3>"+message+"</h3>");
if (back) {
out
- .println("<a style=\" font-size: 130%
\" href=\"/perfSONAR/eXistAdmin\" \">Go Back</a>");
+ .println("<a
href=\"/perfSONAR/eXistAdmin\" \">Go Back</a>");
}
out.println("</p>");
out.println("</div>");
@@ -1533,77 +1457,41 @@
if (!logged) {
login = "Please login in order to make
modifications.";
}
- out.println("<html>");
- out.println("<head>");
- out.println("<title >");
- out.println("perfSONAR eXist database administration page.");
- out.println("</title>");
- out
- .println("<h2 align=\"center\" >perfSONAR
exist Administration page</h2>");
- out.println("</head>");
- out
- .println("<body style=\" font-family: arial;
font-size=120%; background-color: #4E9258\" >");
+ preempt(out,logged);

+ out.println("<div class=\"manage\" >");
+
+ out.println("<div class=\"showResource\" >");
out
- .println("<div class=\"content\" style=\"
float: left; margin-left: 10px; width: 100px; \" >");
- out.println("<p>");
- out.println("<ul>");
- out
- .println("<li><a
href=\"eXistAdmin?function=collections\" >Manage Collections</a></li>");
- out
- .println("<li><a
href=\"eXistAdmin?function=users\" >Manage Users</a></li>");
+ .println("<br/><p>Welcome to the eXist
database configuration service for perfSONAR services. "
+ + login );

- out.println("</ul>");
- out.println("</p>");
- if (logged) {
- out.println("<p>");
- out.println("<form action=\"eXistAdmin\"
method=\"POST\"> ");
- out
- .println("<input type=\"submit\"
name=\"logout\" value=\"LogOut\" >");
- out.println("</form>");
- out.println("</p>");
- }
- out.println("</div>");
-
- out.println("<div class=\"content\" "
- + "style=\" float: left; margin-left: 80px;
\" >");
- out
- .println("<p style=\" font-size=140% \" >
Welcome to the eXist database configuration service for perfSONAR services"
- + login + "</p>");
-
if (!logged) {

- out.println("<p style=\" margin-left: 160px;
font-size=130% \">");
out.println("<form action=\"eXistAdmin\"
method=\"POST\"> ");

out.println("<table>");

- out.println("<tr>");
- out.println("<td>");
+ out.println("<tr><td>");
out
.println("Username: <input
type=\"text\" name=\"username\" value=\"\" size=20 >");
- out.println("</td>");
- out.println("</tr>");
- out.println("<tr>");
- out.println("<td>");
+ out.println("</td></tr>");
+ out.println("<tr><td>");
out
.println("Password: <input
type=\"password\" name=\"password\" value=\"\" size=20 >");
- out.println("</td>");
- out.println("</tr>");
- out.println("<tr>");
- out.println("<td>");
- out
- .println("<input type=\"submit\"
name=\"login\" value=\"login\" >");
- out.println("</td>");
- out.println("</tr>");
- out.println("</td>");
+ out.println("</td></tr>");
out.println("</table>");
+ out
+ .println("<input type=\"submit\"
name=\"login\" value=\"login\" />");
out.println("</form>");
out.println("</p>");
}
+ else{
+ out.println("</p>");
+ }

out.println("</div>");
-
+ out.println("</div>");
out.println("</body>");
out.println("</html>");
out.close();
@@ -1640,21 +1528,20 @@
private void error_message(String message, ServletOutputStream out,
boolean back) throws IOException {

- out
- .println("<div class=\"error\" style=\"
font-size: 100%; float: center; margin-left: 300px; background-color:
#6495ED; margin-right: 300px \" >");
- out
- .println("<h2 align=\"center\" >perfSONAR
Administration message</h2>");
-
- out.println("<h2 align=\"center\" >");
- out.println(message);
- out.println("</h2>");
- out.println("<p align=\"center\" > ");
+ out.println("<div class=\"info\" >");
+ out.println("<p>");
+ out.println("<h3>"+message+"</h3>");
if (back) {
+
out
.println("<a style=\" font-size: 130%
\" href=\"eXistAdmin\" \">Go Back</a>");
}
out.println("</p>");
out.println("</div>");
+ out.println("</div>");
+ out.println("</body>");
+ out.println("</html>");
+ out.close();

}

@@ -1673,22 +1560,54 @@
String manage, String collection) throws IOException {

out
- .println("<div class=\"refresh\" style=\"
font-size: 100%;float: center; margin-left: 300px; background-color: #6495ED;
margin-right: 300px \" >");
+ .println("<div class=\"info\">");
+ out.println("<p> ");
+ out.println("<h3>"+message+"</h3>");
out
- .println("<h2 align=\"center\" >perfSONAR
Administration message</h2>");
-
- out.println("<h2 align=\"center\" >");
- out.println(message);
- out.println("</h2>");
- out.println("<p align=\"center\" > ");
- out
- .println("<a style=\" font-size: 130% \"
href=\"eXistAdmin?function="
+ .println("<a href=\"eXistAdmin?function="
+ manage
+ "&ChildCollection="
+ collection
- + "\" \">Refresh</a>");
+ + "\">Refresh</a>");
out.println("</p>");
out.println("</div>");
+ out.println("</body>");
+ out.println("</html>");
+ out.close();

}
+
+ /**
+ * @param out
+ * @param logged
+ * @throws IOException
+ */
+ private void preempt(ServletOutputStream out,boolean logged) throws
IOException{
+ out.println("<html>");
+ out.println("<head><link rel=\"stylesheet\" type=\"text/css\"
href=\"default.css\">");
+ out.println("<title >");
+ out.println("perfSONAR eXist database administration page.");
+ out.println("</title>");
+ out.println("</head>");
+ out
+ .println("<body>");
+
+ out
+ .println("<div class=\"content\" >");
+ out.println("<p>");
+ out.println("<ul>");
+ out
+ .println("<li><a
href=\"eXistAdmin?function=collections\" >Manage Collections</a></li>");
+ out
+ .println("<li><a
href=\"eXistAdmin?function=users\" >Manage Users</a></li>");
+
+ if (logged) {
+ out.println("<li><a href=\"eXistAdmin?logout=LogOut\"
>Log Out</a></li>");
+ }
+ out.println("</ul>");
+ out.println("</p>");
+
+ out.println("</div>");
+
+ }
}

Modified: branches/WebAdmin/perfSONARWebAdmin/admin/service/Admin.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/admin/service/Admin.java
2008-01-02 10:45:23 UTC (rev 3174)
+++ branches/WebAdmin/perfSONARWebAdmin/admin/service/Admin.java
2008-01-03 13:11:16 UTC (rev 3175)
@@ -34,10 +34,17 @@
//
-----------------------------------------------------------------------
// class fields

- private String serviceProperties =
"/WEB-INF/classes/perfsonar/conf/service.properties";
+ //Path to service properties
+ private static final String serviceProperties =
"/WEB-INF/classes/perfsonar/conf/service.properties";

- private String log4jProperties =
"/WEB-INF/classes/perfsonar/conf/log4j.properties";
+ //Path to logging properties
+ private static final String log4jProperties =
"/WEB-INF/classes/perfsonar/conf/log4j.properties";
+
+ //Path to servlet properties
+ private static final String
ServletPropertiesPath="/WEB-INF/classes/perfsonar/conf/servlet.properties";

+ //Path to service installation directory
+ private static String servicePath=null;
//
-----------------------------------------------------------------------
// public methods

@@ -92,18 +99,18 @@
session.setMaxInactiveInterval(1800);
ServletOutputStream out = response.getOutputStream();
ServletContext sc = getServletContext();
+// Getting the service path
+ servicePath =sc.getRealPath("/") ;
ServiceProperties properties;
// Loading the servlet properties
- ServletProperties servletProperties = new
ServletPropertiesImpl(sc
- .getRealPath("/")
- +
"/WEB-INF/classes/perfsonar/conf/servlet.properties");
+ ServletProperties servletProperties = new
ServletPropertiesImpl(servicePath
+ + ServletPropertiesPath);
Authenticator authenticator = new
AuthenticatorImpl(servletProperties);
String lock = "disabled";
String filePath = "";
response.setContentType("text/html");

- // Getting the service path
- String servicePath =sc.getRealPath("/") ;
+
// Setting the path for the properties file based on the type
of
// properties file
if (session.getAttribute("propertyType") != null) {
@@ -286,25 +293,19 @@
*/
private void restart_page(ServletOutputStream out, String Type)
throws IOException {
- // TODO Auto-generated method stub
- out.println("<html>");
- out.println("<head>");
- out.println("<title >");
- out.println("perfSONAR service administration page.");
- out.println("</title>");
- out.println("<h2 align=\"center\" >perfSONAR Administration
page</h2>");
- out.println("</head>");
+
+ preempt(out);
+ out.println("<div class=\"info\" >");
+ out.println("<h3>perfSONAR Administration page</h3>");
+ out.println("<p> ");
+ out.println("<h4>");
out
- .println("<body style=\" font-family: arial;
background-color: #4E9258\" >");
- out.println("<h2 align=\"center\">");
+ .println("The properties file has been
modifyied. Please restart tomcat for any changes to take effect!</h4>");
out
- .println("The properties file has been
modifyied. Please restart tomcat for any changes to take effect! ");
- out.println("</h2>");
- out.println("<p align=\"center\" > ");
- out
- .println("<a style=\" font-size: 130% \"
href=\"/perfSONAR/ServiceAdmin?"
+ .println("<a href=\"ServiceAdmin?"
+ Type + "\">Go Back");
out.println("</p>");
+ out.println("</div>");
out.println("</body>");
out.println("</html>");
}
@@ -324,23 +325,16 @@
throws IOException {
// TODO Auto-generated method stub

- out.println("<html>");
- out.println("<head>");
- out.println("<title align=center>");
- out.println("perfSONAR service administration page.");
- out.println("</title>");
- out.println("<h2 align=\"center\" >perfSONAR Administration
page</h2>");
- out.println("</head>");
+ preempt(out);
+ out.println("<div class=\"info\" >");
+ out.println("<h3>perfSONAR Administration page</h2>");
+ out.println("<p><h4>"+error+"</h4></p>");
+ out.println("<p> ");
out
- .println("<body style=\" font-family: arial;
background-color: #4E9258\" >");
- out.println("<h2 align=\"center\" >");
- out.println(error);
- out.println("</h2>");
- out.println("<p align=\"center\" > ");
- out
- .println("<a style=\" font-size: 130% \"
href=\"/perfSONAR/ServiceAdmin?"
+ .println("<a href=\"ServiceAdmin?"
+ Type + "\">Go Back");
out.println("</p>");
+ out.println("</div>");
out.println("</body>");
out.println("</html>");
}
@@ -348,37 +342,25 @@
private void main_page(ServletOutputStream out,
ServiceProperties properties, String lock) throws
IOException {

- out.println("<html>");
- out.println("<head>");
- out.println("<title>");
- out.println("perfSONAR service.properties Administration
page");
- out.println("</title>");
- out
- .println("<h2 style=\" text-align: center \"
>perfSONAR service properties Administration page</h2>");
- out.println("</head>");
- out
- .println("<body style=\" font-family: arial;
background-color: #4E9258\" > ");
- out.println("<h3 style=\" text-align: center \" >");
- out.println("Service Properties Table");
- out.println("</h3>");
+ preempt(out);
+ out.println("<div class=\"manage\">");
+ out.println("<h3>perfSONAR service properties Administration
page</h3>");
+ out.println("<h4>Service Properties Table</h4>");
// Different output depending on the user unlocking or
locking the table
if (!lock.equals("enabled")) {
out.println("<form action=\"ServiceAdmin\"
method=\"POST\"> ");
out
- .println("<p style=\" margin-left:
160px; font-size: 130% \" ><input type=\"submit\" name=\"enable\"
value=\"Unlock\"/ > Enter username and password to unlock ");
- out.println("</p>");
+ .println("<p><input type=\"submit\"
name=\"enable\" value=\"Unlock\"/ > Enter username and password to
unlock</p>");
out.println("</form>");
} else {

- out.println("<h3 style=\" text-align: center \" >");
+ out.println("<h3>");
out
.println("Edit the right column of
the Service Properties Table and then press 'Apply'");
out.println("</h3>");
out.println("<form action=\"ServiceAdmin\"
method=\"POST\"> ");
- out.println("<p style=\" margin-left: 160px \" >");
out
- .println("<input type=\"submit\"
name=\"Lock\" value=\"Lock\"/ >");
- out.println("</p>");
+ .println("<p><input type=\"submit\"
name=\"Lock\" value=\"Lock\"/ ></p>");
out.println("</form>");

}
@@ -387,8 +369,8 @@
if (lock.equals("enabled")) {
out.println("<form action=\"ServiceAdmin\"
method=\"POST\"> ");
}
- out.println("<table align=\"center\" border=\"1\">");
- out.println("<tr bgcolor=#4CC417>");
+ out.println("<table>");
+ out.println("<tr>");
out.println("<td><b>Service Property</b></td>");
out.println("<td><b>Service Property Value</b><td>");
out.println("</tr>");
@@ -397,14 +379,14 @@
Enumeration en = properties.getProperties().keys();
while (en.hasMoreElements()) {
String property = (String) en.nextElement();
- out.println("<tr bgcolor=#4CC417>");
+ out.println("<tr>");
out.println("<td>");
out.println(property);
out.println("</td>");
- out.println("<td style=\" background-color: #FFFFFF\"
>");
- out.println("<input " + lock + " type=\"text\"
size=100 name=\""
+ out.println("<td>");
+ out.println("<input " + lock + " type=\"text\"
size=80 name=\""
+ property + "\" value=\""
- + (String)
properties.getProperty(property) + "\" ");
+ + (String)
properties.getProperty(property) + "\" />");
out.println();
out.println("</td>");
out.println("</tr>");
@@ -412,41 +394,41 @@
out.println("</table>");

if (lock.equals("enabled")) {
- out.println("<p align=\"center\" ><input " + lock
- + " type=\"submit\" name=\"store\"
value=\"Apply\"/> ");
+ out.println("<p><input " + lock
+ + " type=\"submit\" name=\"store\"
value=\"Apply\" /> ");
out.println("</form>");
- out.println("<input type=\"reset\" value=\"Cancel\"/>
");
+ out.println("<input type=\"reset\" value=\"Cancel\"
/> ");
}
out.println("</p>");
if (lock.equals("enabled")) {
// Options foa adding and deleting a property are
added
out.println("<form action=\"ServiceAdmin\"
method=\"POST\"> ");
out
- .println("<p style=\" text-align:
center; font-size: 130% \" >Add new property name to the left column and the
property value to the right column.</p>");
- out.println("<p align=\"center\" >");
+ .println("<p>Add new property name to
the left column and the property value to the right column.</p>");
+ out.println("<p>");
out.println("<table>");
- out.println("<tr style=\"font-size: 130% \">");
- out.println("<td>Property Name</td><td>Property
Value</td>");
+ out.println("<tr>");
+ out.println("<th>Property Name</th><th>Property
Value</th>");
out.println("</tr>");
out.println("<tr>");
out.println("<td>");
out
- .println("<input type=\"text\"
size=60 name=\"propertyName\" value=\" \" ");
+ .println("<input type=\"text\"
size=60 name=\"propertyName\" value=\" \" />");
out.println("</td><td>");
out
- .println("<input type=\"text\"
name=\"propertyValue\" size=100 value=\" \" ");
+ .println("<input type=\"text\"
name=\"propertyValue\" size=80 value=\" \" />");
out.println("</td>");
out.println("</tr>");
out.println("</table>");
out
.println("<input "
- + " type=\"submit\"
name=\"add\" value=\"Add property\"/> ");
+ + " type=\"submit\"
name=\"add\" value=\"Add property\" /> ");
out.println("</p>");
out.println("</form>");
out
- .println("<p style=\" text-align:
center; font-size: 130% \" >Choose a property to remove.</p>");
+ .println("<p>Choose a property to
remove.</p>");
out.println("<form action=\"ServiceAdmin\"
method=\"POST\"> ");
- out.println("<p align=\"center\">");
+ out.println("<p>");
out.println("<select name=\"property\">");
en = properties.getProperties().keys();
while (en.hasMoreElements()) {
@@ -457,14 +439,26 @@
out.println("</select>");
out
.println("<input "
- + " type=\"submit\"
name=\"remove\" value=\"Remove property\"/> ");
- out.println("</p>");
+ + " type=\"submit\"
name=\"remove\" value=\"Remove property\" /> ");
+ out.println("</p> <p/>");
out.println("</form>");
}
+ out.println("</div>");
out.println("</body>");
out.println("</html>");

}
+
+ private void preempt(ServletOutputStream out) throws IOException{
+
+ out.println("<html>");
+ out.println("<head><link rel=\"stylesheet\" type=\"text/css\"
href=\"default.css\">");
+ out.println("<title>");
+ out.println("perfSONAR service administration page.");
+ out.println("</title>");
+ out.println("</head>");
+ out.println("<body>");
+ }

/**
* Method that is used for modifying the properties file

Modified: branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
2008-01-02 10:45:23 UTC (rev 3174)
+++ branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
2008-01-03 13:11:16 UTC (rev 3175)
@@ -215,8 +215,8 @@

Iterator groupIt = Properties.keySet().iterator();
preemptModified("default.css");
+ out.println("<div class=\"top\"><br>" + message +
"</br></div>");
out.println("<div class=\"properties\">");
- out.println("<br><p>" + message + "</p>");
out.println("<form action=\"Wizard\" method=\"GET\"> ");
out
.println("<input type=\"hidden\"
name=\"function\" value=\"finish\" >");
@@ -379,9 +379,6 @@
out.println("</title>");
out.println("<body>");
out.println(getScript());
- out.println("<div align=\"top\" class=\"banner\">");
- out.println("<h1>perfSONAR</h1>");
- out.println("</div>");
out.println("<div class=\"main\">");
}

@@ -440,7 +437,7 @@
type = "password";
}
out.println("<input type=\"" + type + "\" name=\"" +
pr.getKey()
- + "\" size=60 value=\"" +
pr.getProposedValue() + " \"/>");
+ + "\" size=40 value=\"" +
pr.getProposedValue() + " \"/>");

}
out.println("</td>");


  • perfsonar: r3175 - in branches/WebAdmin: . perfSONARWebAdmin/admin/exist perfSONARWebAdmin/admin/service perfSONARWebAdmin/auxiliary/wizard, svnlog, 01/03/2008

Archive powered by MHonArc 2.6.16.

Top of Page