Chronological Thread 

< Chronological >      < Thread >

---

Author: roman
Date: 2007-05-07 06:16:35 -0400 (Mon, 07 May 2007)
New Revision: 2365

Added:
branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/jar/copy-jars-from-lib
branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/words
branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/words_create

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LookupInfo-Req.xml

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/client/testHarness/SOAPX509Client.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/auxiliary/components/authn/

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/auxiliary/components/authn/DynamicCrypto.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/auxiliary/components/authn/SOAPUtil.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/messages/LSCleanupRequest.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/messages/LookupInfoRequest.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/util/TimeDateUtil.java
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AADispatchManager.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AADispatchProtocol.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AADispatchProtocolFactory.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AADispatchSOAPProtocol.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AuthNRequest.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AuthNResponse.java
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/tokens/

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/tokens/SecTokenManager.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/tokens/SecTokenManagerFactory.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/tokens/SecTokenSOAPManager.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/tokens/SecurityToken.java
Removed:

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/auxiliary/components/authn/DynamicCrypto.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/auxiliary/components/authn/SOAPUtil.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AADispatchManager.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AADispatchProtocol.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AADispatchProtocolFactory.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AADispatchSOAPProtocol.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AuthNRequest.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AuthNResponse.java
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/tokens/

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/tokens/SecTokenManager.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/tokens/SecTokenManagerFactory.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/tokens/SecTokenSOAPManager.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/tokens/SecurityToken.java
Modified:
branches/JAVA-RRD-MA-STABLE/ant/configure-targets.xml
branches/JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml
branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-client-run-targets.xml
branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-configure-targets.xml
branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-pre-install-targets.xml
branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-test-run-targets.xml
branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/config.props
branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/generateDB.pl
branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/generate_files
branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/jar/required-jars
branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/runclient
branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/test1
branches/JAVA-RRD-MA-STABLE/contrib/mapi-jni/native/src/mapijni.c

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml
branches/JAVA-RRD-MA-STABLE/src/objects.config
branches/JAVA-RRD-MA-STABLE/src/org/
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/client/axis/AxisClient.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/client/commons/requests/lookupService/LSRegisterRequestGenerator.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/messages/LSKeepaliveRequest.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/engine/ActionType.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/registration/GenericServiceLSRegistrator.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/storage/xmldb/exist/rest/HTTPAccess.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/Transformations.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/rrdType/RRDStorageManager.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
Log:

merging

svn merge -r 2318:2364
https://svn.perfsonar.net/svn/perfsonar/trunk/perfsonar




Modified: branches/JAVA-RRD-MA-STABLE/ant/configure-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/configure-targets.xml 2007-04-27
09:34:42 UTC (rev 2364)
+++ branches/JAVA-RRD-MA-STABLE/ant/configure-targets.xml 2007-05-07
10:16:35 UTC (rev 2365)
@@ -107,6 +107,35 @@
</target>


+ <!-- service description, contact email and organization name -->

+
+ <target name="set-service-descr-email-organization">
+
+ <input message="Enter the service description:"
+ addproperty="service.description"
+ defaultvalue="perfSONAR service"/>
+
+ <input message="Enter the contact email address of service owner:"
+ addproperty="service.contact.email"
+ defaultvalue=""/>
+
+ <input message="Enter the organization name where the service is
being installed:"
+ addproperty="service.organization.name"
+ defaultvalue=""/>
+
+ <propertyfile file="conf/service.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="service.r.service_description"
value="${service.description}"/>
+ <entry key="service.r.contact_email"
value="${service.contact.email}"/>
+ <entry key="service.r.organization_name"
value="${service.organization.name}"/>
+
+ </propertyfile>
+
+ </target>
+
+
+
</project>


Modified: branches/JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml 2007-04-27
09:34:42 UTC (rev 2364)
+++ branches/JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml 2007-05-07
10:16:35 UTC (rev 2365)
@@ -66,7 +66,12 @@
<dependency groupId="exist"
artifactId="exist-xmlrpc" version="1.0rc"/>
<dependency groupId="exist"
artifactId="exist-optional" version="1.0rc"/>

+ <dependency groupId="xml-security" artifactId="xmlsec"
version="1.3.0"/>
+ <dependency groupId="bouncycastle"
artifactId="bcprov-jdk15" version="124"/>
+ <dependency groupId="wss4j" artifactId="wss4j"
version="1.5.1"/>

+ <dependency groupId="joda-time"
artifactId="joda-time" version="1.4"/>
+
<localRepository refid="local.repository"/>
<remoteRepository refid="remote.repository"/>


Modified: branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml
2007-04-27 09:34:42 UTC (rev 2364)
+++ branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml
2007-05-07 10:16:35 UTC (rev 2365)
@@ -36,6 +36,8 @@
<copy
file="./lib/repository/net/sf/saxon/saxon-jdom/8.7/saxon-jdom-8.7.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="./lib/repository/net/sf/saxon/saxon-dom/8.7/saxon-dom-8.7.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

+ <copy
file="./lib/repository/joda-time/joda-time/1.4/joda-time-1.4.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+
<copy file="./conf/eventType-map.xml"

todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
<copy file="./conf/eventType-rules.xml"

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

@@ -70,6 +72,8 @@
<delete
file="${service.home}/${deploy.root}/WEB-INF/lib/saxon-jdom-8.7.jar"/>
<delete
file="${service.home}/${deploy.root}/WEB-INF/lib/saxon-dom-8.7.jar"/>

+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/joda-time-1.4.jar"/>
+
<delete
file="${service.home}${deploy.root}/WEB-INF/classes/perfsonar/conf/eventType-map.xml"
/>
<delete
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/eventType-rules.xml"
/>


Modified: branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-client-run-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-client-run-targets.xml
2007-04-27 09:34:42 UTC (rev 2364)
+++ branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-client-run-targets.xml
2007-05-07 10:16:35 UTC (rev 2365)
@@ -19,7 +19,36 @@
<property name="ma.local"
value="http://${target.server}:${target.port}/${deploy.root}/services/MeasurementArchiveService"/>


+ <!-- echo -->

+
+ <target name="run-echo">
+
+ <java classname="org.perfsonar.client.testHarness.SOAPClient"
+ classpathref="classpath" fork="true">
+ <arg value="${ma.local}"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/Echo-Req.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-1.xml"/>
+ </java>
+
+ </target>
+
+
+ <!-- lookup info -->
+
+
+ <target name="run-lookup-info">
+
+ <java classname="org.perfsonar.client.testHarness.SOAPClient"
+ classpathref="classpath" fork="true">
+ <arg value="${ma.local}"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/LookupInfo-Req.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-2.xml"/>
+ </java>
+
+ </target>
+
+
<!-- fetching -->


@@ -29,7 +58,7 @@
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-3.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -48,7 +77,7 @@
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-4.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -67,7 +96,7 @@
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-3.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-5.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -84,7 +113,7 @@
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-4.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-6.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -103,7 +132,7 @@
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-3.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response-5.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-7.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -158,7 +187,7 @@
fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-8.xml"/>
</java>

</target>
@@ -171,24 +200,11 @@
fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-Key-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-9.xml"/>
</java>

</target>



- <target name="run-echo">
-
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath" fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/Echo-Req.xml"/>
- <arg
value="${basedir}/schema/example-instances/perfSONAR/response.xml"/>
- </java>
-
- </target>
-
-
-
</project>

Modified: branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-configure-targets.xml
2007-04-27 09:34:42 UTC (rev 2364)
+++ branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-configure-targets.xml
2007-05-07 10:16:35 UTC (rev 2365)
@@ -93,10 +93,13 @@
<propertyfile file="conf/service.properties"
comment="This file was created by the Ant
configuration script.">

+ <!-- first two properties:
-->
+ <!-- do want to keep both properties which are almost the
same -->
+ <!-- needs to be checked
-->
<entry key="service.r.type" value="ma"/>
- <entry key="service.r.service_name" value="Java RRD MA"/>
<entry key="service.r.service_type" value="RRD MA"/>
- <entry key="service.r.service_description" value="Java RRD MA,
perfSONAR project"/>
+ <entry key="service.r.service_name"
value="${service.name}"/>
+ <entry key="service.r.service_version"
value="${service.version}${service.version.candidate}"/>

<entry key="service.log.log4j.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>
<entry key="service.sax_parser.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/objects.config"/>
@@ -106,7 +109,7 @@
<entry key="service.r.ma.format" value="rrd"/>

<entry key="service.ma.conf_file"
value="${rrd.config.file}"/>
- <entry key="service.ma.message_types"
value="MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,EchoRequest"/>
+ <entry key="service.ma.message_types"
value="MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,EchoRequest,LookupInfoRequest"/>
<entry key="service.ma.class_name"
value="org.perfsonar.service.measurementArchive.rrdType.RRDTypeMAServiceEngine"/>

<entry key="service.ma.xmldb.db_store" value="off"/>
@@ -262,6 +265,7 @@
<antcall target="exist-init"/>
<antcall target="store-fuctionality-for-rrdma"/>
<antcall target="register-fuctionality-for-rrdma"/>
+ <antcall target="set-service-descr-email-organization"/>

</target>


Modified: branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-pre-install-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-pre-install-targets.xml
2007-04-27 09:34:42 UTC (rev 2364)
+++ branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-pre-install-targets.xml
2007-05-07 10:16:35 UTC (rev 2365)
@@ -21,7 +21,10 @@
<!-- properties -->


- <property name="service.name" value="perfSONAR-RRD-MA-2.0-beta" />
+ <property name="service.base.name" value="RRD-MA" />
+ <property name="service.version" value="2.1" />
+ <property name="service.version.candidate" value="-beta" />
+ <property name="service.name"
value="perfSONAR-${service.base.name}-${service.version}${service.version.candidate}"
/>


<property name="_exist.war.download.url"

Modified: branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-test-run-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-test-run-targets.xml
2007-04-27 09:34:42 UTC (rev 2364)
+++ branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-test-run-targets.xml
2007-05-07 10:16:35 UTC (rev 2365)
@@ -24,6 +24,7 @@
<echo></echo>

<antcall target="run-echo"/>
+ <antcall target="run-lookup-info"/>

<antcall target="run-rrdma-client-1"/>
<antcall target="run-rrdma-client-2"/>

Modified: branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/config.props
===================================================================
--- branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/config.props
2007-04-27 09:34:42 UTC (rev 2364)
+++ branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/config.props
2007-05-07 10:16:35 UTC (rev 2365)
@@ -1,7 +1,8 @@
-LOOKUP_SERVICE=http://localhost:8080/axis/services/LookupService
+LOOKUP_SERVICE=http://localhost:8080/projects/services/LookupService
+#LOOKUP_SERVICE=http://localhost:8080/axis/services/LookupService
#LOOKUP_SERVICE=http://loco4.man.poznan.pl:8090/axis/services/LookupService

-JAVA=/usr/java/java/bin/java
+JAVA=/usr/bin/java

TEMPDIR=temp
INPUTDIR=storage

Modified: branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/generateDB.pl
===================================================================
--- branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/generateDB.pl
2007-04-27 09:34:42 UTC (rev 2364)
+++ branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/generateDB.pl
2007-05-07 10:16:35 UTC (rev 2365)
@@ -29,6 +29,10 @@
# registration information. (services/and interfaces
# hosted by that service.)
#
+# Require:
+# WorlList.pm:
+# http://search.cpan.org/~adeo/Data-Random-0.05/Random/WordList.pm
+#
# Usage:
# ./generateDB.pl -s nservices -i ninterfaces -t (message|store)
#
@@ -61,7 +65,8 @@
NUMINTERFACES => 100,
EXACTINTERFACES => 0,
TYPE => "message",
- DICT => '/usr/share/dict/words',
+# DICT => '/usr/share/dict/words',
+ DICT => 'words',
);

# reverse mapping of command-line hash

Modified: branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/generate_files
===================================================================
--- branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/generate_files
2007-04-27 09:34:42 UTC (rev 2364)
+++ branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/generate_files
2007-05-07 10:16:35 UTC (rev 2365)
@@ -2,6 +2,10 @@

STORAGE_DIR=storage

+if [ -x $STORAGE_DIR ] ; then :
+else mkdir $STORAGE_DIR
+fi
+
#test1

echo Remove old test1 files

Copied:
branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/jar/copy-jars-from-lib
(from rev 2364,
trunk/perfsonar/contrib/benchmarking/ls/jar/copy-jars-from-lib)

Modified:
branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/jar/required-jars
===================================================================
--- branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/jar/required-jars
2007-04-27 09:34:42 UTC (rev 2364)
+++ branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/jar/required-jars
2007-05-07 10:16:35 UTC (rev 2365)
@@ -1,5 +1,3 @@
-These JAR files are required to run the client:
-
activation-1.0.2.jar
axis-1.4.jar
axis-jaxrpc-1.4.jar
@@ -7,8 +5,4 @@
commons-discovery-0.2.jar
commons-logging-1.0.4.jar
mail-1.3.2.jar
-required-jars
xercesImpl-2.6.2.jar
-
-They all may be found on our local JAR repository or a public one.
-

Modified: branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/runclient
===================================================================
--- branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/runclient
2007-04-27 09:34:42 UTC (rev 2364)
+++ branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/runclient
2007-05-07 10:16:35 UTC (rev 2365)
@@ -7,7 +7,7 @@

. config.props

-CLASSPATH=/projects/sonar/perfsonar/build
+CLASSPATH=../../../build
CLIENT=org.perfsonar.client.testHarness.SOAPClient

LOOKUP_SERVICE=$1
@@ -20,4 +20,5 @@

# ------ build CLASSPATH ----------------------------------------------------

-$JAVA -classpath $CLASSPATH $CLIENT $LOOKUP_SERVICE $INPUT_FILE $OUTPUT_FILE
| grep "time taken" | sed "s/^.*\:\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/"
+$JAVA -classpath $CLASSPATH $CLIENT $LOOKUP_SERVICE $INPUT_FILE $OUTPUT_FILE
+# | grep "time taken" | sed "s/^.*\:\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/"
\ No newline at end of file

Modified: branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/test1
===================================================================
--- branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/test1 2007-04-27
09:34:42 UTC (rev 2364)
+++ branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/test1 2007-05-07
10:16:35 UTC (rev 2365)
@@ -12,6 +12,14 @@
#where to store results
CSV=test1.csv

+if [ -x $TEMPDIR ] ; then :
+else mkdir $TEMPDIR
+fi
+
+if [ -x $OUTPUTDIR ] ; then :
+else mkdir $OUTPUTDIR
+fi
+
#CSV Header
echo "file,interfaces,register,reregister,deregister" > $OUTPUTDIR/$CSV

@@ -29,13 +37,14 @@

#register
echo [Registering]
+ REGISTER=0
REGISTER=$(./runclient $LOOKUP_SERVICE $i $TEMPDIR/out.register.xml.temp)
echo $REGISTER

#re-register
echo [Re-registering]
REREGISTER=0
- #REREGISTER=$(./runclient $LOOKUP_SERVICE $i
$TEMPDIR/out.reregister.xml.temp)
+ REREGISTER=$(./runclient $LOOKUP_SERVICE $i
$TEMPDIR/out.reregister.xml.temp)
echo $REREGISTER

#deregister
@@ -47,7 +56,7 @@
cat $TEMPDIR/metadata.temp >> $TEMPDIR/deregister-request.temp
cat $TEMPLATEDIR/LSDeregisterRequest.xml.FOOT >>
$TEMPDIR/deregister-request.temp

-
+ DEREGISTER=0
DEREGISTER=$(./runclient $LOOKUP_SERVICE
$TEMPDIR/deregister-request.temp $TEMPDIR/out.deregister.xml.temp)
echo $DEREGISTER


Copied: branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/words (from rev
2364, trunk/perfsonar/contrib/benchmarking/ls/words)

Copied: branches/JAVA-RRD-MA-STABLE/contrib/benchmarking/ls/words_create
(from rev 2364, trunk/perfsonar/contrib/benchmarking/ls/words_create)

Modified: branches/JAVA-RRD-MA-STABLE/contrib/mapi-jni/native/src/mapijni.c
===================================================================
--- branches/JAVA-RRD-MA-STABLE/contrib/mapi-jni/native/src/mapijni.c
2007-04-27 09:34:42 UTC (rev 2364)
+++ branches/JAVA-RRD-MA-STABLE/contrib/mapi-jni/native/src/mapijni.c
2007-05-07 10:16:35 UTC (rev 2365)
@@ -46,7 +46,7 @@
throwMAPIException(env, errbuf, *errnum)

/* Capture format type mapping between MAPI-JNI and MAPI */
-static int capFormatTypes[] = {
+static const int capFormatTypes[] = {
MFF_PCAP,
MFF_RAW,
MFF_DAG_ERF,
@@ -56,7 +56,7 @@
capFormatTypes[0] : capFormatTypes[x])

/* Sample mode type mapping between MAPI-JNI and MAPI */
-static int sampleModes[] = {
+static const int sampleModes[] = {
PERIODIC,
PROBABILISTIC
};
@@ -64,7 +64,7 @@
sampleModes[0] : sampleModes[x])

/* Anonymization function protocol type mapping between MAPI-JNI and MAPI */
-static int anonfuncProtoTypes[] = {
+static const int anonfuncProtoTypes[] = {
IP,
TCP,
UDP,
@@ -74,9 +74,22 @@
};
#define getAnonfuncProtoType(x) ((x < 0 || x > sizeof(anonfuncProtoTypes) /
sizeof(int)) ? \
anonfuncProtoTypes[0] : anonfuncProtoTypes[x])
+
+/* Anonymization function protocol type string representation */
+static const char* anonfuncProtoTypeStrs[] = {
+ "IP",
+ "TCP",
+ "UDP",
+ "ICMP",
+ "HTTP",
+ "FTP"
+};
+#define getAnonfuncProtoTypeStrs(x) ((x < 0 || x >
sizeof(anonfuncProtoTypeStrs) / sizeof(char*)) ? \
+ "?" : anonfuncProtoTypeStrs[x])

+
/* Anonymization function type mapping between MAPI-JNI and MAPI */
-static int anonfuncTypes[] = {
+static const int anonfuncTypes[] = {
UNCHANGED,
MAP,
MAP_DISTRIBUTION,
@@ -94,9 +107,29 @@
};
#define getAnonfuncType(x) ((x < 0 || x > sizeof(anonfuncTypes) /
sizeof(int)) ? \
anonfuncTypes[0] : anonfuncTypes[x])
-
+
+/* Anonymization function type string representation */
+static const char* anonfuncTypeStrs[] = {
+ "UNCHANGED",
+ "MAP",
+ "MAP_DISTRIBUTION",
+ "STRIP",
+ "RANDOM",
+ "HASHED",
+ "PATTERN_FILL",
+ "ZERO",
+ "REPLACE",
+ "PREFIX_PRESERVING",
+ "PREFIX_PRESERVING_MAP",
+ "CHECKSUM_ADJUST",
+ "FILENAME_RANDOM",
+ "REGEXP"
+};
+#define getAnonfuncTypeStrs(x) ((x < 0 || x > sizeof(anonfuncTypeStrs) /
sizeof(char*)) ? \
+ "?" : anonfuncTypeStrs[x])
+
/* Anonymization hash function type mapping between MAPI-JNI and MAPI */
-static int anonfuncHashTypes[] = {
+static const int anonfuncHashTypes[] = {
ANON_SHA,
ANON_MD5,
ANON_CRC32,
@@ -108,16 +141,37 @@
#define getAnonfuncHashType(x) ((x < 0 || x > sizeof(anonfuncHashTypes) /
sizeof(int)) ? \
anonfuncHashTypes[0] : anonfuncHashTypes[x])

+/* Anonymization hash function type string representation */
+static const char* anonfuncHashTypeStrs[] = {
+ "SHA",
+ "MD5",
+ "CRC32",
+ "SHA_2",
+ "TRIPLEDES",
+ "AES",
+ "DES"
+};
+#define getAnonfuncHashTypeStrs(x) ((x < 0 || x >
sizeof(anonfuncHashTypeStrs) / sizeof(char*)) ? \
+ "?" : anonfuncHashTypeStrs[x])
+
/* Anonymization function padding type mapping between MAPI-JNI and MAPI */
-static int anonfuncPaddingTypes[] = {
+static const int anonfuncPaddingTypes[] = {
PAD_WITH_ZERO,
STRIP_REST
};
#define getAnonfuncPaddingType(x) ((x < 0 || x >
sizeof(anonfuncPaddingTypes) / sizeof(int)) ? \
anonfuncPaddingTypes[0] : anonfuncPaddingTypes[x])
+
+/* Anonymization function padding type string representation */
+static const char* anonfuncPaddingTypeStrs[] = {
+ "PAD_WITH_ZERO",
+ "STRIP_REST"
+};
+#define getAnonfuncPaddingTypeStrs(x) ((x < 0 || x >
sizeof(anonfuncPaddingTypeStrs) / sizeof(char*)) ? \
+ "?" : anonfuncPaddingTypeStrs[x])

/* Anonymization function base field type mapping between MAPI-JNI and MAPI
*/
-static int anonfuncBaseFieldTypes[] = {
+static const int anonfuncBaseFieldTypes[] = {
PAYLOAD,
CHECKSUM,
SRC_IP,
@@ -241,43 +295,164 @@
#define getAnonfuncBaseFieldType(x) ((x < 0 || x >
sizeof(anonfuncBaseFieldTypes) / sizeof(int)) ? \
anonfuncBaseFieldTypes[0] : anonfuncBaseFieldTypes[x])

+/* Anonymization function base field type string representation */
+static const char* anonfuncBaseFieldTypeStrs[] = {
+ "PAYLOAD",
+ "CHECKSUM",
+ "SRC_IP",
+ "DST_IP",
+ "TTL",
+ "TOS",
+ "ID",
+ "FIELD_VERSION",
+ "OPTIONS",
+ "PACKET_LENGTH",
+ "IP_PROTO",
+ "IHL",
+ "FRAGMENT_OFFSET",
+ "SRC_PORT",
+ "DST_PORT",
+ "SEQUENCE_NUMBER",
+ "OFFSET_AND_RESERVED",
+ "ACK_NUMBER",
+ "FLAGS",
+ "URGENT_POINTER",
+ "WINDOW",
+ "TCP_OPTIONS",
+ "UDP_DATAGRAM_LENGTH",
+ "TYPE",
+ "CODE",
+ "HTTP_VERSION",
+ "METHOD",
+ "URI",
+ "USER_AGENT",
+ "ACCEPT",
+ "ACCEPT_CHARSET",
+ "ACCEPT_ENCODING",
+ "ACCEPT_LANGUAGE",
+ "ACCEPT_RANGES",
+ "AGE",
+ "ALLOW",
+ "AUTHORIZATION",
+ "CACHE_CONTROL",
+ "CONNECTION_TYPE",
+ "CONTENT_TYPE",
+ "CONTENT_LENGTH",
+ "CONTENT_LOCATION",
+ "CONTENT_MD5",
+ "CONTENT_RANGE",
+ "COOKIE",
+ "ETAG",
+ "EXPECT",
+ "EXPIRES",
+ "FROM",
+ "HOST",
+ "IF_MATCH",
+ "IF_MODIFIED_SINCE",
+ "IF_NONE_MATCH",
+ "IF_RANGE",
+ "IF_UNMODIFIED_SINCE",
+ "LAST_MODIFIED",
+ "MAX_FORWRDS",
+ "PRAGMA",
+ "PROXY_AUTHENTICATE",
+ "PROXY_AUTHORIZATION",
+ "RANGE",
+ "REFERRER",
+ "RETRY_AFTER",
+ "SET_COOKIE",
+ "SERVER",
+ "TE",
+ "TRAILER",
+ "TRANSFER_ENCODING",
+ "UPGRADE",
+ "VIA",
+ "WARNING",
+ "WWW_AUTHENTICATE",
+ "X_POWERED_BY",
+ "RESPONSE_CODE",
+ "RESP_CODE_DESCR",
+ "VARY",
+ "DATE",
+ "CONTENT_ENCODING",
+ "KEEP_ALIVE",
+ "LOCATION",
+ "CONTENT_LANGUAGE",
+ "DERIVED_FROM",
+ "ALLOWED",
+ "MIME_VERSION",
+ "TITLE",
+ "REFRESH",
+ "HTTP_PAYLOAD",
+ "USER",
+ "PASS",
+ "ACCT",
+ "FTP_TYPE",
+ "STRU",
+ "MODE",
+ "CWD",
+ "PWD",
+ "CDUP",
+ "PASV",
+ "RETR",
+ "REST",
+ "PORT",
+ "LIST",
+ "NLST",
+ "QUIT",
+ "SYST",
+ "STAT",
+ "HELP",
+ "NOOP",
+ "STOR",
+ "APPE",
+ "STOU",
+ "ALLO",
+ "MKD",
+ "RMD",
+ "DELE",
+ "RNFR",
+ "RNTO",
+ "SITE",
+ "FTP_RESPONSE_CODE",
+ "FTP_RESPONSE_ARG"
+};
+#define getAnonfuncBaseFieldTypeStrs(x) ((x < 0 || x >
sizeof(anonfuncBaseFieldTypeStrs) / sizeof(char*)) ? \
+ "?" : anonfuncBaseFieldTypeStrs[x])
+
/* Anonymization function pattern type mapping between MAPI-JNI and MAPI */
-static int anonfuncPatternTypes[] = {
+static const int anonfuncPatternTypes[] = {
INTEGER,
STR
};
#define getAnonfuncPatternType(x) ((x < 0 || x >
sizeof(anonfuncPatternTypes) / sizeof(int)) ? \
anonfuncPatternTypes[0] : anonfuncPatternTypes[x])
+
+/* Anonymization function pattern type string representation */
+static const char* anonfuncPatternTypeStrs[] = {
+ "INTEGER",
+ "STR"
+};
+#define getAnonfuncPatternTypeStrs(x) ((x < 0 || x >
sizeof(anonfuncPatternTypeStrs) / sizeof(char*)) ? \
+ "?" : anonfuncPatternTypeStrs[x])

/* Anonymization function map distribution type mapping between MAPI-JNI and
MAPI */
-static int anonfuncMapDistrTypes[] = {
+static const int anonfuncMapDistrTypes[] = {
GAUSSIAN,
UNIFORM
};
#define getAnonfuncMapDistrType(x) ((x < 0 || x >
sizeof(anonfuncMapDistrTypes) / sizeof(int)) ? \
anonfuncMapDistrTypes[0] : anonfuncMapDistrTypes[x])

-/* Mapping between anonymization function and it's name */
-static const char* anonFuncNames[] = {
- "UNCHANGED",
- "MAP",
- "MAP_DISTRIBUTION",
- "STRIP",
- "RANDOM",
- "HASHED",
- "PATTERN_FILL",
- "ZERO",
- "REPLACE",
- "PREFIX_PRESERVING",
- "PREFIX_PRESERVING_MAP",
- "CHECKSUM_ADJUST",
- "FILENAME_RANDOM",
- "REGEXP"
+/* Anonymization function map distribution type string representation */
+static const char* anonfuncMapDistrTypeStrs[] = {
+ "GAUSSIAN",
+ "UNIFORM"
};
-#define getAnonFuncName(x) ((x - UNCHANGED) < 0 || (x - UNCHANGED) >
sizeof(anonFuncNames) / sizeof(char*)) ? \
- "UNKNOWN" : \
- anonFuncNames[x - UNCHANGED]
+#define getAnonfuncMapDistrTypeStrs(x) ((x < 0 || x >
sizeof(anonfuncMapDistrTypeStrs) / sizeof(char*)) ? \
+ "?" : anonfuncMapDistrTypeStrs[x])

+
/**
* Throws MAPIException according to the message and errorCode params.
* If Exception could not be constructed function just returns.
@@ -589,6 +764,10 @@
int strVecSize = 0;
jstring* strVec = 0;
const char** chrPtrStrVec = 0;
+ char* anonParams = 0;
+ int len;
+ int curLen;
+ char c;
int i;

/* Initialize some classes and their method IDs */
@@ -1399,12 +1578,14 @@
intPar3 = (*env)->CallIntMethod(env, parObj, intClsIntValue);

/* Additional arguments depend on intPar3 (the anonymization
function type) */
- DEBUG_PRINT("%016llx DEBUG: \tParams to the function:
(proto=%d->%d,field=%d->%d,func=%d->'%s'",
+ DEBUG_PRINT("%016llx DEBUG: \tParams to the function: "
+ "(proto=%s(%d->%d),field=%s(%d->%d),func=%s(%d->%d)",
(unsigned long long)getCurrentJVMThreadID(env),
- (int)intPar1, getAnonfuncProtoType(intPar1),
- (int)intPar2, getAnonfuncBaseFieldType(intPar2),
- (int)intPar3, getAnonFuncName((int)intPar3));
- switch (intPar3) {
+ getAnonfuncProtoTypeStrs(intPar1), (int)intPar1,
getAnonfuncProtoType(intPar1),
+ getAnonfuncBaseFieldTypeStrs(intPar2), (int)intPar2,
getAnonfuncBaseFieldType(intPar2),
+ getAnonfuncTypeStrs(intPar3), (int)intPar3,
getAnonfuncType((int)intPar3));
+ printf("%s\n", getAnonfuncProtoTypeStrs(0));
+ switch (getAnonfuncType((int)intPar3)) {
/* UNCHANGED anonymization function */
case UNCHANGED:
/* No arguments to the function needed */
@@ -1437,11 +1618,29 @@
case MAP:
/* No arguments to the function needed */

+ /* Create buffer holding additional params to the function */
+ len = snprintf(&c, 1, "%s,%s,%s",
+ getAnonfuncProtoTypeStrs(intPar1),
+ getAnonfuncBaseFieldTypeStrs(intPar2),
+ getAnonfuncTypeStrs(intPar3));
+ anonParams = malloc(len + 1);
+ if (! anonParams) {
+ DEBUG_PRINT("%s", ") -> Out of memory!\n");
+ snprintf(errbuf, sizeof(errbuf),
+ "%016llx MAPI function '%s' (anonfunc=%s)
generated out of memory condition [" __FILE__ ":%lu]",
+ (unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
+ throwMAPIException(env, errbuf, -1);
+ goto cleanup;
+ }
+ snprintf(anonParams, len + 1, "%s,%s,%s",
+ getAnonfuncProtoTypeStrs(intPar1),
+ getAnonfuncBaseFieldTypeStrs(intPar2),
+ getAnonfuncTypeStrs(intPar3));
+
/* Call the MAPI function */
fid = mapi_apply_function((int)fd, (char*)chrPtrFunc,
- getAnonfuncProtoType(intPar1),
- getAnonfuncBaseFieldType(intPar2),
- getAnonfuncType(intPar3));
+ anonParams);
break;

/* MAP_DISTRIBUTION anonymization function */
@@ -1457,7 +1656,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with invalid number of args (%u) [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), paramsSize,
(unsigned long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), paramsSize,
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1469,7 +1668,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null distribution type argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1479,19 +1678,22 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non Integer distribution type argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
intPar4 = (*env)->CallIntMethod(env, parObj, intClsIntValue);

/* Verify that distribution type is either UNIFORM or
GAUSSIAN */
- if ((int)intPar4 != UNIFORM && (int)intPar4 != GAUSSIAN) {
+ if (getAnonfuncMapDistrType(intPar4) != UNIFORM &&
+ getAnonfuncMapDistrType(intPar4) != GAUSSIAN) {
DEBUG_PRINT(") -> called with invalid distribution type
(%d)\n", (int)intPar4);
snprintf(errbuf, sizeof(errbuf),
- "%016llx MAPI function '%s' (anonfunc=%s)
called with invalid distribution type (%d) [" __FILE__ ":%lu]",
+ "%016llx MAPI function '%s' (anonfunc=%s)
called with invalid distribution type (%d->%d) [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (int)intPar4,
(unsigned long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3),
+ (int)intPar4, getAnonfuncMapDistrType(intPar4),
+ (unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1499,22 +1701,28 @@
/* Retrieve range or median */
parObj = (*env)->GetObjectArrayElement(env, params, 4);
if (! parObj) {
- DEBUG_PRINT(") -> null %s argument\n", ((int)intPar4 ==
UNIFORM ? "left edge of the range" : "median"));
+ DEBUG_PRINT(") -> null %s argument\n",
+ (getAnonfuncMapDistrType(intPar4) == UNIFORM
?
+ "left edge of the range" : "median"));
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null %s argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), ((int)intPar4 ==
UNIFORM ? "left edge of the range" : "median"),
+ getAnonfuncTypeStrs((int)intPar3),
((int)intPar4 == UNIFORM ? "left edge of the range" : "median"),
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}

if (! (*env)->IsInstanceOf(env, parObj, intCls)) {
- DEBUG_PRINT(") -> non Integer %s argument\n",
((int)intPar4 == UNIFORM ? "left edge of the range" : "median"));
+ DEBUG_PRINT(") -> non Integer %s argument\n",
+ (getAnonfuncMapDistrType(intPar4) == UNIFORM
?
+ "left edge of the range" : "median"));
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non Integer %s argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), ((int)intPar4
== UNIFORM ? "left edge of the range" : "median"),
+ getAnonfuncTypeStrs((int)intPar3),
+ (getAnonfuncMapDistrType(intPar4) == UNIFORM ?
+ "left edge of the range" : "median"),
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
@@ -1524,37 +1732,72 @@
/* Retrieve range or standard deviation */
parObj = (*env)->GetObjectArrayElement(env, params, 5);
if (! parObj) {
- DEBUG_PRINT(") -> null %s argument\n", ((int)intPar4 ==
UNIFORM ? "right edge of the range" : "standard deviation"));
+ DEBUG_PRINT(") -> null %s argument\n",
+ (getAnonfuncMapDistrType(intPar4) == UNIFORM
?
+ "right edge of the range" : "standard
deviation"));
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null %s argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), ((int)intPar4 ==
UNIFORM ? "right edge of the range" : "standard deviation"),
+ getAnonfuncTypeStrs((int)intPar3),
+ (getAnonfuncMapDistrType(intPar4) == UNIFORM ?
+ "right edge of the range" : "standard
deviation"),
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}

if (! (*env)->IsInstanceOf(env, parObj, intCls)) {
- DEBUG_PRINT(") -> non Integer %s argument\n",
((int)intPar4 == UNIFORM ? "right edge of the range" : "standard deviation"));
+ DEBUG_PRINT(") -> non Integer %s argument\n",
+ (getAnonfuncMapDistrType(intPar4) == UNIFORM
?
+ "right edge of the range" : "standard
deviation"));
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non Integer %s argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), ((int)intPar4 ==
UNIFORM ? "right edge of the range" : "standard deviation"),
+ getAnonfuncTypeStrs((int)intPar3),
+ (getAnonfuncMapDistrType(intPar4) == UNIFORM ?
+ "right edge of the range" : "standard
deviation"),
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
intPar6 = (*env)->CallIntMethod(env, parObj, intClsIntValue);

- DEBUG_PRINT(",distribType=%d->%d,%s=%d,%s=%d",
+ DEBUG_PRINT(",distribType=%s(%d->%d),%s=%d,%s=%d",
+ getAnonfuncMapDistrTypeStrs(intPar4),
(int)intPar4, getAnonfuncMapDistrType(intPar4),
- ((int)intPar4 == UNIFORM ? "left edge of the range" :
"median"), (int)intPar5,
- ((int)intPar4 == UNIFORM ? "right edge of the range"
: "standard deviation"), (int)intPar6);
+ (getAnonfuncMapDistrType(intPar4) == UNIFORM ?
+ "left edge of the range" : "median"), (int)intPar5,
+ (getAnonfuncMapDistrType(intPar4) == UNIFORM ?
+ "right edge of the range" : "standard deviation"),
+ (int)intPar6);

+ /* Create buffer holding additional params to the function */
+ len = snprintf(&c, 1, "%s,%s,%s,%s,%d,%d",
+ getAnonfuncProtoTypeStrs(intPar1),
+ getAnonfuncBaseFieldTypeStrs(intPar2),
+ getAnonfuncTypeStrs(intPar3),
+ getAnonfuncMapDistrTypeStrs(intPar4),
+ (int)intPar5, (int)intPar6);
+ anonParams = malloc(len + 1);
+ if (! anonParams) {
+ DEBUG_PRINT("%s", ") -> Out of memory!\n");
+ snprintf(errbuf, sizeof(errbuf),
+ "%016llx MAPI function '%s' (anonfunc=%s)
generated out of memory condition [" __FILE__ ":%lu]",
+ (unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
+ throwMAPIException(env, errbuf, -1);
+ goto cleanup;
+ }
+ snprintf(anonParams, len + 1, "%s,%s,%s,%s,%d,%d",
+ getAnonfuncProtoTypeStrs(intPar1),
+ getAnonfuncBaseFieldTypeStrs(intPar2),
+ getAnonfuncTypeStrs(intPar3),
+ getAnonfuncMapDistrTypeStrs(intPar4),
+ (int)intPar5, (int)intPar6);
+
/* Call the MAPI function */
- fid = mapi_apply_function((int)fd, (char*)chrPtrFunc,
getAnonfuncProtoType(intPar1),
- getAnonfuncBaseFieldType(intPar2),
getAnonfuncType(intPar3),
- getAnonfuncMapDistrType(intPar4), (int)intPar5,
(int)intPar6);
+ fid = mapi_apply_function((int)fd, (char*)chrPtrFunc,
+ anonParams);
break;

/* STRIP anonymization function */
@@ -1567,7 +1810,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with invalid number of args (%u) [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), paramsSize,
(unsigned long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), paramsSize,
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1579,7 +1822,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null number of bytes to be kept argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1589,17 +1832,39 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non Integer number of bytes to be kept argument [" __FILE__
":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
intPar4 = (*env)->CallIntMethod(env, parObj, intClsIntValue);

DEBUG_PRINT(",numberOfBytesToBeKept=%d", (int)intPar4);
+
+ /* Create buffer holding additional params to the function */
+ len = snprintf(&c, 1, "%s,%s,%s,%d",
+ getAnonfuncProtoTypeStrs(intPar1),
+ getAnonfuncBaseFieldTypeStrs(intPar2),
+ getAnonfuncTypeStrs(intPar3),
+ (int)intPar4);
+ anonParams = malloc(len + 1);
+ if (! anonParams) {
+ DEBUG_PRINT("%s", ") -> Out of memory!\n");
+ snprintf(errbuf, sizeof(errbuf),
+ "%016llx MAPI function '%s' (anonfunc=%s)
generated out of memory condition [" __FILE__ ":%lu]",
+ (unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
+ throwMAPIException(env, errbuf, -1);
+ goto cleanup;
+ }
+ snprintf(anonParams, len + 1, "%s,%s,%s,%d",
+ getAnonfuncProtoTypeStrs(intPar1),
+ getAnonfuncBaseFieldTypeStrs(intPar2),
+ getAnonfuncTypeStrs(intPar3),
+ (int)intPar4);

/* Call the MAPI function */
- fid = mapi_apply_function((int)fd, (char*)chrPtrFunc,
getAnonfuncProtoType(intPar1),
- getAnonfuncBaseFieldType(intPar2),
getAnonfuncType(intPar3), (int)intPar4);
+ fid = mapi_apply_function((int)fd, (char*)chrPtrFunc,
+ anonParams);

break;

@@ -1613,7 +1878,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with invalid number of args (%u) [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), paramsSize,
(unsigned long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), paramsSize,
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1625,7 +1890,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null hash function argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1635,13 +1900,16 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non Integer hash function argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
intPar4 = (*env)->CallIntMethod(env, parObj, intClsIntValue);

- DEBUG_PRINT(",hashFunc=%d->%d", (int)intPar4,
getAnonfuncHashType(intPar4));
+ DEBUG_PRINT(",hashFunc=%s(%d->%d)",
+ getAnonfuncHashTypeStrs(intPar4),
+ (int)intPar4,
+ getAnonfuncHashType(intPar4));

/* Retrieve padding type */
parObj = (*env)->GetObjectArrayElement(env, params, 4);
@@ -1650,7 +1918,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null padding type argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1660,18 +1928,44 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non Integer padding type argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
intPar5 = (*env)->CallIntMethod(env, parObj, intClsIntValue);

- DEBUG_PRINT(",paddingType=%d->%d", (int)intPar5,
getAnonfuncPaddingType(intPar5));
+ DEBUG_PRINT(",paddingType=%s(%d->%d)",
+ getAnonfuncPaddingTypeStrs(intPar5),
+ (int)intPar5,
+ getAnonfuncPaddingType(intPar5));
+
+ /* Create buffer holding additional params to the function */
+ len = snprintf(&c, 1, "%s,%s,%s,%s,%s",
+ getAnonfuncProtoTypeStrs(intPar1),
+ getAnonfuncBaseFieldTypeStrs(intPar2),
+ getAnonfuncTypeStrs(intPar3),
+ getAnonfuncHashTypeStrs(intPar4),
+ getAnonfuncPaddingTypeStrs(intPar5));
+ anonParams = malloc(len + 1);
+ if (! anonParams) {
+ DEBUG_PRINT("%s", ") -> Out of memory!\n");
+ snprintf(errbuf, sizeof(errbuf),
+ "%016llx MAPI function '%s' (anonfunc=%s)
generated out of memory condition [" __FILE__ ":%lu]",
+ (unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
+ throwMAPIException(env, errbuf, -1);
+ goto cleanup;
+ }
+ snprintf(anonParams, len + 1, "%s,%s,%s,%s,%s",
+ getAnonfuncProtoTypeStrs(intPar1),
+ getAnonfuncBaseFieldTypeStrs(intPar2),
+ getAnonfuncTypeStrs(intPar3),
+ getAnonfuncHashTypeStrs(intPar4),
+ getAnonfuncPaddingTypeStrs(intPar5));

/* Call the MAPI function */
- fid = mapi_apply_function((int)fd, (char*)chrPtrFunc,
getAnonfuncProtoType(intPar1),
- getAnonfuncBaseFieldType(intPar2),
getAnonfuncType(intPar3),
- getAnonfuncHashType(intPar4),
getAnonfuncPaddingType(intPar5));
+ fid = mapi_apply_function((int)fd, (char*)chrPtrFunc,
+ anonParams);
break;

/* PATTERN_FILL anonymization function */
@@ -1684,7 +1978,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with invalid number of args (%u) [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), paramsSize,
(unsigned long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), paramsSize,
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1696,7 +1990,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null pattern type argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1706,13 +2000,16 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non Integer pattern type argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
intPar4 = (*env)->CallIntMethod(env, parObj, intClsIntValue);

- DEBUG_PRINT(",patternType=%d->%d", (int)intPar4,
getAnonfuncPatternType(intPar4));
+ DEBUG_PRINT(",patternType=(%s)%d->%d",
+ getAnonfuncPatternTypeStrs(intPar4),
+ (int)intPar4,
+ getAnonfuncPatternType(intPar4));

/* Retrieve pattern */
parObj = (*env)->GetObjectArrayElement(env, params, 4);
@@ -1721,7 +2018,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null pattern argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1733,7 +2030,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non String pattern argument [" __FILE__ ":%lu]",
(unsigned long
long)getCurrentJVMThreadID(env), chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3),
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1744,10 +2041,33 @@

DEBUG_PRINT(",pattern=%s", chrPtrStrPar1);

+ /* Create buffer holding additional params to the
function */
+ len = snprintf(&c, 1, "%s,%s,%s,%s,%s",
+ getAnonfuncProtoTypeStrs(intPar1),
+ getAnonfuncBaseFieldTypeStrs(intPar2),
+ getAnonfuncTypeStrs(intPar3),
+ getAnonfuncPatternTypeStrs(intPar4),
+ chrPtrStrPar1);
+ anonParams = malloc(len + 1);
+ if (! anonParams) {
+ DEBUG_PRINT("%s", ") -> Out of memory!\n");
+ snprintf(errbuf, sizeof(errbuf),
+ "%016llx MAPI function '%s' (anonfunc=%s)
generated out of memory condition [" __FILE__ ":%lu]",
+ (unsigned long
long)getCurrentJVMThreadID(env), chrPtrFunc,
+ getAnonfuncTypeStrs((int)intPar3),
(unsigned long)__LINE__);
+ throwMAPIException(env, errbuf, -1);
+ goto cleanup;
+ }
+ snprintf(anonParams, len + 1, "%s,%s,%s,%s,%s",
+ getAnonfuncProtoTypeStrs(intPar1),
+ getAnonfuncBaseFieldTypeStrs(intPar2),
+ getAnonfuncTypeStrs(intPar3),
+ getAnonfuncPatternTypeStrs(intPar4),
+ chrPtrStrPar1);
+
/* Call the MAPI function */
- fid = mapi_apply_function((int)fd, (char*)chrPtrFunc,
getAnonfuncProtoType(intPar1),
- getAnonfuncBaseFieldType(intPar2),
getAnonfuncType(intPar3),
- getAnonfuncPatternType(intPar4), chrPtrStrPar1);
+ fid = mapi_apply_function((int)fd, (char*)chrPtrFunc,
+ anonParams);
/* or is it integer pattern ? */
} else if (getAnonfuncPatternType(intPar4) == INTEGER) {
if (! (*env)->IsInstanceOf(env, parObj, intCls)) {
@@ -1755,7 +2075,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non Integer pattern argument [" __FILE__ ":%lu]",
(unsigned long
long)getCurrentJVMThreadID(env), chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3),
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1763,10 +2083,33 @@

DEBUG_PRINT(",pattern=%d", (int)intPar5);

+ /* Create buffer holding additional params to the
function */
+ len = snprintf(&c, 1, "%s,%s,%s,%s,%d",
+ getAnonfuncProtoTypeStrs(intPar1),
+ getAnonfuncBaseFieldTypeStrs(intPar2),
+ getAnonfuncTypeStrs(intPar3),
+ getAnonfuncPatternTypeStrs(intPar4),
+ (int)intPar5);
+ anonParams = malloc(len + 1);
+ if (! anonParams) {
+ DEBUG_PRINT("%s", ") -> Out of memory!\n");
+ snprintf(errbuf, sizeof(errbuf),
+ "%016llx MAPI function '%s' (anonfunc=%s)
generated out of memory condition [" __FILE__ ":%lu]",
+ (unsigned long
long)getCurrentJVMThreadID(env), chrPtrFunc,
+ getAnonfuncTypeStrs((int)intPar3),
(unsigned long)__LINE__);
+ throwMAPIException(env, errbuf, -1);
+ goto cleanup;
+ }
+ snprintf(anonParams, len + 1, "%s,%s,%s,%s,%d",
+ getAnonfuncProtoTypeStrs(intPar1),
+ getAnonfuncBaseFieldTypeStrs(intPar2),
+ getAnonfuncTypeStrs(intPar3),
+ getAnonfuncPatternTypeStrs(intPar4),
+ (int)intPar5);
+
/* Call the MAPI function */
- fid = mapi_apply_function((int)fd, (char*)chrPtrFunc,
getAnonfuncProtoType(intPar1),
- getAnonfuncBaseFieldType(intPar2),
getAnonfuncType(intPar3),
- getAnonfuncPatternType(intPar4), (int)intPar5);
+ fid = mapi_apply_function((int)fd, (char*)chrPtrFunc,
+ anonParams);
}
break;

@@ -1780,7 +2123,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with invalid number of args (%u) [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), paramsSize,
(unsigned long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), paramsSize,
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1792,7 +2135,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null pattern argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1802,7 +2145,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non String pattern argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1813,9 +2156,31 @@

DEBUG_PRINT(",pattern=%s", chrPtrStrPar1);

+ /* Create buffer holding additional params to the function */
+ len = snprintf(&c, 1, "%s,%s,%s,%s",
+ getAnonfuncProtoTypeStrs(intPar1),
+ getAnonfuncBaseFieldTypeStrs(intPar2),
+ getAnonfuncTypeStrs(intPar3),
+ chrPtrStrPar1);
+ anonParams = malloc(len + 1);
+ if (! anonParams) {
+ DEBUG_PRINT("%s", ") -> Out of memory!\n");
+ snprintf(errbuf, sizeof(errbuf),
+ "%016llx MAPI function '%s' (anonfunc=%s)
generated out of memory condition [" __FILE__ ":%lu]",
+ (unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
+ throwMAPIException(env, errbuf, -1);
+ goto cleanup;
+ }
+ snprintf(anonParams, len + 1, "%s,%s,%s,%s",
+ getAnonfuncProtoTypeStrs(intPar1),
+ getAnonfuncBaseFieldTypeStrs(intPar2),
+ getAnonfuncTypeStrs(intPar3),
+ chrPtrStrPar1);
+
/* Call the MAPI function */
- fid = mapi_apply_function((int)fd, (char*)chrPtrFunc,
getAnonfuncProtoType(intPar1),
- getAnonfuncBaseFieldType(intPar2),
getAnonfuncType(intPar3), chrPtrStrPar1);
+ fid = mapi_apply_function((int)fd, (char*)chrPtrFunc,
+ anonParams);
break;

/* REGEXP anonymization function */
@@ -1828,7 +2193,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with invalid number of args (%u) [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), paramsSize,
(unsigned long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), paramsSize,
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1840,7 +2205,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null regex argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1850,7 +2215,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non String regex argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1870,7 +2235,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s) out
of memory while creating vector [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1880,7 +2245,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s) out
of memory while creating vector [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1899,7 +2264,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non String regex replacement argument #%d [" __FILE__ ":%lu]",
(unsigned long
long)getCurrentJVMThreadID(env), chrPtrFunc,
- getAnonFuncName((int)intPar3), (i - 4),
(unsigned long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (i - 4),
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1911,9 +2276,46 @@
DEBUG_PRINT(",regexRepl#%d=%s", (i - 4), chrPtrStrVec[i
- 4]);
}

+ /* Create buffer holding additional params to the function */
+ len = snprintf(&c, 1, "%s,%s,%s,%s",
+ getAnonfuncProtoTypeStrs(intPar1),
+ getAnonfuncBaseFieldTypeStrs(intPar2),
+ getAnonfuncTypeStrs(intPar3),
+ chrPtrStrPar1);
+ for (i = 0; i < paramsSize - 4; i++) {
+ if (! i) len += snprintf(&c, 1, ",%d", paramsSize - 4);
+ len += snprintf(&c, 1, ",%s", chrPtrStrVec[i] ?
chrPtrStrVec[i] : "NULL");
+ }
+ anonParams = malloc(len + 1);
+ if (! anonParams) {
+ DEBUG_PRINT("%s", ") -> Out of memory!\n");
+ snprintf(errbuf, sizeof(errbuf),
+ "%016llx MAPI function '%s' (anonfunc=%s)
generated out of memory condition [" __FILE__ ":%lu]",
+ (unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
+ throwMAPIException(env, errbuf, -1);
+ goto cleanup;
+ }
+ curLen = snprintf(anonParams, len + 1, "%s,%s,%s,%s",
+ getAnonfuncProtoTypeStrs(intPar1),
+ getAnonfuncBaseFieldTypeStrs(intPar2),
+ getAnonfuncTypeStrs(intPar3),
+ chrPtrStrPar1);
+ for (i = 0; i < paramsSize - 4; i++) {
+ if (! i)
+ curLen += snprintf(anonParams + curLen,
+ len - curLen + 1,
+ ",%d",
+ paramsSize - 4);
+ curLen += snprintf(anonParams + curLen,
+ len - curLen + 1,
+ ",%s",
+ chrPtrStrVec[i] ? chrPtrStrVec[i] :
"NULL");
+ }
+
/* Call the MAPI function */
- fid = mapi_apply_function((int)fd, (char*)chrPtrFunc,
getAnonfuncProtoType(intPar1),
- getAnonfuncBaseFieldType(intPar2),
getAnonfuncType(intPar3), chrPtrStrPar1, (char**)chrPtrStrVec, strVecSize);
+ fid = mapi_apply_function((int)fd, (char*)chrPtrFunc,
+ anonParams);
break;

/* Default is non implemented error message */
@@ -1950,6 +2352,7 @@
if (strVec) free(strVec);
if (chrPtrStrVec) free(chrPtrStrVec);
if (chrPtrFunc) (*env)->ReleaseStringUTFChars(env, funct, chrPtrFunc);
+ if (anonParams) free(anonParams);

return (jint)fid;
}

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LookupInfo-Req.xml
(from rev 2364,
trunk/perfsonar/schema/example-instances/perfSONAR/LookupInfo-Req.xml)

Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml
2007-04-27 09:34:42 UTC (rev 2364)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml
2007-05-07 10:16:35 UTC (rev 2365)
@@ -9,7 +9,8 @@

xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";>

<!-- Optional message level parameters -->
<nmwg:parameters id="msgparam1">
@@ -42,8 +43,17 @@
<select:subject id="iusub2" metadataIdRef="meta1"/>

<select:parameters id="param1">
+
<nmwg:parameter name="startTime">1121472000</nmwg:parameter>
<nmwg:parameter name="endTime">1121904000</nmwg:parameter>
+ <!--
+ <nmwg:parameter name="startTime">
+ <nmtm:time type="ISO" value="2005-07-16T00:00:00Z"/>
+ </nmwg:parameter>
+ <nmwg:parameter name="endTime">
+ <nmtm:time type="ISO" value="2005-07-21T00:00:00Z"/>
+ </nmwg:parameter>
+ -->
<nmwg:parameter name="consolidationFunction">AVERAGE</nmwg:parameter>
<nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml
2007-04-27 09:34:42 UTC (rev 2364)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml
2007-05-07 10:16:35 UTC (rev 2365)
@@ -11,7 +11,8 @@

xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";>

<!-- Optional message level parameters -->
<nmwg:parameters id="msgparam1">
@@ -35,6 +36,22 @@
<nmwg:metadata id="meta2">
<select:subject id="iusub2" metadataIdRef="meta1"/>
<select:parameters id="param1">
+ <!--
+ <nmwg:parameter name="startTime">
+ <nmtm:time type="ISO" value="2006-03-22T13:38:24Z"/>
+ </nmwg:parameter>
+ <nmwg:parameter name="endTime">
+ <nmtm:time type="ISO" value="2006-03-22T13:38:26Z"/>
+ </nmwg:parameter>
+ -->
+ <!--
+ <nmwg:parameter name="startTime">
+ <nmtm:time type="unix" value="1143034704"/>
+ </nmwg:parameter>
+ <nmwg:parameter name="endTime">
+ <nmtm:time type="unix" value="1143034706"/>
+ </nmwg:parameter>
+ -->
<nmwg:parameter name="startTime">1143034704</nmwg:parameter>
<nmwg:parameter name="endTime">1143034706</nmwg:parameter>
</select:parameters>

Modified: branches/JAVA-RRD-MA-STABLE/src/objects.config
===================================================================
--- branches/JAVA-RRD-MA-STABLE/src/objects.config 2007-04-27 09:34:42
UTC (rev 2364)
+++ branches/JAVA-RRD-MA-STABLE/src/objects.config 2007-05-07 10:16:35
UTC (rev 2365)
@@ -59,6 +59,9 @@
http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/parameters/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Parameters
http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/serviceType/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ServiceType
http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/serviceName/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ServiceName
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/serviceVersion/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ServiceVersion
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/organization/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Organization
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/contactEmail/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ContactEmail
http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/datum/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Datum
http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/subject/
org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject
http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/parameters/
org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Parameters


Property changes on: branches/JAVA-RRD-MA-STABLE/src/org
___________________________________________________________________
Name: svn:externals
- ggf -r 215 https://svn.internet2.edu/svn/nmwg/trunk/nmwg/java/org/ggf

+ ggf -r 227 https://svn.internet2.edu/svn/nmwg/trunk/nmwg/java/org/ggf


Modified:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/client/axis/AxisClient.java
===================================================================
--- branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/client/axis/AxisClient.java
2007-04-27 09:34:42 UTC (rev 2364)
+++ branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/client/axis/AxisClient.java
2007-05-07 10:16:35 UTC (rev 2365)
@@ -4,10 +4,17 @@
import java.util.Vector;

import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.FactoryConfigurationError;
+import javax.xml.parsers.ParserConfigurationException;

import org.apache.axis.client.Call;
import org.apache.axis.client.Service;
import org.apache.axis.message.SOAPBodyElement;
+import org.ggf.ns.nmwg.base.v2_0.Message;
+import org.perfsonar.commons.util.XMLUtils;
+import org.perfsonar.service.commons.exceptions.SystemException;
import org.w3c.dom.Document;

/**
@@ -70,5 +77,31 @@
// }

}
+
+
+ public Message sendRequest(String endPoint, Message message, String
parserFile) throws Exception {

-}
+ // create document
+ DocumentBuilder builder = DocumentBuilderFactory.
+ newInstance().newDocumentBuilder();
+
+ Document requestDocument = builder.newDocument();
+ requestDocument = message.getDOM(requestDocument);
+
+ //send request Document to url
+ AxisClient client = new AxisClient();
+
+ Document responseDocument =
+ client.sendRequest(endPoint, requestDocument);
+
+ //return response as Message
+ Message msg = XMLUtils.convertToMessage(
+ responseDocument,
+ parserFile);
+
+ return msg;
+
+ } //sendRequest
+
+
+} //AxisClient

Modified:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/client/commons/requests/lookupService/LSRegisterRequestGenerator.java
===================================================================
---
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/client/commons/requests/lookupService/LSRegisterRequestGenerator.java
2007-04-27 09:34:42 UTC (rev 2364)
+++
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/client/commons/requests/lookupService/LSRegisterRequestGenerator.java
2007-05-07 10:16:35 UTC (rev 2365)
@@ -8,10 +8,13 @@
import org.ggf.ns.nmwg.base.v2_0.Message;
import org.ggf.ns.nmwg.base.v2_0.Metadata;
import org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.AccessPoint;
+import org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ContactEmail;
+import org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Organization;
import org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Service;
import org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ServiceDescription;
import org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ServiceName;
import org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ServiceType;
+import org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ServiceVersion;
import org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject;

import org.perfsonar.client.commons.requests.RequestGenerator;
@@ -110,14 +113,40 @@
st.setServiceType(serviceTypeString);
service.setServiceType(st);

+ String param;
//service description -- optional
- String
serviceDescString=(String)commonParameters.get("service_description");
- if (serviceDescString==null) {
+ param=(String)commonParameters.get("service_description");
+ if (param==null) {
ServiceDescription sd = new ServiceDescription();
- sd.setServiceDescription(serviceDescString);
+ sd.setServiceDescription(param);
service.setServiceDescription(sd);
}
+
+ //organization name - optional
+ param=(String)commonParameters.get("organization_name");
+ if (param==null) {
+ Organization o = new Organization();
+ o.setOrganization(param);
+ service.setOrganization(o);
+ }
+
+ //service version - optional
+ param=(String)commonParameters.get("service_version");
+ if (param==null) {
+ ServiceVersion sv = new ServiceVersion();
+ sv.setServiceVersion(param);
+ service.setServiceVersion(sv);
+ }

+ //contact-email - optional
+ param=(String)commonParameters.get("contact_email");
+ if (param==null) {
+ ContactEmail ce = new ContactEmail();
+ ce.setContactEmail(param);
+ service.setContactEmail(ce);
+ }
+
+
//data fields

System.out.println("LSRegisterRequestGenerator: ");

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/client/testHarness/SOAPX509Client.java
(from rev 2364,
trunk/perfsonar/src/org/perfsonar/client/testHarness/SOAPX509Client.java)

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/auxiliary/components/authn
(from rev 2364,
trunk/perfsonar/src/org/perfsonar/commons/auxiliary/components/authn)

Deleted:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/auxiliary/components/authn/DynamicCrypto.java

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/auxiliary/components/authn/DynamicCrypto.java
(from rev 2364,
trunk/perfsonar/src/org/perfsonar/commons/auxiliary/components/authn/DynamicCrypto.java)

Deleted:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/auxiliary/components/authn/SOAPUtil.java

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/auxiliary/components/authn/SOAPUtil.java
(from rev 2364,
trunk/perfsonar/src/org/perfsonar/commons/auxiliary/components/authn/SOAPUtil.java)

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/messages/LSCleanupRequest.java
(from rev 2364,
trunk/perfsonar/src/org/perfsonar/commons/messages/LSCleanupRequest.java)

Modified:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/messages/LSKeepaliveRequest.java
===================================================================
---
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/messages/LSKeepaliveRequest.java
2007-04-27 09:34:42 UTC (rev 2364)
+++
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/messages/LSKeepaliveRequest.java
2007-05-07 10:16:35 UTC (rev 2365)
@@ -7,11 +7,7 @@
import org.perfsonar.service.commons.engine.ActionType;
import org.perfsonar.service.commons.exceptions.SystemException;

-import org.ggf.ns.nmwg.base.v2_0.Metadata;

-import java.util.Map;
-
-
/**
* @author Maciej Glowiak
* MessageHandler for LS Keep-Alive Request

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/messages/LookupInfoRequest.java
(from rev 2364,
trunk/perfsonar/src/org/perfsonar/commons/messages/LookupInfoRequest.java)

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/util/TimeDateUtil.java
(from rev 2364,
trunk/perfsonar/src/org/perfsonar/commons/util/TimeDateUtil.java)

Copied: branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn
(from rev 2364, trunk/perfsonar/src/org/perfsonar/service/commons/authn)

Deleted:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AADispatchManager.java

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AADispatchManager.java
(from rev 2364,
trunk/perfsonar/src/org/perfsonar/service/commons/authn/AADispatchManager.java)

Deleted:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AADispatchProtocol.java

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AADispatchProtocol.java
(from rev 2364,
trunk/perfsonar/src/org/perfsonar/service/commons/authn/AADispatchProtocol.java)

Deleted:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AADispatchProtocolFactory.java

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AADispatchProtocolFactory.java
(from rev 2364,
trunk/perfsonar/src/org/perfsonar/service/commons/authn/AADispatchProtocolFactory.java)

Deleted:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AADispatchSOAPProtocol.java

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AADispatchSOAPProtocol.java
(from rev 2364,
trunk/perfsonar/src/org/perfsonar/service/commons/authn/AADispatchSOAPProtocol.java)

Deleted:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AuthNRequest.java

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AuthNRequest.java
(from rev 2364,
trunk/perfsonar/src/org/perfsonar/service/commons/authn/AuthNRequest.java)

Deleted:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AuthNResponse.java

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/AuthNResponse.java
(from rev 2364,
trunk/perfsonar/src/org/perfsonar/service/commons/authn/AuthNResponse.java)

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/tokens
(from rev 2364,
trunk/perfsonar/src/org/perfsonar/service/commons/authn/tokens)

Deleted:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/tokens/SecTokenManager.java

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/tokens/SecTokenManager.java
(from rev 2364,
trunk/perfsonar/src/org/perfsonar/service/commons/authn/tokens/SecTokenManager.java)

Deleted:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/tokens/SecTokenManagerFactory.java

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/tokens/SecTokenManagerFactory.java
(from rev 2364,
trunk/perfsonar/src/org/perfsonar/service/commons/authn/tokens/SecTokenManagerFactory.java)

Deleted:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/tokens/SecTokenSOAPManager.java

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/tokens/SecTokenSOAPManager.java
(from rev 2364,
trunk/perfsonar/src/org/perfsonar/service/commons/authn/tokens/SecTokenSOAPManager.java)

Deleted:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/tokens/SecurityToken.java

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/authn/tokens/SecurityToken.java
(from rev 2364,
trunk/perfsonar/src/org/perfsonar/service/commons/authn/tokens/SecurityToken.java)

Modified:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/engine/ActionType.java
===================================================================
---
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/engine/ActionType.java
2007-04-27 09:34:42 UTC (rev 2364)
+++
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/engine/ActionType.java
2007-05-07 10:16:35 UTC (rev 2365)
@@ -44,42 +44,56 @@



- /**
- * Action type to request a measurement
- */
- public static final String LS_REGISTER = "LS_REGISTER";
+ /**

+ * Action type to request a measurement

+ */

+ public static final String LS_REGISTER = "LS_REGISTER";

+

+

+ /**

+ * Action type to request a measurement

+ */

+ public static final String LS_LOOKUP = "LS_LOOKUP";

+

+

+ /**

+ * Action type to request a measurement

+ */

+ public static final String LS_DEREGISTER = "LS_DEREGISTER";

+

+

+ /**

+ * Action type to request a measurement

+ */

+ public static final String LS_KEEPALIVE = "LS_KEEPALIVE";

+

+

+ /**

+ * Action type to LS Cleanup

+ */

+ public static final String LS_CLEANUP = "LS_CLEANUP";


- /**
- * Action type to request a measurement
- */
- public static final String LS_LOOKUP = "LS_LOOKUP";
+ // ----------------------------------------- Echo Action


- /**
- * Action type to request a measurement
- */
- public static final String LS_DEREGISTER = "LS_DEREGISTER";

/**
- * Action type to request a measurement
+ * Action type to check service status
*/
- public static final String LS_KEEPALIVE = "LS_KEEPALIVE";
+ public static final String ECHO = "ECHO";

- /**
- * Action type to request a full topology database download
- */

- public static final String TOPS_DOWNLOAD_DB = "TOPS_DOWNLOAD_DB";

+ // ----------------------------------------- Lookup Info Action


- // -----------------------------------------

+ /**
+ * Action type to request information set of the service
+ */
+ public static final String GET_LOOKUP_INFO = "GET_LOOKUP_INFO";

-
- public static final String ECHO = "ECHO";
-


// ------------------------------------------ Measurement Point Actions
@@ -89,8 +103,19 @@
/**
* Action type to request a measurement
*/
-
public static final String MAKE_MEASUREMENT = "MeasurementRequest";


-}
+
+ // ------------------------------------------ Topology Service Actions
+
+
+
+ /**
+ * Action type to request a full topology database download
+ */
+ public static final String SETUP_DATA_DB = "SETUP_DATA_DB";
+
+
+
+} //ActionType

Modified:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/registration/GenericServiceLSRegistrator.java
===================================================================
---
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/registration/GenericServiceLSRegistrator.java
2007-04-27 09:34:42 UTC (rev 2364)
+++
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/registration/GenericServiceLSRegistrator.java
2007-05-07 10:16:35 UTC (rev 2365)
@@ -90,42 +90,23 @@

Message message = getLSRegisterRequestMessage();

- String result = XMLUtils.serializeXML(message);
- //TODO: to remove
-
logger.debug("GenericServiceLSRegistrator: sending via Axis");

- //create document
-
+ //send request Document to url
+
try {
-
- DocumentBuilder builder = DocumentBuilderFactory.
- newInstance().newDocumentBuilder();
-
- Document requestDocument = builder.newDocument();

- requestDocument = message.getDOM(requestDocument);
-// String domres = XMLUtils.serializeDOM(requestDocument);
-// logger.debug("GenericServiceLSRegistrator: DOM: "+domres);

- logger.debug("GenericServiceLSRegistrator: Creating Axis
Client");
+ logger.debug("GenericServiceLSRegistrator: Creating Axis
Client");

- //send request Document to url
+ //return response as Message
+ String parserFile = configuration.getProperty(
+ "service.sax_parser.config");
+
AxisClient client = new AxisClient();
-
- Document responseDocument =
- client.sendRequest(lsUrl,requestDocument);
- logger.debug("GenericServiceLSRegistrator: sent");
-
- logger.debug("GenericServiceLSRegistrator: convert to
message");
+ Message responseMsg =
+ client.sendRequest(lsUrl,message, parserFile);

- //return response as Message
- String parserFile = configuration.getProperty(
- "service.sax_parser.config");
- Message msg = XMLUtils.convertToMessage(
- responseDocument,
- parserFile);
-
- return msg;
+ return responseMsg;

} catch (ParserConfigurationException e) {
logger.error("GenericServiceLSRegistrator: "+e.getMessage());

Modified:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/storage/xmldb/exist/rest/HTTPAccess.java
===================================================================
---
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/storage/xmldb/exist/rest/HTTPAccess.java
2007-04-27 09:34:42 UTC (rev 2364)
+++
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/commons/storage/xmldb/exist/rest/HTTPAccess.java
2007-05-07 10:16:35 UTC (rev 2365)
@@ -149,7 +149,7 @@
String password) throws IOException {

//temp//
- boolean debug=true;
+ boolean debug=false;

//connect by HTTP with /exist/rest/db/COLLECTION
URL _url = new URL(url);

Modified:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/Transformations.java
===================================================================
---
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/Transformations.java
2007-04-27 09:34:42 UTC (rev 2364)
+++
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/Transformations.java
2007-05-07 10:16:35 UTC (rev 2365)
@@ -129,16 +129,28 @@


String eventType = "";
- if (metadata != null)
- eventType =
- (metadata.getEventType() != null ?
metadata.getEventType().getEventType().trim() : "");
- else
+ if (metadata != null) {
+
+ try {
+ eventType =
+ (metadata.getEventType() != null ?
metadata.getEventType().getEventType().trim() : "");
+ } catch (NullPointerException npex) {
+ throw new RequestException(
+ "error.ma.query",
+ "Transformations.getMetadataQuery: "
+ + "eventType in the request is null");
+ }
+
+ } else {
+
throw new RequestException(
"error.ma.query",
"Transformations.getMetadataQuery: "
- + "eventType in the request is null");
+ + "metadata is missing in the request");

+ }

+
// getting an appropriate MetadataQueryGenerator to
// genarate correct metadata query
MetadataQueryGenerator metadataQueryGenerator =

Modified:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
===================================================================
---
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
2007-04-27 09:34:42 UTC (rev 2364)
+++
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
2007-05-07 10:16:35 UTC (rev 2365)
@@ -105,10 +105,10 @@
+ ex.toString());
}

- if (metadata != null) {

- eventType = (metadata.getEventType() != null ?
metadata.getEventType().getEventType().trim() : "");
- Subject subject = (Subject) metadata.getSubject();
+ eventType = metadata.getEventType().getEventType().trim();
+ Subject subject = (Subject) metadata.getSubject();
+ if (subject != null) {
Interface interf = subject.getInterface();
if (interf != null) {
ipAddress = (interf.getIpAddressElement() != null
? interf.getIpAddressElement().getIpAddress().trim() : "");
@@ -123,9 +123,9 @@
classOfService = (interf.getClassOfServiceElement() != null
? interf.getClassOfServiceElement().getClassOfService().trim() : "");
capacity = (interf.getCapacityElement() != null
? interf.getCapacityElement().getCapacity().trim() : "");
}
-
}

+
String xQuery = "\n"
+ "declare namespace nmwg='http://ggf.org/ns/nmwg/base/2.0/';
\n"
+ "declare namespace
netutil='http://ggf.org/ns/nmwg/characteristic/utilization/2.0/';\n"

Modified:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/rrdType/RRDStorageManager.java
===================================================================
---
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/rrdType/RRDStorageManager.java
2007-04-27 09:34:42 UTC (rev 2364)
+++
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/rrdType/RRDStorageManager.java
2007-05-07 10:16:35 UTC (rev 2365)
@@ -7,6 +7,8 @@

import org.perfsonar.service.commons.storage.NMWGStorageManager;

+import org.perfsonar.commons.util.TimeDateUtil;
+
import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
import org.perfsonar.commons.auxiliary.ComponentNames;
import
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;
@@ -36,6 +38,7 @@
import java.util.Vector;


+
/**
* This is RRD storage manager.
*
@@ -336,13 +339,17 @@


try {
- _startTime = startTime.getParameterValue();
+ _startTime = TimeDateUtil.getUnixTime(startTime);
+ } catch (DataFormatException dfex) {
+ throw new DataFormatException(dfex.getResultCode(),
dfex.getMessage());
} catch (Exception ex) {
;
}

try {
- _endTime = endTime.getParameterValue();
+ _endTime = TimeDateUtil.getUnixTime(endTime);
+ } catch (DataFormatException dfex) {
+ throw new DataFormatException(dfex.getResultCode(),
dfex.getMessage());
} catch (Exception ex) {
;
}
@@ -369,7 +376,6 @@
_dataSource = dataSource.getParameterValue();


-
// ---------------


@@ -555,6 +561,7 @@
if (i + 1 == rows) break;
Datum datum = new Datum();
datum.setTimeValue(Long.toString(data.getTimestamp(i + 1)));
+ datum.setTimeType("unix");
datum.setValue(Double.toString(data.getValue(i, ds)));
datum.setValueUnits(valueUnits);
_data.addChild(datum);

Modified:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
===================================================================
---
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
2007-04-27 09:34:42 UTC (rev 2364)
+++
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
2007-05-07 10:16:35 UTC (rev 2365)
@@ -20,6 +20,8 @@
import org.perfsonar.service.commons.storage.NMWGStorageManager;
import org.perfsonar.service.commons.util.ResultCodesUtil;

+import org.perfsonar.commons.util.TimeDateUtil;
+
import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
import org.perfsonar.commons.auxiliary.ComponentNames;
import org.perfsonar.commons.auxiliary.components.logger.LoggerComponent;
@@ -125,13 +127,15 @@

Parameter p = paramsArray[i];
String pname = p.getParameterName();
- String pvalue = p.getParameterValue();
+ //String pvalue = p.getParameterValue();
+ String pvalue = "";

//logger.debug("SQLStorageManager.fetch: param [name,
value]: ["
// + pname + ", " + pvalue + "]");

if (pname.equals("startTime")) {
long startTime = 0;
+ pvalue = TimeDateUtil.getUnixTime(p);
try {
startTime = Long.parseLong(pvalue);
} catch (NumberFormatException nfex) {
@@ -145,6 +149,7 @@

} else if (pname.equals("endTime")) {
long endTime = 0;
+ pvalue = TimeDateUtil.getUnixTime(p);
try {
endTime = Long.parseLong(pvalue);
} catch (NumberFormatException nfex) {
@@ -157,6 +162,7 @@
ibatisParams.put(pname, endTime);

} else {
+ pvalue = p.getParameterValue();
ibatisParams.put(pname, pvalue);
}


Modified:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
===================================================================
---
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
2007-04-27 09:34:42 UTC (rev 2364)
+++
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
2007-05-07 10:16:35 UTC (rev 2365)
@@ -74,9 +74,14 @@

if (strValue != null) {

- if (column.equals("value")) datum.setValue(strValue);
- else if (column.equals("valueUnits"))
datum.setValueUnits(strValue);
- else if (column.equals("timeValue"))
datum.setTimeValue(strValue);
+ if (column.equals("value"))
+ datum.setValue(strValue);
+ else if (column.equals("valueUnits"))
+ datum.setValueUnits(strValue);
+ else if (column.equals("timeValue")) {
+ datum.setTimeValue(strValue);
+ datum.setTimeType("unix");
+ }

//logger.debug("SQLStorageManager.fetch: "
// + "column: " + column + ", value: " + strValue );

---

• perfsonar: r2365 - in branches/JAVA-RRD-MA-STABLE: ant ant/rrdma contrib/benchmarking/ls contrib/benchmarking/ls/jar contrib/mapi-jni/native/src schema/example-instances/perfSONAR src src/org src/org/perfsonar/client/axis src/org/perfsonar/client/commons/requests/lookupService src/org/perfsonar/client/testHarness src/org/perfsonar/commons/auxiliary/components src/org/perfsonar/commons/auxiliary/components/authn src/org/perfsonar/commons/messages src/org/perfsonar/commons/util src/org/perfsonar/service/commons src/org/perfsonar/service/commons/authn src/org/perfsonar/service/commons/authn/tokens src/org/perfsonar/service/commons/engine src/org/perfsonar/service/commons/registration src/org/perfsonar/service/commons/storage/xmldb/exist/rest src/org/perfsonar/service/measurementArchive/metadataConfig src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator src/org/perfsonar/service/measurementArchive/rrdType src/org/perfsonar/service/measurementArchive /sqlType src/org/perfsonar/service/measurementArchive/sqlType/fetch, svnlog, 05/07/2007

---

Archive powered by MHonArc 2.6.16.