perfsonar-dev - perfsonar: r3244 - in branches/WebAdmin: . perfSONARWebAdmin/admin perfSONARWebAdmin/admin/exist perfSONARWebAdmin/admin/sql perfSONARWebAdmin/admin/wizard perfSONARWebAdmin/admin/wizard/services perfSONARWebAdmin/auxiliary perfSONARWebAdmin/auxiliary/sql perfSONARWebAdmin/auxiliary/wizard perfSONARWebAdmin/auxiliary/xmlDB perfSONARWebAdmin/test
Subject: perfsonar development work
List archive
perfsonar: r3244 - in branches/WebAdmin: . perfSONARWebAdmin/admin perfSONARWebAdmin/admin/exist perfSONARWebAdmin/admin/sql perfSONARWebAdmin/admin/wizard perfSONARWebAdmin/admin/wizard/services perfSONARWebAdmin/auxiliary perfSONARWebAdmin/auxiliary/sql perfSONARWebAdmin/auxiliary/wizard perfSONARWebAdmin/auxiliary/xmlDB perfSONARWebAdmin/test
Chronological Thread
- From:
- To:
- Subject: perfsonar: r3244 - in branches/WebAdmin: . perfSONARWebAdmin/admin perfSONARWebAdmin/admin/exist perfSONARWebAdmin/admin/sql perfSONARWebAdmin/admin/wizard perfSONARWebAdmin/admin/wizard/services perfSONARWebAdmin/auxiliary perfSONARWebAdmin/auxiliary/sql perfSONARWebAdmin/auxiliary/wizard perfSONARWebAdmin/auxiliary/xmlDB perfSONARWebAdmin/test
- Date: Thu, 17 Jan 2008 07:36:27 -0500
Author: michalis
Date: 2008-01-17 07:36:26 -0500 (Thu, 17 Jan 2008)
New Revision: 3244
Added:
branches/WebAdmin/perfSONARWebAdmin/admin/sql/
branches/WebAdmin/perfSONARWebAdmin/admin/sql/SQLAdmin.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/sql/
branches/WebAdmin/perfSONARWebAdmin/auxiliary/sql/HTMLOutput.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/sql/SQLDBManager.java
branches/WebAdmin/perfsonar_logo.gif
branches/WebAdmin/top_slice.gif
Modified:
branches/WebAdmin/index.html
branches/WebAdmin/main.css
branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
branches/WebAdmin/perfSONARWebAdmin/admin/wizard/ConfigurationWizard.java
branches/WebAdmin/perfSONARWebAdmin/admin/wizard/services/RRDMAHandler.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/ServletPropertiesImpl.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/WizardProperties.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/xmlDB/eXistServletPropertiesImpl.java
branches/WebAdmin/perfSONARWebAdmin/test/ExistTesterXmlRpc.java
branches/WebAdmin/perfsonar.png
Log:
Committing recent developments to the code and a few html changes
Modified: branches/WebAdmin/index.html
===================================================================
--- branches/WebAdmin/index.html 2008-01-17 11:11:33 UTC (rev 3243)
+++ branches/WebAdmin/index.html 2008-01-17 12:36:26 UTC (rev 3244)
@@ -3,35 +3,72 @@
<head>
<title>perfSONAR Service Web Administration page</title>
<link rel="stylesheet" type="text/css" href="main.css" />
- </head>
+ <meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1"><style type="text/css">
+<!--
+body,td,th {
+ font-family: arial;
+}
+a:hover {
+ color: #000000;
+}
+-->
+</style></head>
<body>
<div class="adminPanel" >
-<div class="banner"> </div>
+<div class="banner">
+<table border="0" align="left" cellpadding="0" cellspacing="0">
+<tr>
+ <td><img src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94"
border="0" align="right"></td>
+</tr>
+</table>
+</div>
+
<div class="mainWindow" >
<div class="sidebar" >
-<table>
+<table border="0" cellpadding="0" cellspacing="0">
<tr >
<th>Administration</th>
</tr>
-<tr><td><a href="Wizard" target="main" >Service Configuration
Wizard</a></td></tr>
-<tr><td><a href="ServiceAdmin?serviceProperties" target="main"
>Service.properties configuration</a></td></tr>
-<tr><td><a href="ServiceAdmin?loggingProperties" target="main"
>logging.properties configuration</a></td></tr>
-<tr><td><a href="eXistAdmin" target="main" >eXist Database
Administration</a></td></tr>
+<tr>
+ <td><p><a href="Wizard" target="main" class="navtex" >Service</a></p>
+ <p><a href="Wizard" target="main" class="navtex" >Configuration</a></p>
+ <p><a href="Wizard" target="main" class="navtex" >Wizard</a></p></td>
+</tr>
+<tr>
+ <td><p><a href="ServiceAdmin?serviceProperties" target="main"
class="navtex" >Service</a></p>
+ <p><a href="ServiceAdmin?serviceProperties" target="main" class="navtex"
>configuration</a></p></td>
+</tr>
+<tr>
+ <td>
+ <p><a href="ServiceAdmin?loggingProperties" target="main" class="navtex"
>logging</a></p>
+ <p><a href="ServiceAdmin?loggingProperties" target="main" class="navtex"
>configuration</a>
+ </p>
+ </p></td>
+</tr>
+<tr><td><p><a href="eXistAdmin" target="main" class="navtex" >eXist
Database</a></p>
+ <p><a href="eXistAdmin" target="main" class="navtex"
>Administration</a></p></td>
+</tr>
</table>
-<a href="http://www.perfsonar.net/partners.html";></a> <img alt="perfSONAR
project partners" src="partners.gif"/></a>
-</div>
+<a href="http://www.perfsonar.net/partners.html";></a> <br>
+<img src="partners.gif" alt="perfSONAR project partners" border="0"/>
</a></div>
<div class="centerWindow" >
-<object type="text/html" name="main" class="main"
data="http://www.perfsonar.net"; >
-<p>Sorry for the inconvenience we are having connectiong to the main
page...</p>
-</object>
+ <object data="http://www.perfsonar.net"; type="text/html" name="main"
width="101%" height="106%" class="main" >
+ <p>Sorry for the inconvenience we are having connectiong to the main
page...</p>
+ </object>
</div>
+
+
</div>
-<div class="footer" >PERFormance Service-Oriented Network monitoring
ARchitecture </div>
+<div class="footer" >PERFormance Service-Oriented Network monitoring
ARchitecture </div>
+
+
+
+
</div>
Modified: branches/WebAdmin/main.css
===================================================================
--- branches/WebAdmin/main.css 2008-01-17 11:11:33 UTC (rev 3243)
+++ branches/WebAdmin/main.css 2008-01-17 12:36:26 UTC (rev 3244)
@@ -19,22 +19,30 @@
}
.adminPanel{
-
- width: 80%;
+ width: 90%;
height: 60%;
float:left;
- margin-left: 10%;
- margin-right: 10%;
+ margin-left: 5%;
+ margin-right: 5%;
background-color: #ffffff;
-
-
+ margin-bottom: 2%;
}
+.navtex {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ color: #666666;
+ text-align: right;
+ font-style: normal;
+ font-weight: normal;
+}
+
.banner{
- margin: 5px;
- width: 99%;
- height: 100px ;
- background-image: url('perfsonar.png');
+ margin: 5px;
+ width: 99%;
+ height: 94px;
+ background-image: url(top_slice.gif);
+ background-color: #FFFFFF;
}
@@ -48,50 +56,58 @@
.sidebar{
- margin: 5px;
- width: 15%;
- height: 300px;
+ width: 15%;
+ height: 300px;
padding-bottom: 250px;
padding-right: 0px;
float: left;
- border-right: thin solid #B0C4DE;
-
+ border-right-width: 1px;
+ border-right-style: solid;
+ border-right-color: #61AF61;
+ margin-top: 0px;
+ margin-right: 5px;
+ margin-bottom: 5px;
+ margin-left: 5px;
}
.sidebar th{
color: #ffffff;
- text-align: right;
- border-bottom: thin solid #B0C4DE;
- background-color: green;
+ text-align: right;
+ background-color: #61AF61;
padding: 10px;
+ right: 0px;
+ width: 15%;
}
.sidebar td{
color: #000000;
- text-align: right;
- border-bottom: thin solid #B0C4DE;
- background-color: #ffffff;
+ text-align: right;
+ background-color: #ffffff;
padding: 10px;
-
+ border-bottom-width: 1px;
+ border-bottom-style: dotted;
+ border-bottom-color: #92C992;
}
.sidebar a{
text-decoration: none;
- color: #000000;
- font-weight: bold;
- padding: 10px;
-
+ font-weight: normal;
+ padding: 0px;
}
.sidebar img{
- float: right;
- border: none;
- width: 120px;
- height: 60px;
+ float: none;
+ border: none;
+ width: 120px;
+ height: 60px;
+ padding-top: 40px;
+ padding-right: 0px;
+ padding-bottom: 0px;
+ padding-left: 15px;
}
.centerWindow{
- float: left;
- width: 83% ;
- height: 500px;
- background-color: #ffffff;
+ width: 83%;
+ height: 500px;
+ background-color: #ffffff;
+ float: left;
}
@@ -103,13 +119,58 @@
}
.footer{
- margin: 0px;
+ height: 30px;
+ text-align: right;
+ color: #61AF61;
+ background-color: #ffffff;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ border-top-width: 1px;
+ border-top-style: dotted;
+ border-top-color: #61AF61;
+ padding-top: 5px;
width: 100%;
- height: 20px ;
- border-top: thin solid #B0C4DE;
+ border-right-style: none;
+ border-right-color: #FFFFFF;
+ border-left-color: #FFFFFF;
+.footermain {
+ height: 20px;
text-align: right;
- color: Gray;
+ color: #61AF61;
background-color: #ffffff;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ border-top-width: 1px;
+ border-top-style: dotted;
+ border-top-color: #61AF61;
+ padding-top: 5px;
+ width: 100%;
+ border-right-style: none;
+ border-right-color: #FFFFFF;
+ border-left-color: #FFFFFF;
}
+.footermain {
+ height: 20px;
+ text-align: right;
+ color: #61AF61;
+ background-color: #ffffff;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ width: 100%;
-
+.footermain {
+ height: 20px;
+ text-align: right;
+ color: #61AF61;
+ background-color: #ffffff;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ border-top-width: 1px;
+ border-top-style: dotted;
+ border-top-color: #61AF61;
+ padding-top: 5px;
+ width: 100%;
+ border-right-style: none;
+ border-right-color: #FFFFFF;
+ border-left-color: #FFFFFF; padding: 5px;
+}
Modified: branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
2008-01-17 11:11:33 UTC (rev 3243)
+++ branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
2008-01-17 12:36:26 UTC (rev 3244)
@@ -57,9 +57,13 @@
private static final String confPath =
"/WEB-INF/classes/perfsonar/conf/";
// The path to the exist properties
- private static final String existProperties = confPath
+ private static final String servicePropertiesPath = confPath
+ "service.properties";
+// The path to the exist properties
+ private static final String servletPropertiesPath = confPath
+ + "servlet.properties";
+
// The driver to use for connecting to exist
public static final String driver = "org.exist.xmldb.DatabaseImpl";
@@ -89,11 +93,11 @@
super.init(config);
ServletContext sc = getServletContext();
- servicePath = sc.getRealPath("/");
+ servicePath = sc.getRealPath("/");
// Loading servlet properties and initializing authenticator
try {
servletProperties = new
eXistServletPropertiesImpl(servicePath
- + existProperties);
+ +
servletPropertiesPath,servicePath+servicePropertiesPath);
authenticator = new
existAuthenticatorImpl("xmldb:exist://"
+
servletProperties.getModDBLocation(), servletProperties
.getAdminPassword());
@@ -136,7 +140,7 @@
HttpSession session = request.getSession(true);
ServletOutputStream out = response.getOutputStream();
servletProperties = new eXistServletPropertiesImpl(servicePath
- + existProperties);
+ +
servletPropertiesPath,servicePath+servicePropertiesPath);
// Set the inactive interval for this session
if (session.isNew())
session.setMaxInactiveInterval(1800);
@@ -1024,12 +1028,15 @@
.nextElement();
if (netface.getName().equals("eth0")) {
Enumeration e2 =
netface.getInetAddresses();
- if (e2.hasMoreElements()) {
+ while (e2.hasMoreElements()) {
e2.nextElement();
InetAddress ip =
(InetAddress) e2.nextElement();
+ String[]
pieces=location.split(":");
+ if(pieces.length==2){
location = ip.getHostAddress()
+
location.substring(location
.indexOf(":"));
+ }
}
}
@@ -1495,7 +1502,6 @@
private void login_page(ServletOutputStream out, boolean logged)
throws IOException {
String login = "";
- ;
if (!logged) {
login = "Please login in order to make
modifications.";
}
Added: branches/WebAdmin/perfSONARWebAdmin/admin/sql/SQLAdmin.java
Property changes on:
branches/WebAdmin/perfSONARWebAdmin/admin/sql/SQLAdmin.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified:
branches/WebAdmin/perfSONARWebAdmin/admin/wizard/ConfigurationWizard.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/admin/wizard/ConfigurationWizard.java
2008-01-17 11:11:33 UTC (rev 3243)
+++ branches/WebAdmin/perfSONARWebAdmin/admin/wizard/ConfigurationWizard.java
2008-01-17 12:36:26 UTC (rev 3244)
@@ -670,7 +670,7 @@
manager.modifyUser("admin", newAdminPass, null, null);
eXistServletProperties pr = new
eXistServletPropertiesImpl(
- ServicePath + ServletPropertiesPath);
+ ServicePath +
ServletPropertiesPath,ServicePath+ServicePropertiesPath);
pr.setAdminPassword(newAdminPass);
if (modExistURI.startsWith("localhost")
||
modExistURI.startsWith("127.0.0.1")) {
Modified:
branches/WebAdmin/perfSONARWebAdmin/admin/wizard/services/RRDMAHandler.java
===================================================================
---
branches/WebAdmin/perfSONARWebAdmin/admin/wizard/services/RRDMAHandler.java
2008-01-17 11:11:33 UTC (rev 3243)
+++
branches/WebAdmin/perfSONARWebAdmin/admin/wizard/services/RRDMAHandler.java
2008-01-17 12:36:26 UTC (rev 3244)
@@ -369,7 +369,7 @@
// Update exist group properties
groupedProperties.put("eXist", existProperties);
try {
- // Using the serviceProperties class for
xetting the property
+ // Using the serviceProperties class for
setting the property
ServiceProperties serviceProperties;
serviceProperties = new
ServicePropertiesImpl(ServicePath
@@ -416,11 +416,6 @@
// group properties are used as input
existActions(existProperties);
done = true;
- /*
- * File wizardFile= new
File(ServicePath+WizardPropertiesPath);
- * FileOutputStream out= new
FileOutputStream(wizardFile);
- * properties.storeToXML(out,""); out.close();
- */
} catch (Exception e) {
// Set doen to false if anything happens
done = false;
Modified:
branches/WebAdmin/perfSONARWebAdmin/auxiliary/ServletPropertiesImpl.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/auxiliary/ServletPropertiesImpl.java
2008-01-17 11:11:33 UTC (rev 3243)
+++ branches/WebAdmin/perfSONARWebAdmin/auxiliary/ServletPropertiesImpl.java
2008-01-17 12:36:26 UTC (rev 3244)
@@ -82,23 +82,6 @@
return (String) servletProperties.get("servlet.service_type");
}
- public static void main(String argv[]) {
- ServletPropertiesImpl servletProperties;
- try {
- servletProperties = new
ServletPropertiesImpl("servlet.properties");
- System.out.println(servletProperties.getPassword() +
" "
- + servletProperties.getUserName() + "
"
- +
servletProperties.getServiceLocation());
- } catch (FileNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- }
-
/*
* (non-Javadoc)
*
@@ -143,4 +126,21 @@
out.close();
}
+
+ public static void main(String argv[]) {
+ ServletPropertiesImpl servletProperties;
+ try {
+ servletProperties = new
ServletPropertiesImpl("servlet.properties");
+ System.out.println(servletProperties.getPassword() +
" "
+ + servletProperties.getUserName() + "
"
+ +
servletProperties.getServiceLocation());
+ } catch (FileNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ }
}
Added: branches/WebAdmin/perfSONARWebAdmin/auxiliary/sql/HTMLOutput.java
Property changes on:
branches/WebAdmin/perfSONARWebAdmin/auxiliary/sql/HTMLOutput.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: branches/WebAdmin/perfSONARWebAdmin/auxiliary/sql/SQLDBManager.java
Property changes on:
branches/WebAdmin/perfSONARWebAdmin/auxiliary/sql/SQLDBManager.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified:
branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/WizardProperties.java
===================================================================
---
branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/WizardProperties.java
2008-01-17 11:11:33 UTC (rev 3243)
+++
branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/WizardProperties.java
2008-01-17 12:36:26 UTC (rev 3244)
@@ -338,7 +338,6 @@
}
properties.put(pr.getKey(), pr);
- System.out.println(pr.getOrder());
orderedProperties.put(pr.getOrder(),
pr.getKey());
this.put(pr.getKey(), pr.getValue());
Modified:
branches/WebAdmin/perfSONARWebAdmin/auxiliary/xmlDB/eXistServletPropertiesImpl.java
===================================================================
---
branches/WebAdmin/perfSONARWebAdmin/auxiliary/xmlDB/eXistServletPropertiesImpl.java
2008-01-17 11:11:33 UTC (rev 3243)
+++
branches/WebAdmin/perfSONARWebAdmin/auxiliary/xmlDB/eXistServletPropertiesImpl.java
2008-01-17 12:36:26 UTC (rev 3244)
@@ -4,7 +4,6 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Calendar;
-import java.util.Iterator;
import java.util.Properties;
/**
@@ -20,8 +19,12 @@
private String servletPropertiesFile;
+ private String servicePropertiesFile;
+
private Properties servletProperties;
+ private Properties serviceProperties;
+
private String DBLocation;
private String DBLocationKey;
@@ -42,31 +45,28 @@
* The properties file
* @throws IOException
*/
- public eXistServletPropertiesImpl(String propertiesFile) throws
IOException {
+ public eXistServletPropertiesImpl(String propertiesFile,
+ String servPropertiesFile) throws IOException {
servletProperties = new Properties();
+ serviceProperties = new Properties();
servletPropertiesFile = propertiesFile;
+ servicePropertiesFile = servPropertiesFile;
FileInputStream in = new
FileInputStream(servletPropertiesFile);
servletProperties.load(in);
- Iterator it = servletProperties.keySet().iterator();
- while (it.hasNext()) {
+ FileInputStream ins = new
FileInputStream(servicePropertiesFile);
+ serviceProperties.load(ins);
+ DBLocationKey = servletProperties
+
.getProperty("servlet.exist_location.property");
+ DBLocation = serviceProperties.getProperty(DBLocationKey);
+ ModDBLocation =
DBLocation.substring(DBLocation.indexOf("://") + 3,
+ DBLocation.indexOf("/xmlrpc") + 7);
+ AdminPassKey = servletProperties
+
.getProperty("servlet.exist_adminpass.property");
+ AdminPassword = serviceProperties.getProperty(AdminPassKey);
- String key = (String) it.next();
-
- if (key.endsWith("xmldb.db_uri")) {
- DBLocationKey = key;
- DBLocation =
servletProperties.getProperty(key);
- ModDBLocation = DBLocation.substring(
- DBLocation.indexOf("://") +
3, DBLocation
-
.indexOf("/xmlrpc") + 7);
-
- }
- if (key.endsWith("xmldb.db_adminpassword")) {
- AdminPassKey = key;
- AdminPassword =
servletProperties.getProperty(key);
- }
- }
in.close();
+ ins.close();
}
/*
@@ -104,7 +104,7 @@
*/
public void setDBLocation(String location) {
- servletProperties.setProperty(DBLocationKey, location);
+ serviceProperties.setProperty(DBLocationKey, location);
}
@@ -125,7 +125,7 @@
*/
public void setAdminPassword(String password) throws IOException {
- servletProperties.setProperty(AdminPassKey, password);
+ serviceProperties.setProperty(AdminPassKey, password);
}
/*
@@ -136,7 +136,7 @@
public void store() throws IOException {
FileOutputStream out = new
FileOutputStream(servletPropertiesFile);
- servletProperties.store(out, "Modified at "
+ serviceProperties.store(out, "Modified at "
+
Calendar.getInstance().getTime().toString());
}
}
Modified: branches/WebAdmin/perfSONARWebAdmin/test/ExistTesterXmlRpc.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/test/ExistTesterXmlRpc.java
2008-01-17 11:11:33 UTC (rev 3243)
+++ branches/WebAdmin/perfSONARWebAdmin/test/ExistTesterXmlRpc.java
2008-01-17 12:36:26 UTC (rev 3244)
@@ -13,6 +13,8 @@
import perfSONARWebAdmin.auxiliary.wizard.WizardProperties;
import perfSONARWebAdmin.auxiliary.xmlDB.XMLDocument;
+import perfSONARWebAdmin.auxiliary.xmlDB.eXistServletProperties;
+import perfSONARWebAdmin.auxiliary.xmlDB.eXistServletPropertiesImpl;
import perfSONARWebAdmin.auxiliary.xmlDB.xmlDBCollection;
import perfSONARWebAdmin.auxiliary.xmlDB.xmlDBCollectionImpl;
import perfSONARWebAdmin.auxiliary.xmlDB.xmlDBManager;
@@ -34,12 +36,14 @@
e.printStackTrace();
}*/
try {
- xmlDBManager manager= new
xmlDBManagerImpl("192.168.10.86:8080/exist/xmlrpc","admin","perfsonar");
+ eXistServletProperties pr=new
eXistServletPropertiesImpl("servlet.properties","service.properties");
+ System.out.println(pr.getAdminPassword()+"
"+pr.getDBLocation());
+ //xmlDBManager manager= new
xmlDBManagerImpl("192.168.10.86:8080/exist/xmlrpc","admin","perfsonar");
- xmlDBCollection root = manager.getCollection(null);
- System.out.println(root.getName());
- manager.createCollection("mike");
+ // xmlDBCollection root = manager.getCollection(null);
+ // System.out.println(root.getName());
+ // manager.createCollection("mike");
// String[] collections=manager.getCollections();
// for(int i=0;i<collections.length;i++){
//System.out.println(collections[i]);
@@ -144,11 +148,11 @@
//System.out.println(mike.getPermissions());
//service.chmod(manager.getCollection("mike").getCollection(), 755);
- int k=0;
- k |=4;
- k |=2;
- k|=1;
- int o= 3|5;
+ //int k=0;
+ //k |=4;
+ //k |=2;
+ //k|=1;
+ //int o= 3|5;
//System.out.println(k+" "+o);
//System.out.println("mike");
Modified: branches/WebAdmin/perfsonar.png
===================================================================
(Binary files differ)
Added: branches/WebAdmin/perfsonar_logo.gif
Property changes on: branches/WebAdmin/perfsonar_logo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/WebAdmin/top_slice.gif
Property changes on: branches/WebAdmin/top_slice.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
- perfsonar: r3244 - in branches/WebAdmin: . perfSONARWebAdmin/admin perfSONARWebAdmin/admin/exist perfSONARWebAdmin/admin/sql perfSONARWebAdmin/admin/wizard perfSONARWebAdmin/admin/wizard/services perfSONARWebAdmin/auxiliary perfSONARWebAdmin/auxiliary/sql perfSONARWebAdmin/auxiliary/wizard perfSONARWebAdmin/auxiliary/xmlDB perfSONARWebAdmin/test, svnlog, 01/17/2008
Archive powered by MHonArc 2.6.16.