perfsonar-dev - perfsonar: r3675 - in trunk/geant2_java-sql-ma: ant conf conf/axis-1.4 conf/axis-1.4/graphics
Subject: perfsonar development work
List archive
perfsonar: r3675 - in trunk/geant2_java-sql-ma: ant conf conf/axis-1.4 conf/axis-1.4/graphics
Chronological Thread
- From:
- To:
- Subject: perfsonar: r3675 - in trunk/geant2_java-sql-ma: ant conf conf/axis-1.4 conf/axis-1.4/graphics
- Date: Tue, 15 Apr 2008 09:19:18 -0400
Author: roman
Date: 2008-04-15 09:19:18 -0400 (Tue, 15 Apr 2008)
New Revision: 3675
Added:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/Thumbs.db
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/admin_home_target.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/apply_button.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/apply_button_2.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/arrow_icon.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/arrow_icon2.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/button_1_large.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/button_1_small.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/button_2_large.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/button_2_small.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/cancel_button.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/create_resource_button.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/delete_red_button.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/edit_button.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/edit_green_button.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/login_panel.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/logos.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/logout_button.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/manage_collections_off_tab.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/manage_collections_on_tab.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/manage_users_off_tab.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/manage_users_on_tab.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/step_1_bottom.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/step_1_slice.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/step_1_top.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/step_2_bottom.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/step_2_slice.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/step_2_top.gif
Removed:
trunk/geant2_java-sql-ma/conf/axis-1.4/stemb.gif
trunk/geant2_java-sql-ma/conf/axis-1.4/stemt.gif
Modified:
trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml
trunk/geant2_java-sql-ma/ant/const.properties.template
trunk/geant2_java-sql-ma/ant/libs-download-targets.xml
trunk/geant2_java-sql-ma/ant/webapp-package-targets.xml
trunk/geant2_java-sql-ma/conf/axis-1.4/Service_Admin.js
trunk/geant2_java-sql-ma/conf/axis-1.4/default.css
trunk/geant2_java-sql-ma/conf/axis-1.4/index.html
trunk/geant2_java-sql-ma/conf/axis-1.4/main.css
trunk/geant2_java-sql-ma/conf/axis-1.4/welcome.htm
trunk/geant2_java-sql-ma/conf/service.properties.template-2
trunk/geant2_java-sql-ma/conf/wizard.properties
Log:
Use of new web admin library (0.8.3b) that includes changes needed for the
wizard. The wizard now contains also AuthN part.
Modified: trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml 2008-04-15
12:19:09 UTC (rev 3674)
+++ trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml 2008-04-15
13:19:18 UTC (rev 3675)
@@ -46,7 +46,7 @@
depends="copy-dep-base-service-jars">
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080310/perfsonar-base-1.0.20080310.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8b/perfsonar-web-admin-0.8b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
@@ -289,7 +289,7 @@
<copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080310/perfsonar-base-1.0.20080310.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8b/perfsonar-web-admin-0.8b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"
todir="${tmpdir}/WEB-INF/lib"/>
Modified: trunk/geant2_java-sql-ma/ant/const.properties.template
===================================================================
--- trunk/geant2_java-sql-ma/ant/const.properties.template 2008-04-15
12:19:09 UTC (rev 3674)
+++ trunk/geant2_java-sql-ma/ant/const.properties.template 2008-04-15
13:19:18 UTC (rev 3675)
@@ -11,10 +11,10 @@
service.name=geant2_java-sql-ma
jarfilename=perfsonar-sql-ma
-version=2.0rc4
+version=2.0rc6
-exist.war.file=exist-1.0.1.war
-exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&version=1.0.1
+exist.war.file=exist-1.1.1-newcore.war
+exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&version=1.1.1
wsdd.file.deploy=service-deploy.wsdd
wsdd.file.undeploy=service-undeploy.wsdd
Modified: trunk/geant2_java-sql-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-sql-ma/ant/libs-download-targets.xml 2008-04-15
12:19:09 UTC (rev 3674)
+++ trunk/geant2_java-sql-ma/ant/libs-download-targets.xml 2008-04-15
13:19:18 UTC (rev 3675)
@@ -55,7 +55,7 @@
<artifact:dependencies>
<dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080310"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.8b"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.8.3b"/>
<dependency groupId="perfsonar" artifactId="perfsonar-rrd-ma"
version="3.0rc2"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20071008"/>
Modified: trunk/geant2_java-sql-ma/ant/webapp-package-targets.xml
===================================================================
--- trunk/geant2_java-sql-ma/ant/webapp-package-targets.xml 2008-04-15
12:19:09 UTC (rev 3674)
+++ trunk/geant2_java-sql-ma/ant/webapp-package-targets.xml 2008-04-15
13:19:18 UTC (rev 3675)
@@ -81,7 +81,7 @@
<!-- copy jar files -->
<copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080310/perfsonar-base-1.0.20080310.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8b/perfsonar-web-admin-0.8b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"
todir="${tmpdir}/WEB-INF/lib"/>
Modified: trunk/geant2_java-sql-ma/conf/axis-1.4/Service_Admin.js
===================================================================
--- trunk/geant2_java-sql-ma/conf/axis-1.4/Service_Admin.js 2008-04-15
12:19:09 UTC (rev 3674)
+++ trunk/geant2_java-sql-ma/conf/axis-1.4/Service_Admin.js 2008-04-15
13:19:18 UTC (rev 3675)
@@ -17,6 +17,8 @@
function FloatPosition(){
var ns = (navigator.appName.indexOf("Netscape") != -1);
+ var x = screen.width;
+ var y = screen.height;
var button = document.getElementById("Button");
var reset_button = document.getElementById("ResetButton");
if (reset_button) {
@@ -24,16 +26,25 @@
var offset = reset_button.parentNode.offsetLeft;
var leftoffset = parent
if (reset_button != null) {
- reset_button.style.top = 96 + '%';
- reset_button.style.left = 85+ '%';
- //reset_button.style.top = (innerHeight - 28) + 'px';
- //reset_button.style.left = (offset + width - 53 - 68) + 'px';
+ if (y == 768) {
+ reset_button.style.top = 95 + '%';
+ reset_button.style.left = 83 + '%';
+ }
+ else {
+ //alert("Not 768 "+x);
+ reset_button.style.top = 95 + '%';
+ reset_button.style.left = 67 + '%';
+ }
}
if (button != null) {
- button.style.top = 96 + '%';
- button.style.left = 91.5+ '%';
- // button.style.top = (innerHeight - 28) + 'px';
- // button.style.left = (offset + width - 55) + 'px';
+ if (y == 768) {
+ button.style.top = 95 + '%';
+ button.style.left = 91.5 + '%';
+ }
+ else {
+ button.style.top = 95 + '%';
+ button.style.left = 74 + '%';
+ }
}
}
Modified: trunk/geant2_java-sql-ma/conf/axis-1.4/default.css
===================================================================
--- trunk/geant2_java-sql-ma/conf/axis-1.4/default.css 2008-04-15 12:19:09
UTC (rev 3674)
+++ trunk/geant2_java-sql-ma/conf/axis-1.4/default.css 2008-04-15 13:19:18
UTC (rev 3675)
@@ -20,6 +20,7 @@
.top {
display: block;
font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
color: #468C46;
margin: 0% 1% 0 1%;
border-bottom: 1px dotted #468C46;
@@ -34,12 +35,14 @@
.properties {
font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
padding: 10px;
margin: 0% 1% 0 1%;
}
.properties p {
- font-size: 120%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}
.properties table {
@@ -49,6 +52,8 @@
.properties td {
padding: 15px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}
.properties em {
@@ -58,8 +63,8 @@
}
.info_wizard {
- font-family: erdana, Arial, Helvetica, sans-serif;
- font-size: 100%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
color: #468C46;
}
@@ -68,64 +73,93 @@
/* General Purpose CSS*/
.welcometextlavender {
font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 110%;
+ font-size: 13px;
font-weight: bold;
color: #4169E1;
- font-weight: bold;
border-bottom-width: 1px;
border-bottom-style: dotted;
border-bottom-color: #4169E1;
clip: rect( auto, auto, auto, auto );
- margin-left: 1%;
+ margin-left: 0%;
}
+.formated_text {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
.blueheader {
text-align: left;
color: #4169E1;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}
.info {
font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 100%;
+ font-size: 13px;
color: #4169E1;
+ float: none;
margin: 0% 0% 0% 1%;
}
.info p {
+ float: none;
+ text-align: justify;
}
.lightgrey {
background-color: #f1f3f1;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
}
.lightgrey td {
- padding: 8px
+ padding: 5px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
}
.darkgrey {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
background-color: #e1e5e1;
}
.darkgrey td {
- padding: 8px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ padding: 5px;
}
.hilighted {
color: #4169E1;
border-bottom: 1px solid #4169E1;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}
.underlined {
border-bottom: 1px solid #4169E1;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}
.tablessContent {
- margin: 2% 1% 0 1%;
+ margin: 2% 0 0 0.3%;
background: #ffffff;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}
+.input_style_blue {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+}
+
.headerlavender {
font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
background-color: #A0A0D8;
margin-right: 0px;
margin-left: 0px;
@@ -133,9 +167,9 @@
}
/*eXist Admin CSS*/
.content {
- font-family: arial;
- font-size: 120%;
- margin: 2% 1% 0 1%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ margin: 2% 0% 0 0%;
background: #ffffff;
}
@@ -157,15 +191,17 @@
.manage_exist {
background: #ffffff;
- margin: 0% 1% 0% 0%;
+ margin: 0% 0% 0% 0%;
padding: 0px;
}
.showResource {
- font-weight: bold;
+ float: none;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
text-indent: 0%;
margin-top: 5px;
- margin-left: 1%;
+ margin-left: 0.3%;
padding: 0px;
text-align: inherit;
}
@@ -174,10 +210,13 @@
left: -100px;
position: static;
margin-top: 0px;
+ border-spacing: 1px 0px;
}
.showResource th {
padding: 10px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
background-color: #C7C7F2;
}
@@ -187,23 +226,15 @@
.showResource p {
font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 100%;
+ font-size: 13px;
border: none;
padding: 5px;
- margin: 0% 4% 0% 0%;
+ margin: 0% 0% 0% 0%;
}
-#exist_text {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- text-align: left;
- font-size: 100%;
- border: none;
- margin: 0% 3% 0% 0%;
-}
-
.exist_welcome_text {
font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 100%;
+ font-size: 13px;
font-weight: bold;
padding: 5px;
color: #4169E1;
@@ -212,13 +243,13 @@
border-bottom-style: dotted;
border-bottom-color: #4169E1;
clip: rect( auto, auto, auto, auto );
- margin-left: 1%;
+ margin-left: 0%;
}
.input {
padding: 1em;
- font-size: 110%;
- font-family: arial;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}
.input_style {
@@ -228,15 +259,16 @@
}
.login_table {
- background-color: #E6E6FA;
-
+ background-color: #E6E6FA;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}
-.login_table td{
- font-weight:bold;
+.login_table td {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}
-
.logout {
margin-top: 10px;
margin-left: 48%;
@@ -260,15 +292,21 @@
.input_table {
border: 1px solid #4169E1;
border-spacing: 0px 1px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}
.input_table td {
padding: 5px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}
.input_table th {
padding: 5px;
text-align: left;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}
/*Exist Buttons CSS*/
.collections_option_on a {
@@ -324,12 +362,13 @@
height: 28px;
margin: 0;
padding: 0;
- border:0px;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 80%;
+ border: 0px;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
font-weight: bold;
- text-align:center;
- clip: rect(auto,auto,auto,auto);
+ text-align: center;
+ clip: rect( auto, auto, auto, auto );
+ cursor: pointer;
background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
float: left;
}
@@ -337,17 +376,19 @@
.edit_button_res {
display: block;
margin-top: 5px;
+ margin-left: 0px;
width: 120px;
height: 28px;
float: left;
- outline: none;
+ outline: none;
border: none;
- text-align: center;
+ text-align: center;
font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 70%;
+ font-size: 90%;
font-weight: bold;
text-decoration: none;
- background:url(graphics/button_1_large.gif) no-repeat center;
+ background: url(graphics/button_1_large.gif) no-repeat center;
+ cursor: pointer;
}
.create_button_res {
@@ -357,10 +398,11 @@
height: 28px;
float: left;
border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 70%;
- font-weight:600;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
text-decoration: none;
+ cursor: pointer;
background: transparent url(graphics/button_1_large.gif) no-repeat
center;
}
@@ -369,12 +411,13 @@
margin-top: 5px;
width: 120px;
height: 28px;
- float: left;
+ float: none;
border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 70%;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
font-weight: 600;
text-decoration: none;
+ cursor: pointer;
background: transparent url(graphics/button_1_large.gif) no-repeat
center top;
}
@@ -384,9 +427,10 @@
margin: 0;
border: 0;
padding: 0;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 70%;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
font-weight: 600;
+ cursor: pointer;
background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
float: left;
}
@@ -397,49 +441,56 @@
margin: 0;
border: 0;
padding: 0;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 70%;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
font-weight: 600;
+ cursor: pointer;
background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
float: left;
}
-.execute_button_users{
- width: 54px;
+
+.execute_button_users {
+ width: 54px;
height: 28px;
margin: 0;
border: 0;
padding: 0;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 70%;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
font-weight: 600;
+ cursor: pointer;
background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
float: right;
}
/*Properties CSS */
.groupheading {
font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 10px;
color: #468C46;
}
.manage {
background: #ffffff;
- margin: 0 1% 0 1%;
+ margin: 0 0.3% 0 0.3%;
padding: 0px;
}
.manage table {
- padding: 10px;
+ padding: 3px;
border-spacing: 1px 0px;
}
.manage th {
- padding: 10px;
+ padding-top: 8px;
+ padding-bottom: 8px;
+ padding-left: 5px;
text-align: left;
}
.manage td {
- padding: 10px;
+ padding-top: 8px;
+ padding-bottom: 8px;
+ padding-left: 5px;
}
/*Properties Buttons CSS*/
.floatResetButton {
@@ -450,6 +501,7 @@
padding: 0;
border: 0;
text-indent: -1000em;
+ cursor: pointer;
background: transparent url(graphics/cancel_button.gif) no-repeat center
top;
float: right;
}
@@ -462,6 +514,7 @@
border: 0;
padding: 0;
text-indent: -1000em;
+ cursor: pointer;
background: transparent url(graphics/apply_button_2.gif) no-repeat
center top;
float: right;
}
@@ -473,94 +526,115 @@
border: 0;
padding: 0;
text-indent: -1000em;
+ cursor: pointer;
background: transparent url(graphics/apply_button.gif) no-repeat center
top;
- float: left;
+ float: none;
}
/* SQLMA Admin CSS*/
.manage_slqma {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
margin: 0% 1% 0% 1%;
}
.Options {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
margin: 0% 1% 0% 1%;
}
#options {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
margin: 0% 1% 0% 1%;
}
-
#EditFile {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
margin: 0% 1% 0% 1%;
- float:none;
+ float: none;
}
#CreateNewFile {
margin: 0% 1% 0% 1%;
- float:none;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ float: none;
}
-.execute_button_sqlma{
-
- display: block;
+
+.execute_button_sqlma {
+ display: block;
margin-top: 5px;
width: 120px;
height: 28px;
float: left;
border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 70%;
- font-weight:600;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
text-decoration: none;
+ cursor: pointer;
background: transparent url(graphics/button_1_large.gif) no-repeat
center;
}
-.execute_button_sqlma_small{
-
- display: block;
+.execute_button_sqlma_small {
+ display: block;
margin-top: 5px;
width: 54px;
height: 28px;
float: left;
border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 70%;
- font-weight:600;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
text-decoration: none;
+ cursor: pointer;
background: transparent url(graphics/button_1_small.gif) no-repeat
center;
}
-.execute_button_sqlma_large{
-
- display: block;
+
+.execute_button_sqlma_large {
+ display: block;
margin-top: 5px;
width: 120px;
height: 28px;
float: left;
border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 70%;
- font-weight:600;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
text-decoration: none;
+ cursor: pointer;
background: transparent url(graphics/button_1_large.gif) no-repeat
center;
}
+
.sqlmaheader {
- margin-left:1%;
+ margin-left: 1%;
color: #4169E1;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 13px;
}
-init_table{
- margin-left:1%;
- float:left;
+
+init_table {
+ margin-left: 1%;
+ float: left;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 13px;
}
-.init_table td{
- padding:8px;
- text-align:left;
- font-family: Helvetica, Calibri, Arial, sans-serif;
+.init_table td {
+ padding: 8px;
+ text-align: left;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 13px;
}
-.init_table th{
- padding:8px;
- text-align:left;
- color:#4169E1;
- font-family: Helvetica, Calibri, Arial, sans-serif;
+
+.init_table th {
+ padding: 8px;
+ text-align: left;
+ color: #4169E1;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 13px;
}
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/Thumbs.db
Property changes on: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/Thumbs.db
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/admin_home_target.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/admin_home_target.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/apply_button.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/apply_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/apply_button_2.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/apply_button_2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/arrow_icon.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/arrow_icon.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/arrow_icon2.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/arrow_icon2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/button_1_large.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/button_1_large.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/button_1_small.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/button_1_small.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/button_2_large.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/button_2_large.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/button_2_small.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/button_2_small.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/cancel_button.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/cancel_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/create_resource_button.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/create_resource_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/delete_red_button.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/delete_red_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/edit_button.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/edit_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/edit_green_button.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/edit_green_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/login_panel.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/login_panel.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/logos.gif
Property changes on: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/logos.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/logout_button.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/logout_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/manage_collections_off_tab.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/manage_collections_off_tab.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/manage_collections_on_tab.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/manage_collections_on_tab.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/manage_users_off_tab.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/manage_users_off_tab.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/manage_users_on_tab.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/manage_users_on_tab.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/step_1_bottom.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/step_1_bottom.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/step_1_slice.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/step_1_slice.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/step_1_top.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/step_1_top.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/step_2_bottom.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/step_2_bottom.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/step_2_slice.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/step_2_slice.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/step_2_top.gif
Property changes on:
trunk/geant2_java-sql-ma/conf/axis-1.4/graphics/step_2_top.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/geant2_java-sql-ma/conf/axis-1.4/index.html
===================================================================
--- trunk/geant2_java-sql-ma/conf/axis-1.4/index.html 2008-04-15 12:19:09
UTC (rev 3674)
+++ trunk/geant2_java-sql-ma/conf/axis-1.4/index.html 2008-04-15 13:19:18
UTC (rev 3675)
@@ -10,33 +10,39 @@
}
.style3 {
- color: #8585c1
+ color: #8585c1;
+ font-size: 13px;
}
- .style3 a:link {
- color: #8585C1;
- cursor: pointer;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-.style3 a:active {
- color: #117721;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- font-weight: bold;
-}
-.style3 a:visited {
- color: #8585C1;
- cursor: auto;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-.style3 a:hover {
- color: #8585C1;
- cursor: pointer;
- text-decoration: underline;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
+
+ .style3 a:link {
+ color: #8585C1;
+ cursor: pointer;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ }
+
+ .style3 a:active {
+ color: #117721;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ }
+
+ .style3 a:visited {
+ color: #8585C1;
+ cursor: auto;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ /*font-weight: bold;*/
+ }
+
+
+ .style3 a:hover {
+ color: #8585C1;
+ cursor: pointer;
+ text-decoration: underline;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ }
-->
</style>
</head>
@@ -56,7 +62,7 @@
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<th>
- <a href="welcome.htm" class="button"
target="main" >Admin home </a>
+ <a href="welcome.htm" class="button"
target="main">Admin home </a>
</th>
</tr>
<tr>
@@ -68,7 +74,7 @@
</span>
</p>
<p>
- <span class="navtex"><a href="Wizard"
target="main">Service</a></span>
+ <span class="navtex"><a href="Wizard"
target="main">Service</a></span>
</p>
</p>
</td>
@@ -87,21 +93,20 @@
<a
href="ServiceAdmin?loggingProperties" target="main">Logging</a>
<br>
<a href="eXistAdmin"
target="main">eXist Database</a>
-
<br>
- <a href="SQLMAdmin"
target="main">Relational Database</a>
<br>
+ <a href="SQLMAdmin"
target="main">SQL MA Admin</a>
+ <br>
</span>
</p>
</td>
</tr>
-
<tr>
</tr>
</table>
<img src="graphics/logos.gif" alt="perfSONAR project
partners" width="117" height="263" border="0" align="top"/>
</div>
- <div class="centerWindow" >
- <object data="welcome.htm" type="text/html" name="main"
width="99%" height="106%" >
+ <div class="centerWindow">
+ <object data="welcome.htm" type="text/html" name="main"
width="99%" height="100%">
</object>
</div>
</div>
Modified: trunk/geant2_java-sql-ma/conf/axis-1.4/main.css
===================================================================
--- trunk/geant2_java-sql-ma/conf/axis-1.4/main.css 2008-04-15 12:19:09
UTC (rev 3674)
+++ trunk/geant2_java-sql-ma/conf/axis-1.4/main.css 2008-04-15 13:19:18
UTC (rev 3675)
@@ -48,10 +48,10 @@
}
.adminPanel{
- width: 90%;
+ width: 94%;
height: 50%;
float:left;
- margin-left: 5%;
+ margin-left: 3%;
margin-right: 5%;
background-color: #ffffff;
margin-bottom: 2%;
@@ -214,12 +214,13 @@
height: 94px;
background-image: url(top_slice.gif);
background-color: #FFFFFF;
- padding-left: 0px;
+ padding: 0px;
clip: rect(auto,auto,auto,auto);
float:left;
}
.mainWindow{
border: none;
+ padding: 0px;
width: 100%;
height: 750px;
background-color: #ffffff;
@@ -230,11 +231,11 @@
height:80%;
margin-right: 5px;
margin-bottom: 5px;
- margin-left: 5px;
+ margin-left: 0;
float: left;
}
.centerWindow object{
- width: 100%;
+ width: 101%;
height: 105%;
background-color: #FFFFFF;
}
@@ -249,7 +250,7 @@
.sidebar{
width: 15%;
- height: 66%;
+ height: 71.1%;
padding-bottom: 12.1%;
padding-right: 0px;
float: left;
Deleted: trunk/geant2_java-sql-ma/conf/axis-1.4/stemb.gif
Deleted: trunk/geant2_java-sql-ma/conf/axis-1.4/stemt.gif
Modified: trunk/geant2_java-sql-ma/conf/axis-1.4/welcome.htm
===================================================================
--- trunk/geant2_java-sql-ma/conf/axis-1.4/welcome.htm 2008-04-15 12:19:09
UTC (rev 3674)
+++ trunk/geant2_java-sql-ma/conf/axis-1.4/welcome.htm 2008-04-15 13:19:18
UTC (rev 3675)
@@ -17,7 +17,7 @@
<table width="0" border="0" cellpadding="0"
cellspacing="0" background="graphics/step_1_slice.gif" class="contenttable">
<tr>
<td>
- <img src="graphics/step_1_top.gif"
width="401" height="122">
+ <img src="graphics/step_1_top.gif"
width="350" height="122">
</td>
</tr>
<tr>
@@ -62,7 +62,7 @@
<tr><td> </td></tr>
<tr>
<td>
- <img src="graphics/step_1_bottom.gif"
width="401" height="18">
+ <img src="graphics/step_1_bottom.gif"
width="350" height="18">
</td>
</tr>
</table>
@@ -71,7 +71,7 @@
<table width="0" border="0" cellpadding="0"
cellspacing="0" background="graphics/step_2_slice.gif" class="contenttable">
<tr>
<td>
- <img src="graphics/step_2_top.gif"
width="401" height="118">
+ <img src="graphics/step_2_top.gif"
width="350" height="118">
</td>
</tr>
<tr>
@@ -103,7 +103,7 @@
<tr>
<td class="configheadinglavender">
<p>
- <a href="eXistAdmin"
target="main">eXist database settings</a>
+ <a href="eXistAdmin"
target="main">eXist Database settings</a>
</p>
<p>
@@ -113,24 +113,9 @@
</p>
</td>
</tr>
-
<tr>
- <td class="configheadinglavender">
- <p>
- <a href="SQLMAdmin"
target="main">Relational database settings</a>
- </p>
- <p>
-
- </p>
- <p>
-
- </p>
- </td>
- </tr>
-
- <tr>
<td>
- <img src="graphics/step_2_bottom.gif"
width="401" height="18">
+ <img src="graphics/step_2_bottom.gif"
width="350" height="18">
</td>
</tr>
</table>
Modified: trunk/geant2_java-sql-ma/conf/service.properties.template-2
===================================================================
--- trunk/geant2_java-sql-ma/conf/service.properties.template-2 2008-04-15
12:19:09 UTC (rev 3674)
+++ trunk/geant2_java-sql-ma/conf/service.properties.template-2 2008-04-15
13:19:18 UTC (rev 3675)
@@ -116,16 +116,16 @@
# Configuration of AuthN functionality
-#Group=Authentication
-#Description=The URL address of the Authentication Service.
+# Group=Authentication
+# Description=The URL address of the Authentication Service.
service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
-#Group=Authentication
-#Description=The types of messages for which authentication is to be enabled
(if required).
+# Group=Authentication
+# Description=The types of messages for which authentication is to be
enabled (if required).
service.as.authn_for_msg_types=SetupDataRequest,MetadataKeyRequest
-#Group=Authentication
-#Description=Determines if authentication is enabled (on) or not (off).
+# Group=Authentication
+# Description=Determines if authentication is enabled (on) or not (off).
service.as.authn_active=off
Modified: trunk/geant2_java-sql-ma/conf/wizard.properties
===================================================================
--- trunk/geant2_java-sql-ma/conf/wizard.properties 2008-04-15 12:19:09
UTC (rev 3674)
+++ trunk/geant2_java-sql-ma/conf/wizard.properties 2008-04-15 13:19:18
UTC (rev 3675)
@@ -124,6 +124,8 @@
+
+
<property>
<entry key="servlet.username" required="true">perfsonaruser</entry>
<Comment>Enter the username for logging in to the admin pages:</Comment>
@@ -141,4 +143,32 @@
+
+ <property>
+ <entry key="service.as.authn_active" required="true">no</entry>
+ <Comment>Do you wish to enable authentication?</Comment>
+ <ProposedValue>yes</ProposedValue>
+ <Group order="1" check="true">Authentication</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
+ </property>
+
+ <property>
+ <entry key="service.as.point"
required="true">http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</entry>
+ <Comment>Enter the URL address of the Authentication Service:</Comment>
+
<ProposedValue>http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</ProposedValue>
+ <Group order="2">Authentication</Group>
+ </property>
+
+ <property>
+ <entry key="service.as.authn_for_msg_types"
required="true">SetupDataRequest,MetadataKeyRequest</entry>
+ <Comment>Enter the message types which should be authenticated:</Comment>
+ <ProposedValue>SetupDataRequest,MetadataKeyRequest</ProposedValue>
+ <Group order="3">Authentication</Group>
+ </property>
+
+
+
+
+
</properties>
- perfsonar: r3675 - in trunk/geant2_java-sql-ma: ant conf conf/axis-1.4 conf/axis-1.4/graphics, svnlog, 04/15/2008
Archive powered by MHonArc 2.6.16.