Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3331 - in branches/GEANT2_JAVA-RRD-MA-STABLE: ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF contrib/perf-client contrib/perf-client/helper contrib/perf-client/requests doc lib/misc

Subject: perfsonar development work

List archive

perfsonar: r3331 - in branches/GEANT2_JAVA-RRD-MA-STABLE: ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF contrib/perf-client contrib/perf-client/helper contrib/perf-client/requests doc lib/misc


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3331 - in branches/GEANT2_JAVA-RRD-MA-STABLE: ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF contrib/perf-client contrib/perf-client/helper contrib/perf-client/requests doc lib/misc
  • Date: Thu, 7 Feb 2008 06:20:22 -0500
Author: roman
Date: 2008-02-07 06:20:22 -0500 (Thu, 07 Feb 2008)
New Revision: 3331

Added:
branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/WEB-INF/server-config.wsdd
branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/default.css
branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/main.css
branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/partners.gif
branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/perfsonar_logo.gif
branches/GEANT2_JAVA-RRD-MA-STABLE/conf/service.properties.template-2
branches/GEANT2_JAVA-RRD-MA-STABLE/conf/servlet.properties
branches/GEANT2_JAVA-RRD-MA-STABLE/conf/wizard.properties
branches/GEANT2_JAVA-RRD-MA-STABLE/conf/wizardproperties.dtd
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/README.txt

branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/create_setupdata_requests_CNM.pl
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/helper/
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/helper/conf.txt

branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/helper/create_metadata_file.pl
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/CNM/

branches/GEANT2_JAVA-RRD-MA-STABLE/lib/misc/perfsonar-base-ant-1.0.20080204.jar
Removed:
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/helper/conf.txt

branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/helper/create_metadata_file.pl

branches/GEANT2_JAVA-RRD-MA-STABLE/lib/misc/perfsonar-base-ant-1.0.20070927.jar
Modified:
branches/GEANT2_JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
branches/GEANT2_JAVA-RRD-MA-STABLE/ant/const.properties.template
branches/GEANT2_JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/WEB-INF/web.xml
branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/index.html
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/perf-client.pl
branches/GEANT2_JAVA-RRD-MA-STABLE/doc/ChangeLog.txt
branches/GEANT2_JAVA-RRD-MA-STABLE/doc/Functional_Specification.doc
Log:
updated to include recent changes in the trunk




Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
2008-02-07 11:01:57 UTC (rev 3330)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
2008-02-07 11:20:22 UTC (rev 3331)
@@ -46,7 +46,8 @@
depends="copy-dep-base-service-jars">

<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080131/perfsonar-base-1.0.20080131.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080207/perfsonar-base-1.0.20080207.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.5b/perfsonar-web-admin-0.5b.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"/>

@@ -220,7 +221,115 @@
</target>


+
<!--
===================================================================================
-->
+ <!-- targets for web admin installation stuff -->
+
+ <!-- it is assumed that the installation location is /home/perfsonar
directory (user) -->
+
+
+ <property name="tmpdir" value="tmp" />
+
+ <target name="webapp-directory-prepare"
+ xmlns:psbase="psbase:/base.perfsonar.org">
+
+ <delete dir="${tmpdir}"/>
+ <delete dir="${tmpdir}-webapps"/>
+ <mkdir dir="${tmpdir}"/>
+
+
+ <copy file="${basedir}/conf/service.properties.template-2"
tofile="${basedir}/conf/service.properties"/>
+ <copy file="${basedir}/conf/components.properties.template"
tofile="${basedir}/conf/components.properties"/>
+ <copy file="${basedir}/conf/log4j.properties.template"
tofile="${basedir}/conf/log4j.properties"/>
+
+ <copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+
+ <copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080207/perfsonar-base-1.0.20080207.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.5b/perfsonar-web-admin-0.5b.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 file="${basedir}/conf/eventType-map.xml"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
+ <copy file="${basedir}/conf/eventType-rules.xml"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
+
+
+ <property name="service.ma.conf_file"
value="${basedir}/conf/rrd-database_TEST.xml" />
+
+ <replace file="${service.ma.conf_file}"
+ token="__BASEPATH__"
+
value="/home/perfsonar/webapps/${service.name}-${version}/WEB-INF"/>
+
+ <copy file="${service.ma.conf_file}"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
+
+ <copy file="${basedir}/conf/wsdd/${wsdd.file.deploy}"
todir="${tmpdir}/wsdd"/>
+ <copy file="${basedir}/conf/wsdd/${wsdd.file.undeploy}"
todir="${tmpdir}/wsdd"/>
+
+ <copy todir="${tmpdir}/WEB-INF/samples">
+ <fileset dir="${basedir}/samples"/>
+ </copy>
+
+ <copy todir="${tmpdir}/WEB-INF/contrib">
+ <fileset dir="${basedir}/contrib"/>
+ </copy>
+
+
+ <psbase:copy-dep-base-service-jars dest-jars-path="${tmpdir}"/>
+ <psbase:copy-axis-config dest-conf-path="${tmpdir}"/>
+
+ <copy file="${basedir}/conf/axis-1.4/WEB-INF/server-config.wsdd"
todir="${tmpdir}/WEB-INF"/>
+
+ <replace
file="${tmpdir}/WEB-INF/classes/perfsonar/conf/wizard.properties"
+ token="__BASEPATH__"
+
value="/home/perfsonar/webapps/${service.name}-${version}/WEB-INF" />
+
+ <replace file="${tmpdir}/WEB-INF/classes/perfsonar/conf/log4j.properties"
+ token="_LOGPATH_"
+
value="/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/logs"/>
+
+ <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+
message="service.sax_parser.config=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/objects.config${line.separator}"
+ append="true" />
+
+ <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+
message="service.ma.conf_file=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml${line.separator}"
+ append="true" />
+
+ <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+
message="service.log.log4j.config=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/log4j.properties"
+ append="true" />
+
+ <mkdir dir="${tmpdir}/WEB-INF/logs"/>
+
+ </target>
+
+
+
+ <target name="war-create"
+ depends="webapp-directory-prepare">
+
+ <zip destfile="${service.name}-${version}.war"
+ basedir="${tmpdir}/"
+ excludes=".svn/**" />
+
+ <delete dir="${tmpdir}"/>
+
+ </target>
+
+
+ <target name="webapp-create"
+ xmlns:psbase="psbase:/base.perfsonar.org"
+ depends="webapp-directory-prepare">
+
+ <move todir="${tmpdir}-webapps/webapps/${service.name}-${version}">
+ <fileset dir="${tmpdir}"/>
+ </move>
+
+ </target>
+
+
+
+ <!--
===================================================================================
-->
<!-- main targets -->


@@ -272,4 +381,5 @@
</target>


+
</project>
\ No newline at end of file

Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/ant/const.properties.template
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/ant/const.properties.template
2008-02-07 11:01:57 UTC (rev 3330)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/ant/const.properties.template
2008-02-07 11:20:22 UTC (rev 3331)
@@ -21,7 +21,7 @@
wsdd.webservice.name=MeasurementArchiveService

antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
-antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20070927.jar
+antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080204.jar

#rrdjtool native library
lib_name=libjrrd.so

Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
2008-02-07 11:01:57 UTC (rev 3330)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
2008-02-07 11:20:22 UTC (rev 3331)
@@ -54,10 +54,12 @@

<artifact:dependencies>

- <dependency groupId="rrdjtool" artifactId="rrdjtool"
version="1.0"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080131"/>
- <dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20071008"/>
+ <dependency groupId="rrdjtool" artifactId="rrdjtool"
version="1.0"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080207"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.5b"/>
+ <dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20071008"/>

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


Copied:
branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/WEB-INF/server-config.wsdd
(from rev 3330,
trunk/geant2_java-rrd-ma/conf/axis-1.4/WEB-INF/server-config.wsdd)

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-02-07 11:01:57 UTC (rev 3330)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/WEB-INF/web.xml
2008-02-07 11:20:22 UTC (rev 3331)
@@ -84,16 +84,82 @@
<extension>wsdl</extension>
<mime-type>text/xml</mime-type>
</mime-mapping>
-

+
<mime-mapping>
<extension>xsd</extension>
<mime-type>text/xml</mime-type>
</mime-mapping>

+
+
+ <!-- pS Config Servlet Admin -->
+
+ <servlet>
+ <servlet-name>
+ ServiceAdmin
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.service.Admin
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>
+ ServiceAdmin
+ </servlet-name>
+ <url-pattern>
+ /ServiceAdmin
+ </url-pattern>
+ </servlet-mapping>
+
+
+ <!-- pS Config eXist Admin -->
+
+ <servlet>
+ <servlet-name>
+ eXistAdmin
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.exist.eXistAdmin
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>
+ eXistAdmin
+ </servlet-name>
+ <url-pattern>
+ /eXistAdmin
+ </url-pattern>
+ </servlet-mapping>
+
+
+ <!-- pS Config Wizard Admin -->
+
+ <servlet>
+ <servlet-name>
+ Wizard
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.wizard.Wizard
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>
+ Wizard
+ </servlet-name>
+ <url-pattern>
+ /Wizard
+ </url-pattern>
+ </servlet-mapping>
+
+
+
<welcome-file-list id="WelcomeFileList">
+ <welcome-file>index.html</welcome-file>
<welcome-file>index.jsp</welcome-file>
- <welcome-file>index.html</welcome-file>
<welcome-file>index.jws</welcome-file>
</welcome-file-list>


Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/default.css (from
rev 3330, trunk/geant2_java-rrd-ma/conf/axis-1.4/default.css)

Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/index.html
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/index.html 2008-02-07
11:01:57 UTC (rev 3330)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/index.html 2008-02-07
11:20:22 UTC (rev 3331)
@@ -1,21 +1,79 @@
-<html>
-
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta http-equiv="Refresh" content="5;url=index.jsp">
- <title>Apache-Axis</title>
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<h1 align="center">Apache-AXIS</h1>
-
-<blockquote>
- We've moved to an internationalized <a href="index.jsp">top page</a>. The
new URL should be automatically loaded after 5 seconds.<br>
-If you want to visit the new site immediately, please click the above link.
-</blockquote>
-
-<hr>
-Copyright &copy 2005 The Apache Software Foundation. All rights reserved.
-</body>
-</html>
+<html>
+
+ <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"><style type="text/css">
+<!--
+body,td,th {
+ font-family: arial;
+}
+a:hover {
+ color: #000000;
+}
+-->
+</style></head>
+ <body>
+<div class="adminPanel" >
+
+<div class="banner">
+<table border="0" align="left" cellpadding="0" cellspacing="0">
+<tr>
+ <td><img src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94"
border="0" align="right"></td>
+</tr>
+</table>
+
+</div>
+
+<div class="mainWindow" >
+
+<div class="sidebar" >
+<table border="0" cellpadding="0" cellspacing="0">
+<tr >
+<th>Administration</th>
+</tr>
+<tr>
+ <td><p><a href="Wizard" target="main" class="navtex" >Service</a></p>
+ <p><a href="Wizard" target="main" class="navtex" >Configuration</a></p>
+ <p><a href="Wizard" target="main" class="navtex" >Wizard</a></p></td>
+</tr>
+<tr>
+ <td><p><a href="ServiceAdmin?serviceProperties" target="main"
class="navtex" >Service</a></p>
+ <p><a href="ServiceAdmin?serviceProperties" target="main" class="navtex"
>configuration</a></p></td>
+</tr>
+<tr>
+ <td>
+ <p><a href="ServiceAdmin?loggingProperties" target="main" class="navtex"
>logging</a></p>
+ <p><a href="ServiceAdmin?loggingProperties" target="main" class="navtex"
>configuration</a>
+ </p>
+ </p></td>
+</tr>
+<tr><td><p><a href="eXistAdmin" target="main" class="navtex" >eXist
Database</a></p>
+ <p><a href="eXistAdmin" target="main" class="navtex"
>Administration</a></p></td>
+</tr>
+</table>
+<a href="http://www.perfsonar.net/partners.html";></a> <br>
+<img src="partners.gif" alt="perfSONAR project partners" border="0"/>
</a></div>
+
+<div class="centerWindow" >
+ <object data="http://www.perfsonar.net"; type="text/html" name="main"
width="101%" height="106%" class="main" >
+ <p>Sorry for the inconvenience we are having connectiong to the main
page...</p>
+ </object>
+</div>
+
+
+</div>
+
+<div class="footer" >PERFormance Service-Oriented Network monitoring
ARchitecture &nbsp;</div>
+
+
+
+
+
+</div>
+
+
+ </body>
+</html>
+
+

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/main.css (from rev
3330, trunk/geant2_java-rrd-ma/conf/axis-1.4/main.css)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/partners.gif (from
rev 3330, trunk/geant2_java-rrd-ma/conf/axis-1.4/partners.gif)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/perfsonar_logo.gif
(from rev 3330, trunk/geant2_java-rrd-ma/conf/axis-1.4/perfsonar_logo.gif)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/service.properties.template-2
(from rev 3330, trunk/geant2_java-rrd-ma/conf/service.properties.template-2)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/servlet.properties (from rev
3330, trunk/geant2_java-rrd-ma/conf/servlet.properties)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/wizard.properties (from rev
3330, trunk/geant2_java-rrd-ma/conf/wizard.properties)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/wizardproperties.dtd (from
rev 3330, trunk/geant2_java-rrd-ma/conf/wizardproperties.dtd)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/README.txt
(from rev 3330, trunk/geant2_java-rrd-ma/contrib/perf-client/README.txt)

Copied:
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/create_setupdata_requests_CNM.pl
(from rev 3330,
trunk/geant2_java-rrd-ma/contrib/perf-client/create_setupdata_requests_CNM.pl)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/helper (from
rev 3330, trunk/geant2_java-rrd-ma/contrib/perf-client/helper)

Deleted:
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/helper/conf.txt

Copied:
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/helper/conf.txt (from
rev 3330, trunk/geant2_java-rrd-ma/contrib/perf-client/helper/conf.txt)

Deleted:
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/helper/create_metadata_file.pl

Copied:
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/helper/create_metadata_file.pl
(from rev 3330,
trunk/geant2_java-rrd-ma/contrib/perf-client/helper/create_metadata_file.pl)

Modified:
branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/perf-client.pl
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/perf-client.pl
2008-02-07 11:01:57 UTC (rev 3330)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/perf-client.pl
2008-02-07 11:20:22 UTC (rev 3331)
@@ -12,6 +12,8 @@
# perl perf-client.pl retrieve-all <interfaces_configured>
# perl perf-client.pl refresh <interfaces_configured>
<number_of_interfaces_to_be_polled>
# perl perf-client.pl user-selection <interfaces_configured>
<interface_to_be_polled>
+# perl perf-client.pl cnm-direct <interfaces_configured>
+# perl perf-client.pl cnm-indirect <interfaces_configured>
#

use threads;
@@ -80,6 +82,31 @@
";
}

+if ($type =~ /CNM-indirect/){
+
+ $requests = $interfaces;
+ @out =`perl create_setupdata_requests_CNM.pl $interfaces indirect`;
+ print @out;
+ $polling_time = clientpart(1, "cnm-indirect" , $requests);
+
+ print "
+ Time used:
+ All interfaces using CNM indirect: $polling_time
+ ";
+}
+if ($type =~ /CNM-direct/){
+
+ $requests = $interfaces;
+ @out =`perl create_setupdata_requests_CNM.pl $interfaces direct`;
+ $polling_time = clientpart(1, "cnm-direct" , $requests);
+
+ print "
+ Time used:
+ All interfaces using CNM direct: $polling_time
+ ";
+}
+
+
#clientpart (number_of_threads , setupdata / singlesetup / refresh /
metadata , number_of_requests)
sub clientpart{

@@ -118,8 +145,21 @@
$DataQueue->enqueue("requests/refresh/setupDataRequest-$i.xml");
}
}
+ if ($type =~ /cnm-indirect/){
+ for ($i = 0 ; $i< $requests ; $i++){
+ $DataQueue->enqueue("requests/CNM/metadataDataRequest-in-$i.xml");
+ $DataQueue->enqueue("requests/CNM/setupDataRequest-in-$i.xml");
+ $DataQueue->enqueue("requests/CNM/metadataDataRequest-out-$i.xml");
+ $DataQueue->enqueue("requests/CNM/setupDataRequest-out-$i.xml");
+ }
+ }
+ if ($type =~ /cnm-direct/){
+ for ($i = 0 ; $i< $requests ; $i++){
+ $DataQueue->enqueue("requests/CNM/setupDataRequest-in-$i.xml");
+ $DataQueue->enqueue("requests/CNM/setupDataRequest-out-$i.xml");
+ }
+ }

-
#Provide as many undefs as the threads spawned
#This way we break the infinite while in the make_request sub

@@ -179,6 +219,7 @@
my $result = $httpResponse->as_string(2);
### We got a result. We can throw it away now :)
### When we get out of scope, $result is no longer a concern for perl
+ print "$result\n\n\n";
}
return 1;
}

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/contrib/perf-client/requests/CNM
(from rev 3330, trunk/geant2_java-rrd-ma/contrib/perf-client/requests/CNM)

Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/doc/ChangeLog.txt 2008-02-07
11:01:57 UTC (rev 3330)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/doc/ChangeLog.txt 2008-02-07
11:20:22 UTC (rev 3331)
@@ -1,11 +1,13 @@
RRD MA ChangeLog


-2007-12-21 Version 3.0
+2008-02-07 Version 3.0

- New namespace (netutil) of datum element in the response containing
utilization value is used
- supportedEventTypes parameter in metadata element (in metadata
cofiguration file) replaced with eventType element
(the parameter is still supported).
+- Web administration (set of servlets) added.
+- RPM is used as the installation package.

2007-11-23 Version 2.3.2


Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/doc/Functional_Specification.doc
===================================================================
(Binary files differ)

Deleted:
branches/GEANT2_JAVA-RRD-MA-STABLE/lib/misc/perfsonar-base-ant-1.0.20070927.jar

Copied:
branches/GEANT2_JAVA-RRD-MA-STABLE/lib/misc/perfsonar-base-ant-1.0.20080204.jar
(from rev 3330,
trunk/geant2_java-rrd-ma/lib/misc/perfsonar-base-ant-1.0.20080204.jar)


  • perfsonar: r3331 - in branches/GEANT2_JAVA-RRD-MA-STABLE: ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF contrib/perf-client contrib/perf-client/helper contrib/perf-client/requests doc lib/misc, svnlog, 02/07/2008

Archive powered by MHonArc 2.6.16.

Top of Page