Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4385 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/graphics doc samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/store

Subject: perfsonar development work

List archive

perfsonar: r4385 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/graphics doc samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/store


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4385 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/graphics doc samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/store
  • Date: Fri, 22 Aug 2008 07:58:09 -0400
Author: roman
Date: 2008-08-22 07:58:08 -0400 (Fri, 22 Aug 2008)
New Revision: 4385

Added:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/Thumbs.db

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/admin_home_target.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/apply_button.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/apply_button_2.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/arrow_icon.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/arrow_icon2.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/button_1_large.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/button_1_small.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/button_2_large.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/button_2_small.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/cancel_button.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/create_resource_button.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/delete_red_button.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/edit_button.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/edit_green_button.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/login_panel.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/logos.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/logout_button.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/manage_collections_off_tab.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/manage_collections_on_tab.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/manage_users_off_tab.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/manage_users_on_tab.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_1_bottom.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_1_slice.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_1_top.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_2_bottom.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_2_slice.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_2_top.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_fail.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_main.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_return.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_startbn.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_succ.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/testdepl.jsp
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/tick.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-L2-status.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-L2-status.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-Ping-1.xml
Removed:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/Thumbs.db

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/admin_home_target.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/apply_button.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/apply_button_2.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/arrow_icon.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/arrow_icon2.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/button_1_large.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/button_1_small.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/button_2_large.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/button_2_small.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/cancel_button.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/create_resource_button.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/delete_red_button.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/edit_button.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/edit_green_button.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/login_panel.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/logos.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/logout_button.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/manage_collections_off_tab.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/manage_collections_on_tab.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/manage_users_off_tab.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/manage_users_on_tab.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_1_bottom.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_1_slice.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_1_top.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_2_bottom.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_2_slice.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_2_top.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_fail.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_main.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_return.gif

branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_startbn.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_succ.gif
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/index.html
Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/Service_Admin.js
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/WEB-INF/web.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/default.css
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/index.jsp
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/main.css
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/sqlma_admin_script.js
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/welcome.htm
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/eventType-map.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/eventType-rules.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbremove.sql
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_TEST.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/Functional_Testing_Specification.doc

branches/GEANT2-JAVA-SQL-MA-STABLE/doc/Installation_Actions_Specification.doc
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/Interface_Specification.doc
branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/CompleteMetadataStoreRequest.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-L2Status-2.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-L2Status-3.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-L2Status-4.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java

branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/StoreRequestProcessFactory.java
Log:

merging with the trunk (-r 4300:4384)



Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-08-22 11:36:42 UTC (rev 4384)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-08-22 11:58:08 UTC (rev 4385)
@@ -45,8 +45,8 @@
<target name="copy-dep-service-jars"
depends="copy-dep-base-service-jars">

- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080721/perfsonar-base-1.0.20080721.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.4b/perfsonar-web-admin-0.8.4b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080822/perfsonar-base-1.0.20080822.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9b/perfsonar-web-admin-0.9b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar"

todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

@@ -288,8 +288,8 @@

<copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>

- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080721/perfsonar-base-1.0.20080721.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.4b/perfsonar-web-admin-0.8.4b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080822/perfsonar-base-1.0.20080822.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9b/perfsonar-web-admin-0.9b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar"
todir="${tmpdir}/WEB-INF/lib"/>


Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-08-22 11:36:42 UTC (rev 4384)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-08-22 11:58:08 UTC (rev 4385)
@@ -54,8 +54,8 @@

<artifact:dependencies>

- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080721"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.8.4b"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080822"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9b"/>
<dependency groupId="perfsonar" artifactId="perfsonar-rrd-ma"
version="3.1"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20080630"/>


Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2008-08-22 11:36:42 UTC (rev 4384)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2008-08-22 11:58:08 UTC (rev 4385)
@@ -80,8 +80,8 @@

<!-- 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.20080721/perfsonar-base-1.0.20080721.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.4b/perfsonar-web-admin-0.8.4b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080822/perfsonar-base-1.0.20080822.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9b/perfsonar-web-admin-0.9b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.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: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/Service_Admin.js
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/Service_Admin.js
2008-08-22 11:36:42 UTC (rev 4384)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/Service_Admin.js
2008-08-22 11:58:08 UTC (rev 4385)
@@ -31,7 +31,7 @@
reset_button.style.left = 83 + '%';
}
else {
- //alert("Not 768 "+x);
+ //alert("Not 768 "+x);
reset_button.style.top = 95 + '%';
reset_button.style.left = 67 + '%';
}
@@ -42,7 +42,7 @@
button.style.left = 91.5 + '%';
}
else {
- button.style.top = 95 + '%';
+ button.style.top = 95 + '%';
button.style.left = 74 + '%';
}
}
@@ -54,4 +54,75 @@
onscroll = FloatPosition;
onresize = FloatPosition;

+function checkStarFields(){

+ var divs = document.getElementsByTagName("div");
+ var filled = true;
+
+ for (var i = 0; i < divs.length; i++) {
+
+ var div = divs[i];
+ if (div.style.display == "block") {
+ var input_array = div.getElementsByTagName("input");
+
+ var text = document.createElement("td");
+ var ex = document.getElementById("extra");
+ if (ex != null) {
+ var p = ex.parentNode;
+ p.removeChild(ex);
+ }
+ text.id = "extra";
+ text.innerHTML = '<p style=\"color:red;\">Please fill in the
field!</p>';
+
+ for (var j = 0; j < input_array.length; j++) {
+
+ var input = input_array[j];
+
+ if (input.id == "required") {
+
+ var parent = input.parentNode.parentNode;
+ if (input.value == null || input.value == "" ||
input.value == " ") {
+ if
(parent.parentNode.parentNode.parentNode.style.display == "block") {
+ filled = false;
+ parent.appendChild(text);
+ return filled;
+ }
+
+ }
+
+ }
+
+ }
+ }
+
+ }
+
+ return filled;
+
+}
+
+function getDate(){
+
+ var date = document.getElementById("date");
+
+ var stampdays = new Array("Sunday", "Monday", "Tuesday", "Wednesday",
"Thursday", "Friday", "Saturday");
+
+ var stampmonths = new Array("January", "February", "March", "April",
"May", "June", "July", "August", "September", "October", "November",
"December");
+
+ var thedate = new Date();
+
+ date.innerHTML = stampdays[thedate.getDay()] + ", " +
stampmonths[thedate.getMonth()] + " " + thedate.getDate() + ", " +
thedate.getFullYear();
+
+}
+
+function highlight(el){
+ alert("Highlighted");
+ var links = document.getElementsByTagName("a");
+ for (var i = 0; i < links.length; i++) {
+
+ var link = links[i];
+
+ link.className
+ }
+}
+

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/WEB-INF/web.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/WEB-INF/web.xml
2008-08-22 11:36:42 UTC (rev 4384)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/WEB-INF/web.xml
2008-08-22 11:58:08 UTC (rev 4385)
@@ -124,6 +124,7 @@
</url-pattern>
</servlet-mapping>

+
<!-- end -->
<!-- pS extension -->

@@ -176,8 +177,8 @@
</mime-mapping>

<welcome-file-list id="WelcomeFileList">
+ <welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
- <welcome-file>index.jsp</welcome-file>
<welcome-file>index.jws</welcome-file>
</welcome-file-list>


Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/default.css
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/default.css
2008-08-22 11:36:42 UTC (rev 4384)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/default.css
2008-08-22 11:58:08 UTC (rev 4385)
@@ -1,3 +1,4 @@
+
/* standard elements */
html {
min-height: 100%;
@@ -13,7 +14,7 @@
font-family: arial;
}

-a img {
+a img{
border: none;
}
/* Wizard CSS */
@@ -50,6 +51,16 @@
margin-bottom: 20px;
}

+.inner_properties {
+ padding:0px;
+ margin:0px;
+}
+.inner_properties table{
+ border: none;
+ margin:0px;
+ padding:0px;
+}
+
.properties td {
padding: 15px;
font-family: Verdana, Arial, Helvetica, sans-serif;
@@ -317,9 +328,6 @@
background: transparent url(graphics/manage_collections_on_tab.gif)
no-repeat center top;
}

-.collections_option_on a:visited, a:active {
- background: transparent url(graphics/manage_collections_on_tab.gif)
no-repeat center top;
-}

.collections_option_off a {
padding: 7px 80px 7px 80px;
@@ -329,33 +337,23 @@
background: transparent url(graphics/manage_collections_off_tab.gif)
no-repeat center top;
}

-.collections_option_off a:visited, a:active {
- background: transparent url(graphics/manage_collections_off_tab.gif)
no-repeat center top;
-}

-.users_option_on a {
+.users_option_off a{
padding: 7px 65px 7px 65px;
width: 210px;
height: 28px;
text-decoration: none;
- background: transparent url(graphics/manage_users_on_tab.gif) no-repeat
center top;
+ background: transparent url(graphics/manage_users_off_tab.gif) no-repeat
center top;
}

-users_option_on a:visited, a:active {
- background: transparent url(graphics/manage_users_on_tab.gif) no-repeat
center top;
-}
-
-.users_option_off a {
+.users_option_on a {
padding: 7px 65px 7px 65px;
width: 210px;
height: 28px;
text-decoration: none;
- background: transparent url(graphics/manage_users_off_tab.gif) no-repeat
center top;
+ background: transparent url(graphics/manage_users_on_tab.gif) no-repeat
center top;
}

-users_option_off a:visited, a:active {
- background: transparent url(graphics/manage_users_off_tab.gif) no-repeat
center top;
-}

.login_button {
width: 54px;
@@ -637,5 +635,167 @@
font-size: 13px;
}

+.test_table {
+ background-color: #99ff99;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}

+.test_table td {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}

+/* Stitching Servlet*/
+
+#main_iface_panel{
+ margin-top: 2%;
+ margin-left:2%;
+ background-color: #ffffff;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ height:100%
+
+}
+#main_iface_panel a{
+
+}
+
+#main_iface_panel a:visited a:active{
+
+}
+#iface_panel_body table{
+
+}
+#iface_panel_body td{
+ vertical-align:top;
+ height:100%;
+ padding:0px;
+}
+#file_management{
+ border: 1px solid blue;
+ padding:10px;
+ font-weight:bold;
+}
+
+#file_management table{
+ width:100%;
+}
+#file_info{
+ background-color:#BBBBE6;
+ padding:0px;
+}
+
+#file_info table{
+ width:100%;
+}
+#file_info th{
+
+ background-color:#8282C9;
+ color:#000000;
+ padding: 5px;
+ text-align:left;
+}
+#file_info_header{
+ color:white;
+ background-color:#8282C9;
+ font-weight:bold;
+}
+#file_info td{
+
+ padding: 5px;
+ text-align:left;
+}
+
+#iface_panel_header{
+
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ padding: 5px;
+ background-color: #E6E6FA;
+ margin:1px;
+
+}
+#panel_body_sidebar{
+
+ background-color: #CBCBED;
+}
+#panel_body_sidebar_devices{
+ height:100%;
+ background-color: #CBCBED;
+ float:left;
+ padding: 5px;
+ margin:1px;
+
+}
+
+#panel_body_sidebar table{
+ width:100%;
+ height:100%;
+}
+#panel_body_sidebar tr{
+ height:100%;
+}
+#panel_body_sidebar td{
+ padding: 8px;
+}
+
+#panel_body_sidebar a a:visited a:link{
+ padding: 0px;
+ margin:0px
+}
+
+#panel_body_ifaces{
+ background-color: #DEDEF9;
+ float:left;
+ padding-left: 10px;
+ padding-right: 10px;
+ padding-bottom:20px;
+ padding-top:8px;
+ margin:0px;
+}
+#host_name{
+ font-size:15px;
+ font-weight:bold;
+}
+
+#ifaces_table{
+ margin-top: 15px;
+ background-color:#ECECFC;
+ width:100%;
+ border-spacing: 1px 0px;
+ width:100%;
+}
+
+#ifaces_table td{
+ padding: 5px;
+ border-top:none;
+}
+
+
+.ifaces_header1{
+ text-align:left;
+ font-weight:bold;
+ background-color:#8282C9;
+}
+.ifaces_header2{
+ background-color:#8282C9;
+ font-weight:bold;
+ text-align:center;
+}
+
+.execute_button_stitching {
+ display: block;
+ margin-top: 0px;
+ width: 120px;
+ height: 28px;
+ float: left;
+ border: none;
+ 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;
+}
+

Copied: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics (from rev
4384, trunk/geant2-java-sql-ma/conf/axis-1.4/graphics)

Deleted: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/Thumbs.db

Copied: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/Thumbs.db
(from rev 4384, trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/Thumbs.db)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/admin_home_target.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/admin_home_target.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/admin_home_target.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/apply_button.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/apply_button.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/apply_button.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/apply_button_2.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/apply_button_2.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/apply_button_2.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/arrow_icon.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/arrow_icon.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/arrow_icon.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/arrow_icon2.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/arrow_icon2.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/arrow_icon2.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/button_1_large.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/button_1_large.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/button_1_large.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/button_1_small.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/button_1_small.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/button_1_small.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/button_2_large.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/button_2_large.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/button_2_large.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/button_2_small.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/button_2_small.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/button_2_small.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/cancel_button.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/cancel_button.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/cancel_button.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/create_resource_button.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/create_resource_button.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/create_resource_button.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/delete_red_button.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/delete_red_button.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/delete_red_button.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/edit_button.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/edit_button.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/edit_button.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/edit_green_button.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/edit_green_button.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/edit_green_button.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/login_panel.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/login_panel.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/login_panel.gif)

Deleted: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/logos.gif

Copied: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/logos.gif
(from rev 4384, trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/logos.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/logout_button.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/logout_button.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/logout_button.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/manage_collections_off_tab.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/manage_collections_off_tab.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/manage_collections_off_tab.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/manage_collections_on_tab.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/manage_collections_on_tab.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/manage_collections_on_tab.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/manage_users_off_tab.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/manage_users_off_tab.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/manage_users_off_tab.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/manage_users_on_tab.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/manage_users_on_tab.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/manage_users_on_tab.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_1_bottom.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_1_bottom.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/step_1_bottom.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_1_slice.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_1_slice.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/step_1_slice.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_1_top.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_1_top.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/step_1_top.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_2_bottom.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_2_bottom.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/step_2_bottom.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_2_slice.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_2_slice.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/step_2_slice.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_2_top.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/step_2_top.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/step_2_top.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_fail.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_fail.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/testdepl_fail.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_main.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_main.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/testdepl_main.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_return.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_return.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/testdepl_return.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_startbn.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_startbn.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/testdepl_startbn.gif)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_succ.gif

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/graphics/testdepl_succ.gif
(from rev 4384,
trunk/geant2-java-sql-ma/conf/axis-1.4/graphics/testdepl_succ.gif)

Deleted: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/index.html

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/index.jsp
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/index.jsp 2008-08-22
11:36:42 UTC (rev 4384)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/index.jsp 2008-08-22
11:58:08 UTC (rev 4385)
@@ -1,112 +1,154 @@
+<%@ page
import="perfSONARWebAdmin.auxiliary.PerfsonarProperties,perfSONARWebAdmin.auxiliary.PerfsonarPropertiesImpl,perfSONARWebAdmin.auxiliary.PerfsonarProperty,java.io.File,java.io.FileInputStream,java.io.FileOutputStream,java.io.IOException"
%>
+
<html>
-<%@ page contentType="text/html; charset=utf-8" %>
-<%
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-%>
+ <head>
+ <title>perfSONAR Service Web Administration page</title>
+ <link rel="stylesheet" type="text/css" href="main.css"/>
+ <meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1">
+ <script src="Service_Admin.js"></script>

-<%@ include file="i18nLib.jsp" %>
+ <style type="text/css">
+ <!--
+
+ a {
+ }
+
+ .style3 {
+ color: #8585c1;
+ 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>
+ <body>
+ <%
+ java.text.DateFormat dateFormat = new java.text.SimpleDateFormat("EEE
MMM dd HH:mm:ss zzz yyyy");
+ java.util.Date now= new java.util.Date();
+ java.util.Date date= dateFormat.parse(now.toString());
+ String confPath = "WEB-INF/classes/perfsonar/conf/";
+ String ServicePropertiesPath = confPath+ "service.properties";
+ ServletContext sc = getServletContext();
+ String ServicePath = sc.getRealPath("/");
+ PerfsonarProperty property = new PerfsonarProperty();
+ PerfsonarProperties serviceProperties = new PerfsonarPropertiesImpl();
+ serviceProperties.loadProperties(new FileInputStream(ServicePath
+ + ServicePropertiesPath));

-<%
- // initialize a private HttpServletRequest
- setRequest(request);
+ String serviceName=
serviceProperties.getProperty("service.r.service_name").getValue().trim();
+ String serviceVersion=
serviceProperties.getProperty("service.r.service_version").getValue().trim();
+

- // set a resouce base
- setResouceBase("i18n");
-%>
+ %>
+ <div class="adminPanel">
+ <div class="banner">
+ <table border="0" align="left" cellpadding="0"
cellspacing="0">
+ <tr>
+ <td>
+ <a href="welcome.htm" target="main"><img
src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94" border="0"
align="right"></a>
+ </td>
+ <td>
+ <table>
+ <tr><td
id="date"><%=date.toString()%></td></tr>
+ <tr><td id="serviceName"><%=serviceName %>
&nbsp;<%=serviceVersion%></td></tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="mainWindow">
+ <div class="sidebar">
+ <table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <th>
+ <a href="welcome.htm" class="button"
target="main">Admin home &nbsp; &nbsp; &nbsp;</a>
+ </th>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ <span class="navtexheading">Basic
+ <br>
+ Configuration
+ </span>
+ </p>
+ <p>
+ <span class="navtex"><a href="Wizard"
target="main">Service</a></span>
+<!--
+ <br>
+ <a href="testdepl.jsp"
target="main">Test</a>
+-->
+ </p>
+ </td>
+ </tr>

-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <title>Apache-Axis</title>
-</head>
+ <tr>
+ <td>
+ <p>
+ <span class="navtexheading
style3">Advanced
+ <br>
+ Configuration
+ </span>
+ </p>
+ <p>
+ <span class="navtex style3"><a
href="ServiceAdmin?serviceProperties" target="main">Service</a>
+ <br>
+ <a
href="ServiceAdmin?loggingProperties" target="main">Logging</a>
+ <br>
+ <a href="SQLMAdmin"
target="main">SQL MA Administration</a>
+ <br>
+ <a href="eXistAdmin"
target="main">eXist Database</a>
+ <br>

-<body bgcolor="#FFFFFF">
-
-<h1 align="center">Apache-AXIS</h1>
-
-<%= getLocaleChoice() %>
-
-<%
- out.print(getMessage("welcomeMessage")+"<p/>");
- out.print(getMessage("operationType"));
-%>
-
-<ul>
-
- <li>
- <%
- out.print("<a href=\""+ getMessage("validationURL") +"\">");
- out.print(getMessage("validation") +"</a> - ");
- out.print(getMessage("validationFootnote00") +"<br>");
- out.print("<i>"+ getMessage("validationFootnote01") +"</i>");
- %>
- </li>
-
- <li>
- <%
- out.print("<a href=\""+ getMessage("serviceListURL") +"\">");
- out.print(getMessage("serviceList") +"</a> - ");
- out.print(getMessage("serviceListFootnote"));
- %>
- </li>
-
- <li>
- <%
- out.print("<a href=\""+ getMessage("callAnEndpointURL") +"\">");
- out.print(getMessage("callAnEndpoint") +"</a> - ");
- out.print(getMessage("callAnEndpointFootnote00") +" ");
- out.print(getMessage("callAnEndpointFootnote01"));
- %>
- </li>
-
- <li>
- <%
- out.print("<a href=\""+ getMessage("visitURL") +"\">");
- out.print(getMessage("visit") +"</a> - ");
- out.print(getMessage("visitFootnote"));
- %>
- </li>
-
- <li>
- <%
- out.print("<a href=\""+ getMessage("adminURL") +"\">");
- out.print(getMessage("admin") +"</a> - ");
- out.print(getMessage("adminFootnote"));
- %>
- </li>
-
- <li>
- <%
- out.print("<a href=\""+ getMessage("soapMonitorURL") +"\">");
- out.print(getMessage("soapMonitor") +"</a> - ");
- out.print(getMessage("soapMonitorFootnote"));
- %>
- </li>
-
-</ul>
-
-<%
- out.print(getMessage("sideNote") +"<p/>");
-%>
-
-<%
- out.print("<h3>"+ getMessage("validatingAxis") +"</h3>");
-
- out.print(getMessage("validationNote00") +"<p/>");
- out.print(getMessage("validationNote01"));
-%>
-</body>
+ </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="100%">
+ </object>
+ </div>
+ </div>
+ <div class="footer">
+ PERFormance Service-Oriented Network monitoring ARchitecture
&nbsp;
+ </div>
+ </div>
+ </body>
</html>

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/main.css
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/main.css 2008-08-22
11:36:42 UTC (rev 4384)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/main.css 2008-08-22
11:58:08 UTC (rev 4385)
@@ -218,6 +218,25 @@
clip: rect(auto,auto,auto,auto);
float:left;
}
+#date{
+ padding-top:5px;
+ float:right;
+ text-align:right;
+ margin-left: 79.5%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+#serviceName{
+ padding-top:5px;
+ float:right;
+ text-align:right;
+ margin-left: 79.5%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight:bold;
+}
+
.mainWindow{
border: none;
padding: 0px;
@@ -354,4 +373,115 @@
border-left-color: #FFFFFF;
}

+.execute_button_testdepl {
+ display: block;
+ margin-top: 5px;
+ width: 120px;
+ height: 30px;
+ float: right;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 60%;
+ font-weight: 400;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/button_2_medium.gif) no-repeat
center;
+}

+.testdeplmain {
+ text-align: left;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+/* font-weight:bold;;*/
+/* margin-left: -20%;*/
+ margin-left: 2%;
+ border-width: 1px;
+ border-color: #61AF61;
+ padding: 5px;
+ width: 556px;
+ height:108px;
+ background: transparent url(graphics/testdepl_main.gif) no-repeat
center;
+}
+
+.testdeplsucc {
+ text-align: left;
+ float: left;
+ /*font-weight:bold;;*/
+ text-decoration: none;
+/* margin-left: -20%;*/
+ margin-left: 2%;
+ padding: 5px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ border:solid;
+ border-width: 1px;
+ border-color: #61AF61;
+ width: 544px;
+ height: 220px;
+ background: transparent url(graphics/testdepl_succ.gif) no-repeat center;
+}
+
+.testdeplfail {
+ text-align: left;
+ float: left;
+/* font-weight:bold;;*/
+ text-decoration: none;
+ padding: 5px;
+ margin-left: 2%;
+ /*margin-left: -20%;*/
+ height: 105px;
+ width:555px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ border:solid;
+ border-width: 1px;
+ border-color: #61AF61;
+ background: transparent url(graphics/testdepl_fail.gif) no-repeat
center;
+}
+
+.testdeplstartbn {
+ display: block;
+ margin-top: 5px;
+ width: 120px;
+ height: 30px;
+ float: right;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 60%;
+ font-weight: 400;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/testdepl_startbn.gif) no-repeat
center;
+}
+
+.testdeplretbn {
+ display: block;
+ margin-top: 5px;
+ width: 150px;
+ height: 30px;
+ float: none;;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 60%;
+ font-weight: 400;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/testdepl_return.gif) no-repeat
center;
+}
+
+.testdeplretbn2 {
+ display: block;
+ margin-top: 5px;
+ width: 150px;
+ height: 30px;
+ float: right;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 60%;
+ font-weight: 400;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/testdepl_return.gif) no-repeat
center;
+}
+
+

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/sqlma_admin_script.js
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/sqlma_admin_script.js
2008-08-22 11:36:42 UTC (rev 4384)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/sqlma_admin_script.js
2008-08-22 11:58:08 UTC (rev 4385)
@@ -59,7 +59,7 @@
}

else {
- // document.userform.submit();
+ // document.userform.submit();
return true;
}
}
@@ -72,28 +72,29 @@
}

function confirmDelete(form){
-
+
var res = confirm("This action will delete the selected ibatis files
pair. Are you sure you want to continue?");
if (res) {
- var res2 = confirm("Do you want to delete the contents of the table
containing the data?");
- if (res2) {
+ return true;
+ //var res2 = confirm("Do you want to delete the contents of
the table containing the data?");
+ /*if (res2) {

var el = document.createElement("input");
el.type = "hidden";
el.name = "deleteData";
el.value = "Yes";
form.appendChild(el);
- // document.form.submit();
+ // document.form.submit();
return true;
}
else {
//document.form.submit();
return true;
- }
+ }*/

}
else {
- return false;
+ return false;
}


@@ -119,18 +120,18 @@
}

function sendRequest(file){
- document.body.style.cursor='wait';
- var input=document.createElement("input");
- input.type = "hidden";
+ document.body.style.cursor = 'wait';
+ var input = document.createElement("input");
+ input.type = "hidden";
input.name = "ibatisFile";
input.value = file;
- var form=document.createElement("form");
- form.name="ShowForm"
- form.method='post';
- form.action='SQLMAdmin';
- form.appendChild(input);
- document.getElementById('EditFile').appendChild(form);
- document.ShowForm.submit();
-
+ var form = document.createElement("form");
+ form.name = "ShowForm"
+ form.method = 'post';
+ form.action = 'SQLMAdmin';
+ form.appendChild(input);
+ document.getElementById('EditFile').appendChild(form);
+ document.ShowForm.submit();
+
}


Copied: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/testdepl.jsp (from
rev 4384, trunk/geant2-java-sql-ma/conf/axis-1.4/testdepl.jsp)

Copied: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/tick.gif (from rev
4384, trunk/geant2-java-sql-ma/conf/axis-1.4/tick.gif)

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/welcome.htm
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/welcome.htm
2008-08-22 11:36:42 UTC (rev 4384)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/welcome.htm
2008-08-22 11:58:08 UTC (rev 4385)
@@ -103,6 +103,19 @@
<tr>
<td class="configheadinglavender">
<p>
+ <a href="SQLMAdmin"
target="main">SQL MA Administration </a>
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td class="configheadinglavender">
+ <p>
<a href="eXistAdmin"
target="main">eXist Database settings</a>
</p>
<p>
@@ -113,6 +126,7 @@
</p>
</td>
</tr>
+
<tr>
<td>
<img src="graphics/step_2_bottom.gif"
width="350" height="18">

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/eventType-map.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/eventType-map.xml 2008-08-22
11:36:42 UTC (rev 4384)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/eventType-map.xml 2008-08-22
11:58:08 UTC (rev 4385)
@@ -34,6 +34,7 @@

<metadataKeyGenerator>org.perfsonar.service.measurementArchive.metadataConfig.keyGenerator.L2PathStatusKeyGenerator</metadataKeyGenerator>

<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.L2PathStatusResponseGenerator</responseGenerator>

<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.L2PathStatusStoreRequestProcess</storeRequestProcess>
+ <ibatisConfig>ibatis-SqlMapConfig-L2-status.xml</ibatisConfig>
</eventType>

<eventType>
@@ -42,6 +43,7 @@

<metadataKeyGenerator>org.perfsonar.service.measurementArchive.metadataConfig.keyGenerator.L2PathStatusKeyGenerator</metadataKeyGenerator>

<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.L2PathStatusResponseGenerator</responseGenerator>

<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.L2PathStatusStoreRequestProcess</storeRequestProcess>
+ <ibatisConfig>ibatis-SqlMapConfig-L2-status.xml</ibatisConfig>
</eventType>

<eventType>

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/eventType-rules.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/eventType-rules.xml 2008-08-22
11:36:42 UTC (rev 4384)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/eventType-rules.xml 2008-08-22
11:58:08 UTC (rev 4385)
@@ -26,6 +26,8 @@
paramcount="0" />
<call-method-rule pattern="baseChainingMerger"
methodname="setBaseChainingMerger"
paramcount="0" />
+ <call-method-rule pattern="ibatisConfig"
methodname="setIbatisConfig"
+ paramcount="0" />
<set-next-rule methodname="setEventType" />
</pattern>


Copied: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-L2-status.xml (from
rev 4384, trunk/geant2-java-sql-ma/conf/ibatis-L2-status.xml)

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-L2-status.xml
(from rev 4384,
trunk/geant2-java-sql-ma/conf/ibatis-SqlMapConfig-L2-status.xml)

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbremove.sql
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbremove.sql
2008-08-22 11:36:42 UTC (rev 4384)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbremove.sql
2008-08-22 11:58:08 UTC (rev 4385)
@@ -34,9 +34,13 @@


DROP TABLE
- interdomain_link;
+ perfsonar_links;


+DROP TABLE
+ interdomain_link;
+
+
#DROP TABLE
# clmp_owamp;


Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
2008-08-22 11:36:42 UTC (rev 4384)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
2008-08-22 11:58:08 UTC (rev 4385)
@@ -78,6 +78,16 @@
comments VARCHAR(255));


+CREATE TABLE
+ perfsonar_links
+ (id VARCHAR(255) NOT NULL,
+ time TIMESTAMP DEFAULT NOW(),
+ status_oper VARCHAR(255) DEFAULT 'UNKNOWN',
+ status_admin VARCHAR(255) DEFAULT 'UNKNOWN',
+ alarm_id_set VARCHAR(255),
+ comments VARCHAR(255));
+
+
############### Create table for OWAMP data ################
#
#CREATE TABLE

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_TEST.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_TEST.xml
2008-08-22 11:36:42 UTC (rev 4384)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_TEST.xml
2008-08-22 11:58:08 UTC (rev 4385)
@@ -206,11 +206,11 @@
</nmtl2:link>
</nmwg:subject>
<nmwg:parameters>
- <!-- supportedEventType parameter can be replaced by the
eventType 'Path.Status' -->
- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
+ <!-- supportedEventType parameter can replace the eventType
'Path.Status' -->
+ <!-- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter> -->
<nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
</nmwg:parameters>
- <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
+ <nmwg:eventType>Path.Status</nmwg:eventType>
</nmwg:metadata>


@@ -233,11 +233,11 @@
</nmtl2:link>
</nmwg:subject>
<nmwg:parameters>
- <!-- supportedEventType parameter can be replaced by the
eventType 'Path.Status' -->
- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
+ <!-- supportedEventType parameter can replace the eventType
'Path.Status' -->
+ <!-- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter> -->
<nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
</nmwg:parameters>
- <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
+ <nmwg:eventType>Path.Status</nmwg:eventType>
</nmwg:metadata>


@@ -260,11 +260,11 @@
</nmtl2:link>
</nmwg:subject>
<nmwg:parameters>
- <!-- supportedEventType parameter can be replaced by the
eventType 'Path.Status' -->
- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
+ <!-- supportedEventType parameter can replace the eventType
'Path.Status' -->
+ <!-- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter> -->
<nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
</nmwg:parameters>
- <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
+ <nmwg:eventType>Path.Status</nmwg:eventType>
</nmwg:metadata>


@@ -287,11 +287,11 @@
</nmtl2:link>
</nmwg:subject>
<nmwg:parameters>
- <!-- supportedEventType parameter can be replaced by the
eventType 'Path.Status' -->
- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
+ <!-- supportedEventType parameter can replace the eventType
'Path.Status' -->
+ <!-- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter> -->
<nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
</nmwg:parameters>
- <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
+ <nmwg:eventType>Path.Status</nmwg:eventType>
</nmwg:metadata>



Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/Functional_Testing_Specification.doc
===================================================================
(Binary files differ)

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/Installation_Actions_Specification.doc
===================================================================
(Binary files differ)

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/Interface_Specification.doc
===================================================================
(Binary files differ)

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml 2008-08-22 11:36:42 UTC (rev
4384)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml 2008-08-22 11:58:08 UTC (rev
4385)
@@ -128,12 +128,12 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-base</artifactId>
- <version>1.0.20080721</version>
+ <version>1.0.20080822</version>
</dependency>
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-web-admin</artifactId>
- <version>0.8.4b</version>
+ <version>0.9b</version>
</dependency>
<dependency>
<groupId>perfsonar</groupId>

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/CompleteMetadataStoreRequest.xml
===================================================================
---
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/CompleteMetadataStoreRequest.xml
2008-08-22 11:36:42 UTC (rev 4384)
+++
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/CompleteMetadataStoreRequest.xml
2008-08-22 11:58:08 UTC (rev 4385)
@@ -82,7 +82,7 @@
<nmwg:eventType>Path.Status</nmwg:eventType>
<nmwg:parameters>
<!-- if the parameter 'ibatisConfig' is not provided in the
request then the default value of it is taken by the service -->
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
+ <!-- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
-->
<nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
</nmwg:parameters>
</nmwg:metadata>
@@ -110,7 +110,7 @@
<nmwg:eventType>Path.Status</nmwg:eventType>
<nmwg:parameters>
<!-- if the parameter 'ibatisConfig' is not provided in the request
then the default value of it is taken by the service -->
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-interdomain.xml</nmwg:parameter>
+ <!-- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-interdomain.xml</nmwg:parameter>
-->
<nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
</nmwg:parameters>
</nmwg:metadata>

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-L2Status-2.xml
===================================================================
---
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-L2Status-2.xml
2008-08-22 11:36:42 UTC (rev 4384)
+++
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-L2Status-2.xml
2008-08-22 11:58:08 UTC (rev 4385)
@@ -38,9 +38,11 @@
<nmwg:eventType>Path.Status</nmwg:eventType>
<nmwg:parameters>
<nmwg:parameter name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
+ <!--
<nmwg:parameter name="ibatisConfig">
ibatis-SqlMapConfig-L2-status-domain.xml
</nmwg:parameter>
+ -->
</nmwg:parameters>
</nmwg:metadata>


Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-L2Status-3.xml
===================================================================
---
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-L2Status-3.xml
2008-08-22 11:36:42 UTC (rev 4384)
+++
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-L2Status-3.xml
2008-08-22 11:58:08 UTC (rev 4385)
@@ -48,9 +48,11 @@
<nmwg:eventType>Path.Status</nmwg:eventType>
<nmwg:parameters>
<nmwg:parameter name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
+ <!--
<nmwg:parameter name="ibatisConfig">
ibatis-SqlMapConfig-L2-status-domain.xml
</nmwg:parameter>
+ -->
</nmwg:parameters>
</nmwg:metadata>


Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-L2Status-4.xml
===================================================================
---
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-L2Status-4.xml
2008-08-22 11:36:42 UTC (rev 4384)
+++
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-L2Status-4.xml
2008-08-22 11:58:08 UTC (rev 4385)
@@ -42,9 +42,11 @@
<nmwg:eventType>Path.Status</nmwg:eventType>
<nmwg:parameters>
<nmwg:parameter name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
+ <!--
<nmwg:parameter name="ibatisConfig">
ibatis-SqlMapConfig-L2-status-domain.xml
</nmwg:parameter>
+ -->
</nmwg:parameters>
</nmwg:metadata>


Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-Ping-1.xml
(from rev 4384,
trunk/geant2-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Ping-1.xml)

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
===================================================================
---
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
2008-08-22 11:36:42 UTC (rev 4384)
+++
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
2008-08-22 11:58:08 UTC (rev 4385)
@@ -19,9 +19,11 @@
import org.ggf.ns.nmwg.base.v2_0.Parameters;

import org.perfsonar.base.exceptions.PerfSONARException;
+import org.perfsonar.base.auxiliary.AuxiliaryComponentManager;

import org.perfsonar.service.base.util.ResultCodesUtil;
import
org.perfsonar.service.measurementArchive.metadataConfig.MetadataConfigurationStorageManager;
+import
org.perfsonar.service.measurementArchive.eventTypeConfig.EventTypeConfigurationComponent;
import
org.perfsonar.service.measurementArchive.rrdType.RRDTypeMAServiceEngine;


@@ -177,19 +179,24 @@

// check parameters in the key

- Parameter ibatisConfig = key.getParameterByName("ibatisConfig");
- if (ibatisConfig == null)
+ Parameter eventType = key.getParameterByName("eventType");
+ if (eventType == null)
throw new PerfSONARException(
"error.ma.query",
"SQLTypeMAServiceEngine.getStoreKey: "
- + "No ibatisConfig parameter in the key");
+ + "No eventType parameter in the key");

- Parameter eventType = key.getParameterByName("eventType");
- if (eventType == null)
+ Parameter ibatisConfig = key.getParameterByName("ibatisConfig");
+ if (ibatisConfig == null) {
+ ibatisConfig = getIbatisConfig(eventType);
+ if (ibatisConfig != null) key.addParameter(ibatisConfig);
+ }
+
+ if (ibatisConfig == null)
throw new PerfSONARException(
"error.ma.query",
"SQLTypeMAServiceEngine.getStoreKey: "
- + "No eventType parameter in the key");
+ + "No ibatisConfig parameter in the key");

} else {

@@ -270,8 +277,14 @@
params.getParameterMap().remove("ibatisConfig");
params.addChild(ibatisConfig);

+ } else if (params.getParameterByName("ibatisConfig") ==
null) {
+
+ ibatisConfig =
getIbatisConfig(params.getParameterByName("eventType"));
+ if (ibatisConfig != null) params.addChild(ibatisConfig);
+
}

+
if (params.getParameterByName("ibatisConfig") == null) {
logger.error("SQLTypeMAServiceEngine.getStoreKey: "
+ "No default ibatis property in the key");
@@ -321,6 +334,46 @@
}


+ protected Parameter getIbatisConfig(Parameter eventTypeParameter)
+ throws PerfSONARException {
+
+ if (eventTypeParameter == null) return null;
+ String eventTypeStr = eventTypeParameter.getParameterValue();
+
+ EventTypeConfigurationComponent eventTypeConfigurationComponent =
+ (EventTypeConfigurationComponent)
+ AuxiliaryComponentManager.
+ getInstance().
+ getComponent("eventType_config");
+
+ org.perfsonar.service.measurementArchive.eventTypeConfig.EventType
eventType =
+ eventTypeConfigurationComponent.getEventType(eventTypeStr);
+
+ if (eventType == null)
+ throw new PerfSONARException(
+ "error.ma.query",
+ "SQLTypeMAServiceEngine.getStoreKey: "
+ + "eventType " + eventTypeStr + " is not supported");
+
+
+ String ibatisConfigStr = eventType.getIbatisConfig();
+
+ logger.debug(
+ "SQLTypeMAServiceEngine.getStoreKey: "
+ + "ibatisConfig parameter for eventType (" + eventTypeStr +
"): "
+ + ibatisConfigStr);
+
+ if (ibatisConfigStr == null || ibatisConfigStr.trim().equals(""))
+ return null;
+
+ Parameter ibatisConfig = new Parameter();
+ ibatisConfig.setParameterName("ibatisConfig");
+ ibatisConfig.setParameterValue(ibatisConfigStr);
+
+ return ibatisConfig;
+ }
+
+
protected Message replaceMetadataConfiguration(Message request)
throws PerfSONARException {


Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/StoreRequestProcessFactory.java
===================================================================
---
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/StoreRequestProcessFactory.java
2008-08-22 11:36:42 UTC (rev 4384)
+++
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/StoreRequestProcessFactory.java
2008-08-22 11:58:08 UTC (rev 4385)
@@ -70,7 +70,7 @@

try {

- storeRequestProcess =
+ storeRequestProcess =
(StoreRequestProcess)
Class.forName(className).newInstance();



  • perfsonar: r4385 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/graphics doc samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/store, svnlog, 08/22/2008

Archive powered by MHonArc 2.6.16.

Top of Page