Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4461 - in branches/GEANT2-JAVA-RRD-MA-STABLE: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/graphics packaging packaging/deb packaging/rpm samples samples/responses

Subject: perfsonar development work

List archive

perfsonar: r4461 - in branches/GEANT2-JAVA-RRD-MA-STABLE: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/graphics packaging packaging/deb packaging/rpm samples samples/responses


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4461 - in branches/GEANT2-JAVA-RRD-MA-STABLE: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/graphics packaging packaging/deb packaging/rpm samples samples/responses
  • Date: Fri, 5 Sep 2008 08:47:36 -0400
Author: roman
Date: 2008-09-05 08:47:35 -0400 (Fri, 05 Sep 2008)
New Revision: 4461

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/graphics/testdepl_startbn.gif
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/graphics/testdepl_succ.gif
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/testdepl.jsp
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/schema.rng
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/compat
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/conffiles
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/control
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/copyright
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/dirs
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/docs
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/install
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postinst
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postrm
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/preinst
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/prerm
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/rules
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/rpm/
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/rpm/geant2-java-rrd-ma.specs
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/responses/
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/responses/EchoResponse.xml
Removed:
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/graphics/
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/graphics/Paul_Hasleham.vcf
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/graphics/Thumbs.db

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

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

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

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

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

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

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

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

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

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

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

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

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

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

branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/graphics/testdepl_startbn.gif
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/graphics/testdepl_succ.gif
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/index.html
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/compat
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/conffiles
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/control
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/copyright
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/dirs
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/docs
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/install
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postinst
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postrm
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/preinst
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/prerm
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/rules
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/rpm/
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/rpm/geant2-java-rrd-ma.specs
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/responses/EchoResponse.xml
Modified:
branches/GEANT2-JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
branches/GEANT2-JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
branches/GEANT2-JAVA-RRD-MA-STABLE/ant/webapp-package-targets.xml
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/Service_Admin.js
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/WEB-INF/web.xml
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/default.css
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/index.jsp
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/main.css
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/welcome.htm
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.properties
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.syslog.properties
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/service.properties
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/wizard.properties
branches/GEANT2-JAVA-RRD-MA-STABLE/pom.xml
Log:
merged with the trunk (-r 4306:4460)



Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
2008-09-05 12:36:23 UTC (rev 4460)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
2008-09-05 12:47:35 UTC (rev 4461)
@@ -46,8 +46,8 @@
depends="copy-dep-base-service-jars">

<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <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.3b/perfsonar-web-admin-0.8.3b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080902/perfsonar-base-1.0.20080902.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.2b/perfsonar-web-admin-0.9.2b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

<copy
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

@@ -263,8 +263,8 @@
<copy file="${basedir}/${build}/${jarfilename}-${version}.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/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.3b/perfsonar-web-admin-0.8.3b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080902/perfsonar-base-1.0.20080902.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.2b/perfsonar-web-admin-0.9.2b.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-RRD-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
2008-09-05 12:36:23 UTC (rev 4460)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
2008-09-05 12:47:35 UTC (rev 4461)
@@ -55,10 +55,15 @@
<artifact:dependencies>

<dependency groupId="rrdjtool" artifactId="rrdjtool"
version="1.0"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080721"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.8.3b"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080902"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9.2b"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20080630"/>

+ <dependency groupId="Validation" artifactId="msv"
version="1.0"/>
+ <dependency groupId="Validation" artifactId="xsdlib"
version="1.0"/>
+ <dependency groupId="Validation" artifactId="isorelax"
version="1.0"/>
+ <dependency groupId="Validation" artifactId="isorelax-jaxp-bridge"
version="1.0"/>
+ <dependency groupId="Validation" artifactId="relaxngDatatype"
version="1.0"/>

<localRepository refid="local.repository"/>
<remoteRepository refid="remote.repository"/>

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/ant/webapp-package-targets.xml
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/ant/webapp-package-targets.xml
2008-09-05 12:36:23 UTC (rev 4460)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/webapp-package-targets.xml
2008-09-05 12:47:35 UTC (rev 4461)
@@ -85,7 +85,7 @@
<copy file="${basedir}/${build}/${jarfilename}-${version}.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/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.3b/perfsonar-web-admin-0.8.3b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.2b/perfsonar-web-admin-0.9.2b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"
todir="${tmpdir}/WEB-INF/lib"/>

<!-- copy conf files -->

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/Service_Admin.js
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/Service_Admin.js
2008-09-05 12:36:23 UTC (rev 4460)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/Service_Admin.js
2008-09-05 12:47:35 UTC (rev 4461)
@@ -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-RRD-MA-STABLE/conf/axis-1.4/WEB-INF/web.xml
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/WEB-INF/web.xml
2008-09-05 12:36:23 UTC (rev 4460)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/WEB-INF/web.xml
2008-09-05 12:47:35 UTC (rev 4461)
@@ -156,10 +156,32 @@
</servlet-mapping>


+ <!-- pS Stitching Servlet -->

+ <servlet>
+ <servlet-name>
+ MetadataAdmin
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.stitching.StitchingServlet
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>
+ MetadataAdmin
+ </servlet-name>
+ <url-pattern>
+ /MetadataAdmin
+ </url-pattern>
+ </servlet-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-RRD-MA-STABLE/conf/axis-1.4/default.css
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/default.css
2008-09-05 12:36:23 UTC (rev 4460)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/default.css
2008-09-05 12:47:35 UTC (rev 4461)
@@ -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;
+
+}
+
+#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: 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-RRD-MA-STABLE/conf/axis-1.4/graphics (from rev
4460, trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics)

Deleted:
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/graphics/Paul_Hasleham.vcf

Copied:
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/graphics/Paul_Hasleham.vcf
(from rev 4460,
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/Paul_Hasleham.vcf)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/index.jsp
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/index.jsp 2008-09-05
12:36:23 UTC (rev 4460)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/index.jsp 2008-09-05
12:47:35 UTC (rev 4461)
@@ -1,112 +1,152 @@
+<%@ 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="eXistAdmin"
target="main">eXist Database</a>
+ <br>
+ <a href="MetadataAdmin"
target="main">Config File Management</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-RRD-MA-STABLE/conf/axis-1.4/main.css
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/main.css 2008-09-05
12:36:23 UTC (rev 4460)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/main.css 2008-09-05
12:47:35 UTC (rev 4461)
@@ -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;
+}
+
+

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

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/welcome.htm
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/welcome.htm
2008-09-05 12:36:23 UTC (rev 4460)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/welcome.htm
2008-09-05 12:47:35 UTC (rev 4461)
@@ -3,11 +3,11 @@
<head>
<meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1"/>
<title>Untitled Document</title>
- <link rel="stylesheet" type="text/css" href="main.css"/>
+ <link rel="stylesheet" type="text/css" href="main.css"/>
</head>
<body style="background-color: #FFFFFF" >
<div class="centerWindow" >
- <p class="welcometext">Welcome to the perfSONAR service web
admin administration interface</p>
+ <p class="welcometext">Welcome to the perfSONAR service web
admin administration interface</p>
<p class="heading1">
Configuration Settings
</p>
@@ -33,7 +33,7 @@
</p>
</td>
</tr>
- <tr>
+ <tr>
<td >
<p>
&nbsp;
@@ -46,7 +46,7 @@
</p>
</td>
</tr>
- <tr>
+ <tr>
<td >
<p>
&nbsp;
@@ -59,7 +59,7 @@
</p>
</td>
</tr>
- <tr><td> </td></tr>
+ <tr><td> </td></tr>
<tr>
<td>
<img src="graphics/step_1_bottom.gif"
width="350" height="18">
@@ -114,6 +114,19 @@
</td>
</tr>
<tr>
+ <td class="configheadinglavender">
+ <p>
+ <a href="MetadataAdmin"
target="main">Metadata Configuration File</a>
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ </td>
+ </tr>
+ <tr>
<td>
<img src="graphics/step_2_bottom.gif"
width="350" height="18">
</td>

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.properties
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.properties 2008-09-05
12:36:23 UTC (rev 4460)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.properties 2008-09-05
12:47:35 UTC (rev 4461)
@@ -126,7 +126,7 @@
log4j.appender.warnAppender.MaxFileSize=500KB

# Group=Warn message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender


@@ -154,7 +154,7 @@
log4j.appender.errorAppender.MaxFileSize=500KB

# Group=Error message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender


@@ -182,7 +182,7 @@
log4j.appender.fatalAppender.MaxFileSize=500KB

# Group=Fatal message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender


@@ -210,7 +210,7 @@
log4j.appender.psRootAppender.MaxFileSize=500KB

# Group=All message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender



Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.syslog.properties
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.syslog.properties
2008-09-05 12:36:23 UTC (rev 4460)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.syslog.properties
2008-09-05 12:47:35 UTC (rev 4461)
@@ -125,7 +125,7 @@
log4j.appender.warnAppender.MaxFileSize=500KB

# Group=Warn message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender


@@ -153,7 +153,7 @@
log4j.appender.errorAppender.MaxFileSize=500KB

# Group=Error message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender


@@ -181,7 +181,7 @@
log4j.appender.fatalAppender.MaxFileSize=500KB

# Group=Fatal message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender


@@ -209,7 +209,7 @@
log4j.appender.psRootAppender.MaxFileSize=500KB

# Group=All message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender



Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/schema.rng (from rev 4460,
trunk/geant2-java-rrd-ma/conf/schema.rng)

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/service.properties
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/service.properties 2008-09-05
12:36:23 UTC (rev 4460)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/service.properties 2008-09-05
12:47:35 UTC (rev 4461)
@@ -23,7 +23,6 @@

# Group=Internal
# Description=A CSV of request message types supported by the service.
-##service.ma.message_types=MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,EchoRequest,LookupInfoRequest

service.ma.message_types=MetadataKeyRequest,SetupDataRequest,EchoRequest,LookupInfoRequest

# Group=Internal
@@ -35,7 +34,7 @@
service.sax_parser.config=/etc/geant2-java-rrd-ma/objects.config

# Group=Internal
-# Description=The path to the log4j configuration file, including the file's
name.
+# Description=The path to the log4j.properties configuration file. If you
want to enable syslog message logging, enter the path to the
log4j.syslog.properties file instead.
service.log.log4j.config=/etc/geant2-java-rrd-ma/log4j.properties

# Group=Internal
@@ -104,7 +103,7 @@

# Group=LS
# Description=The version number of the service.
-service.r.service_version=3.0
+service.r.service_version=3.1

# Group=LS
# Description=The email address of the person who manages the service.

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/wizard.properties
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/wizard.properties 2008-09-05
12:36:23 UTC (rev 4460)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/wizard.properties 2008-09-05
12:47:35 UTC (rev 4461)
@@ -29,7 +29,7 @@

<property>
<entry key="component.ma.xmldb.db_uri"
required="true">xmldb:exist://localhost:8180/exist/xmlrpc</entry>
- <Comment>Enter the location of the eXist database:</Comment>
+ <Comment>Enter the URI location of the eXist database:</Comment>
<ProposedValue>xmldb:exist://localhost:8180/exist/xmlrpc</ProposedValue>
<Group order="1">eXist</Group>
</property>
@@ -42,24 +42,26 @@
</property>

<property>
- <entry key="component.ma.xmldb.db_password" required="true"
password="true"></entry>
+ <entry key="component.ma.xmldb.db_password" required="true"
password="true">perfsonar</entry>
<Comment>Enter the password for the eXist user:</Comment>
- <ProposedValue></ProposedValue>
+ <ProposedValue>perfsonar</ProposedValue>
<Group order="3">eXist</Group>
</property>

<property>
- <entry key="component.ma.xmldb.db_adminpassword" required="true"
password="true"></entry>
- <Comment>Enter the eXist administration password:</Comment>
- <ProposedValue></ProposedValue>
- <Group order="4">eXist</Group>
+ <entry key="create_user" required="true">no</entry>
+ <Comment>Do you wish to create a user with this name?</Comment>
+ <ProposedValue>yes</ProposedValue>
+ <Group order="4" check="true">eXist</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
</property>

<property>
- <entry key="old_adminpassword" required="true"
password="true">perfsonar</entry>
- <Comment>Enter the old eXist administration password:</Comment>
- <ProposedValue>perfsonar</ProposedValue>
- <Group order="5">eXist</Group>
+ <entry key="old_adminpassword_1" required="true" password="true" />
+ <Comment>Enter the eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="5" dependsOn="4">eXist</Group>
</property>

<property>
@@ -69,10 +71,39 @@
<Group order="6">eXist</Group>
</property>

+ <property>
+ <entry key="change_admin_pass" required="true">no</entry>
+ <Comment>Do you wish to change the exist Admin password?</Comment>
+ <ProposedValue>yes</ProposedValue>
+ <Group order="7" check="true">eXist</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
+ </property>

+ <property>
+ <entry key="component.ma.xmldb.db_adminpassword" required="true"
password="true" />
+ <Comment>Enter the eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="8" dependsOn="7">eXist</Group>
+ </property>

+ <property>
+ <entry key="component.ma.xmldb.db_adminpassword_confirm" required="true"
password="true" />
+ <Comment>Confirm new eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="9" dependsOn="7">eXist</Group>
+ </property>

+ <property>
+ <entry key="old_adminpassword" required="true" password="true" />
+ <Comment>Enter the old eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="99" dependsOn="7">eXist</Group>
+ </property>

+
+
+
<property>
<entry key="service.r.service_name" required="true">perfSONAR Java RRD
MA</entry>
<Comment>Enter the service name:</Comment>

Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging (from rev 4460,
trunk/geant2-java-rrd-ma/packaging)

Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb (from rev 4460,
trunk/geant2-java-rrd-ma/packaging/deb)

Deleted: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog

Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog (from rev
4460, trunk/geant2-java-rrd-ma/packaging/deb/changelog)

Deleted: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/compat

Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/compat (from rev
4460, trunk/geant2-java-rrd-ma/packaging/deb/compat)

Deleted: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/conffiles

Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/conffiles (from rev
4460, trunk/geant2-java-rrd-ma/packaging/deb/conffiles)

Deleted: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/control

Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/control (from rev
4460, trunk/geant2-java-rrd-ma/packaging/deb/control)

Deleted: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/copyright

Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/copyright (from rev
4460, trunk/geant2-java-rrd-ma/packaging/deb/copyright)

Deleted: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/dirs

Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/dirs (from rev 4460,
trunk/geant2-java-rrd-ma/packaging/deb/dirs)

Deleted: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/docs

Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/docs (from rev 4460,
trunk/geant2-java-rrd-ma/packaging/deb/docs)

Deleted: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/install

Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/install (from rev
4460, trunk/geant2-java-rrd-ma/packaging/deb/install)

Deleted: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postinst

Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postinst (from rev
4460, trunk/geant2-java-rrd-ma/packaging/deb/postinst)

Deleted: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postrm

Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postrm (from rev
4460, trunk/geant2-java-rrd-ma/packaging/deb/postrm)

Deleted: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/preinst

Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/preinst (from rev
4460, trunk/geant2-java-rrd-ma/packaging/deb/preinst)

Deleted: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/prerm

Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/prerm (from rev
4460, trunk/geant2-java-rrd-ma/packaging/deb/prerm)

Deleted: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/rules

Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/rules (from rev
4460, trunk/geant2-java-rrd-ma/packaging/deb/rules)

Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/rpm (from rev 4460,
trunk/geant2-java-rrd-ma/packaging/rpm)

Deleted:
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/rpm/geant2-java-rrd-ma.specs

Copied:
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/rpm/geant2-java-rrd-ma.specs
(from rev 4460,
trunk/geant2-java-rrd-ma/packaging/rpm/geant2-java-rrd-ma.specs)

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/pom.xml
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/pom.xml 2008-09-05 12:36:23 UTC (rev
4460)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/pom.xml 2008-09-05 12:47:35 UTC (rev
4461)
@@ -139,12 +139,12 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-base</artifactId>
- <version>1.0.20080721</version>
+ <version>1.0.20080902</version>
</dependency>
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-web-admin</artifactId>
- <version>0.8.3b</version>
+ <version>0.9.2b</version>
</dependency>
<dependency>
<groupId>rrdjtool</groupId>
@@ -172,6 +172,31 @@
<version>2.3</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>Validation</groupId>
+ <artifactId>msv</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>Validation</groupId>
+ <artifactId>xsdlib</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>Validation</groupId>
+ <artifactId>isorelax</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>Validation</groupId>
+ <artifactId>isorelax-jaxp-bridge</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>Validation</groupId>
+ <artifactId>relaxngDatatype</artifactId>
+ <version>1.0</version>
+ </dependency>
</dependencies>
<reporting>
<excludeDefaults>true</excludeDefaults>

Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/samples/responses (from rev 4460,
trunk/geant2-java-rrd-ma/samples/responses)

Deleted: branches/GEANT2-JAVA-RRD-MA-STABLE/samples/responses/EchoResponse.xml

Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/samples/responses/EchoResponse.xml
(from rev 4460, trunk/geant2-java-rrd-ma/samples/responses/EchoResponse.xml)


  • perfsonar: r4461 - in branches/GEANT2-JAVA-RRD-MA-STABLE: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/graphics packaging packaging/deb packaging/rpm samples samples/responses, svnlog, 09/05/2008

Archive powered by MHonArc 2.6.16.

Top of Page