Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r5319 - in branches/new-structure-with-base2/ps-mdm-ls: . contrib/SOAPRequestAuxilary/src/pl/psnc src/main/java/org/perfsonar/service/lookupservice/registration src/main/java/org/perfsonar/service/lookupservice/storage/exist

Subject: perfsonar development work

List archive

perfsonar: r5319 - in branches/new-structure-with-base2/ps-mdm-ls: . contrib/SOAPRequestAuxilary/src/pl/psnc src/main/java/org/perfsonar/service/lookupservice/registration src/main/java/org/perfsonar/service/lookupservice/storage/exist


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r5319 - in branches/new-structure-with-base2/ps-mdm-ls: . contrib/SOAPRequestAuxilary/src/pl/psnc src/main/java/org/perfsonar/service/lookupservice/registration src/main/java/org/perfsonar/service/lookupservice/storage/exist
  • Date: Thu, 22 Oct 2009 05:41:27 -0400
Author: trzaszcz
Date: 2009-10-22 05:41:27 -0400 (Thu, 22 Oct 2009)
New Revision: 5319

Modified:

branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/DeregistrationTest.py

branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/QueryTest.py

branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/RegistrationTest.py
branches/new-structure-with-base2/ps-mdm-ls/pom.xml

branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/DiscoveryRequestGenerator.java

branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/SummarizationDAOImpl.java
Log:
summarization improvement

Modified:
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/DeregistrationTest.py
===================================================================
---
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/DeregistrationTest.py
2009-10-22 08:04:10 UTC (rev 5318)
+++
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/DeregistrationTest.py
2009-10-22 09:41:27 UTC (rev 5319)
@@ -20,7 +20,7 @@
access_points.append("http://localhost:8180/"+str(c)+"")
pass

- sender=Sender("127.0.0.1:8180")
+ sender=Sender("127.0.0.1:8080")
sender.connect()

result_list=[]
@@ -28,7 +28,7 @@
for access_point in access_points :

soap_message=soap_template_content.replace("ACCESS_POINT",access_point)
before=time.time()
-
sender.send("/geant2-java-xml-ls/services/LookupService",soap_message)
+
sender.send("/perfsonar-java-xml-ls/services/LookupService",soap_message)
result_list.append((time.time()-before)*1000)

strResult="";
@@ -38,7 +38,7 @@
strResult=strResult+'%(iteration)d;%(time)f \n' %
{"iteration":t+1,"time":result_list[t]}
strResult=strResult+'avg;%(time)f \n' % {"time":(sum/len(result_list))}

- f=open("../../../results/deregistration12.txt","w")
+ f=open("../../../results/deregistration-2-ls2-exist.txt","w")
f.write(strResult)

print "--------------------------"

Modified:
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/QueryTest.py
===================================================================
---
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/QueryTest.py
2009-10-22 08:04:10 UTC (rev 5318)
+++
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/QueryTest.py
2009-10-22 09:41:27 UTC (rev 5319)
@@ -20,7 +20,7 @@

access_points.append("data(/nmwg:store[@type='LSStore']/nmwg:metadata[@id='http://localhost:8180/"+str(c)+"'])")
pass

- sender=Sender("127.0.0.1:8180")
+ sender=Sender("127.0.0.1:8080")
sender.connect()

result_list=[]
@@ -28,17 +28,17 @@
for access_point in access_points :
soap_message=soap_template_content.replace("QUERY",access_point)
before=time.time()
-
sender.send("/geant2-java-xml-ls/services/LookupService",soap_message)
+
sender.send("/perfsonar-java-xml-ls/services/LookupService",soap_message)
result_list.append((time.time()-before)*1000)

strResult="";
sum=0;
for t in range(0,len(result_list)) :
sum=sum+result_list[t]
- strResult+'%(iteration)d;%(time)f \n' %
{"iteration":t+1,"time":result_list[t]}
+ strResult=strResult+'%(iteration)d;%(time)f \n' %
{"iteration":t+1,"time":result_list[t]}
strResult=strResult+'avg;%(time)f \n' % {"time":(sum/len(result_list))}

- f=open("../../../results/queryX.txt","w")
+ f=open("../../../results/query-ls2-exist-3.txt","w")
f.write(strResult)

print "--------------------------"

Modified:
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/RegistrationTest.py
===================================================================
---
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/RegistrationTest.py
2009-10-22 08:04:10 UTC (rev 5318)
+++
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/RegistrationTest.py
2009-10-22 09:41:27 UTC (rev 5319)
@@ -17,7 +17,7 @@
for c in range(1,1000) :
access_points.append("http://localhost:8180/"+str(c))

- sender=Sender("127.0.0.1:8180")
+ sender=Sender("127.0.0.1:8080")
sender.connect()

result_list=[]
@@ -26,7 +26,7 @@
for access_point in access_points :

soap_message=soap_template_content.replace("LS_REGISTRATION_ACCESS_POINT",access_point)
before=time.time()
-
sender.send("/geant2-java-xml-ls/services/LookupService",soap_message)
+
sender.send("/perfsonar-java-xml-ls/services/LookupService",soap_message)
result_list.append((time.time()-before)*1000)
print c
c=c+1
@@ -41,7 +41,7 @@
strResult=strResult+'%(iteration)d;%(time)f \n' %
{"iteration":t,"time":result_list[t]}
strResult=strResult+'avg;%(time)f \n' % {"time":(sum/len(result_list))}

- f=open("../../../results/result-ls1-2.txt","w")
+ f=open("../../../results/result-ls2-exist.txt","w")
f.write(strResult)

print "--------------------------"

Modified: branches/new-structure-with-base2/ps-mdm-ls/pom.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/pom.xml 2009-10-22 08:04:10
UTC (rev 5318)
+++ branches/new-structure-with-base2/ps-mdm-ls/pom.xml 2009-10-22 09:41:27
UTC (rev 5319)
@@ -1,281 +1,303 @@
<project>

- <properties>
- <configurationFile>configuration.xml</configurationFile>
- <axis2Id>axis2-1.4.1</axis2Id>
- <packageName>perfsonar-java-xml-ls</packageName>
- </properties>
+ <properties>
+ <configurationFile>configuration.xml
+ </configurationFile>
+ <axis2Id>axis2-1.4.1</axis2Id>
+ <packageName>perfsonar-java-xml-ls</packageName>
+ </properties>

- <modelVersion>4.0.0</modelVersion>
- <groupId>perfsonar</groupId>
- <artifactId>ps-mdm-ls</artifactId>
- <packaging>war</packaging>
- <name>pS mdm ls</name>
- <version>4.0</version>
- <description>This is LookupService service using the libarary
pS-base2</description>
- <url>http://wiki.perfsonar.net/jra1-wiki</url>
- <inceptionYear>2008</inceptionYear>
- <organization>
- <name>perfSONAR</name>
- <url>http://www.perfsonar.net</url>
- </organization>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>perfsonar</groupId>
+ <artifactId>ps-mdm-ls</artifactId>
+ <packaging>war</packaging>
+ <name>pS mdm ls</name>
+ <version>4.0</version>
+ <description>This is LookupService service using the libarary
+ pS-base2</description>
+ <url>http://wiki.perfsonar.net/jra1-wiki
+ </url>
+ <inceptionYear>2008</inceptionYear>
+ <organization>
+ <name>perfSONAR</name>
+ <url>http://www.perfsonar.net</url>
+ </organization>


- <build>
+ <build>

- <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
- <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
- <outputDirectory>${basedir}/bin</outputDirectory>
- <directory>${basedir}/build</directory>
- <finalName>${packageName}</finalName>
+ <sourceDirectory>${basedir}/src/main/java
+ </sourceDirectory>
+ <testSourceDirectory>${basedir}/src/test/java
+ </testSourceDirectory>
+ <outputDirectory>${basedir}/bin</outputDirectory>
+ <directory>${basedir}/build</directory>
+ <finalName>${packageName}</finalName>

- <plugins>
+ <plugins>

- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>

- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>create-configuration</id>
- <phase>process-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>create-aar</id>
- <phase>compile</phase>
- <configuration>
- <tasks>
- <property name="aar.name" value="${packageName}"/>
- <copy toDir="${basedir}/bin" failonerror="false">
- <fileset dir="${basedir}/conf/axis2">
- <include name="**/*.xml"/>
- </fileset>
- </copy>
- <mkdir dir="${project.build.directory}"/>
- <jar destfile="${basedir}/build/${aar.name}.aar">
- <fileset includes="**/PerfsonarService.class
**/services.xml" dir="${basedir}/bin"/>
- </jar>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-configuration</id>
+
<phase>process-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>create-aar</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <property
name="aar.name" value="${packageName}" />
+ <copy
toDir="${basedir}/bin" failonerror="false">
+
<fileset dir="${basedir}/conf/axis2">
+
<include name="**/*.xml" />
+
</fileset>
+ </copy>
+ <mkdir
dir="${project.build.directory}" />
+ <jar
destfile="${basedir}/build/${aar.name}.aar">
+
<fileset includes="**/PerfsonarService.class **/services.xml"
+
dir="${basedir}/bin" />
+ </jar>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>

- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
- <directory>${basedir}/build</directory>
- <includes>
- <include>**/*.aar</include>
- </includes>
- <targetPath>WEB-INF/services</targetPath>
- </resource>
- <resource>
-
<directory>${basedir}/resources/${axis2Id}/webapp/axis2-web</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <targetPath>axis2-web</targetPath>
- </resource>
- <resource>
-
<directory>${basedir}/resources/${axis2Id}/repository/modules</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <targetPath>WEB-INF/modules</targetPath>
- </resource>
- <resource>
- <directory>${basedir}/resources/${axis2Id}/conf</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- <targetPath>WEB-INF/conf</targetPath>
- </resource>
- </webResources>
-
<webXml>${basedir}/resources/${axis2Id}/webapp/WEB-INF/web.xml</webXml>
- </configuration>
- </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+
<directory>${basedir}/build</directory>
+ <includes>
+
<include>**/*.aar</include>
+ </includes>
+
<targetPath>WEB-INF/services</targetPath>
+ </resource>
+ <resource>
+
<directory>${basedir}/resources/${axis2Id}/webapp/axis2-web
+ </directory>
+ <includes>
+
<include>**/*</include>
+ </includes>
+
<targetPath>axis2-web</targetPath>
+ </resource>
+ <resource>
+
<directory>${basedir}/resources/${axis2Id}/repository/modules
+ </directory>
+ <includes>
+
<include>**/*</include>
+ </includes>
+
<targetPath>WEB-INF/modules</targetPath>
+ </resource>
+ <resource>
+
<directory>${basedir}/resources/${axis2Id}/conf
+ </directory>
+ <includes>
+
<include>**/*.xml</include>
+ </includes>
+
<targetPath>WEB-INF/conf</targetPath>
+ </resource>
+ </webResources>
+
<webXml>${basedir}/resources/${axis2Id}/webapp/WEB-INF/web.xml
+ </webXml>
+ </configuration>
+ </plugin>

- <!-- execution: mvn jetty:run-war -->
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <webApp>${project.build.directory}/${project.artifactId}</webApp>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <!-- execution: mvn jetty:run-war -->
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+
<webApp>${project.build.directory}/${project.artifactId}
+ </webApp>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>

- <repositories>
+ <repositories>

- <repository>
- <id>ibiblio</id>
- <name>ibiblio repository</name>
- <url>http://www.ibiblio.org/maven2</url>
- </repository>
- <repository>
- <id>personar</id>
- <name>personar repository</name>
-
<url>http://anonsvn.internet2.edu/svn/perfsonar/trunk/jar-repository/</url>
- </repository>
- <repository>
- <id>personar_leg</id>
- <name>personar repository</name>
-
<url>http://anonsvn.internet2.edu/svn/perfsonar/trunk/jar-repository/</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>codehaus-release-repo</id>
- <name>Codehaus Release Repo</name>
- <url>http://repository.codehaus.org</url>
- </repository>
+ <repository>
+ <id>ibiblio</id>
+ <name>ibiblio repository</name>
+ <url>http://www.ibiblio.org/maven2</url>
+ </repository>
+ <repository>
+ <id>personar</id>
+ <name>personar repository</name>
+ <url>
+
http://anonsvn.internet2.edu/svn/perfsonar/trunk/jar-repository/
+ </url>
+ </repository>
+ <repository>
+ <id>personar_leg</id>
+ <name>personar repository</name>
+ <url>
+
http://anonsvn.internet2.edu/svn/perfsonar/trunk/jar-repository/
+ </url>
+ <layout>legacy</layout>
+ </repository>
+ <repository>
+ <id>codehaus-release-repo</id>
+ <name>Codehaus Release Repo</name>
+ <url>http://repository.codehaus.org
+ </url>
+ </repository>

- </repositories>
+ </repositories>


- <dependencies>
+ <dependencies>

- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ </dependency>

- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>

- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2</version>
- </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>

- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>2.0</version>
- </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>2.0</version>
+ </dependency>

- <!-- taken from axis2 sources -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ </dependency>

- <dependency>
- <groupId>perfsonar</groupId>
- <artifactId>ps-mdm-base2</artifactId>
- <version>0.0.3</version>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws</artifactId>
- <version>1.4.1</version>
- </dependency>
+ <!-- taken from axis2 sources -->

- <!-- got for auth -->
- <dependency>
- <groupId>opensaml</groupId>
- <artifactId>opensaml1</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>124</version>
- </dependency>
- <dependency>
- <groupId>xml-security</groupId>
- <artifactId>xmlsec</artifactId>
- <version>1.3.0</version>
- </dependency>
- <dependency>
- <groupId>edugain</groupId>
- <artifactId>edugain</artifactId>
- <version>0.7alpha</version>
- </dependency>
- <dependency>
- <groupId>perfsonar</groupId>
- <artifactId>perfsonar-authr</artifactId>
- <version>0.5</version>
- </dependency>
- <dependency>
- <groupId>sasl-ca</groupId>
- <artifactId>sasl-ca</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>codec</groupId>
- <artifactId>codec</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>opensaml</groupId>
- <artifactId>opensaml</artifactId>
- <version>2.0-TP2-jdk-1.5</version>
- </dependency>
- <dependency>
- <groupId>xmltooling</groupId>
- <artifactId>xmltooling</artifactId>
- <version>1.0-TP2-jdk-1.5</version>
- </dependency>
- <dependency>
- <groupId>wss4j</groupId>
- <artifactId>wss4j</artifactId>
- <version>1.5.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-core</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.8.0</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xerces-xml-apis</artifactId>
- <version>2.8.0</version>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.0</version>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan-serializer</artifactId>
- <version>2.7.0</version>
- </dependency>
+ <dependency>
+ <groupId>perfsonar</groupId>
+ <artifactId>ps-mdm-base2</artifactId>
+ <version>0.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxws</artifactId>
+ <version>1.4.1</version>
+ </dependency>

- </dependencies>
+ <!-- got for auth -->
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>opensaml1</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <version>124</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-security</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>edugain</groupId>
+ <artifactId>edugain</artifactId>
+ <version>0.7alpha</version>
+ </dependency>
+ <dependency>
+ <groupId>perfsonar</groupId>
+ <artifactId>perfsonar-authr</artifactId>
+ <version>0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>sasl-ca</groupId>
+ <artifactId>sasl-ca</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>codec</groupId>
+ <artifactId>codec</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ <version>2.0-TP2-jdk-1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>xmltooling</groupId>
+ <artifactId>xmltooling</artifactId>
+ <version>1.0-TP2-jdk-1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>wss4j</groupId>
+ <artifactId>wss4j</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-core</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xerces-xml-apis</artifactId>
+ <version>2.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan-serializer</artifactId>
+ <version>2.7.0</version>
+ </dependency>

+ </dependencies>

+
</project>

Modified:
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/DiscoveryRequestGenerator.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/DiscoveryRequestGenerator.java
2009-10-22 08:04:10 UTC (rev 5318)
+++
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/DiscoveryRequestGenerator.java
2009-10-22 09:41:27 UTC (rev 5319)
@@ -50,7 +50,7 @@
data.addAttribute("metadataIdRef", metadataId);
message.addChild(data);
dataList.add(metadata);
- dataList.add(data);
+// dataList.add(data);

return subject;
}

Modified:
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/SummarizationDAOImpl.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/SummarizationDAOImpl.java
2009-10-22 08:04:10 UTC (rev 5318)
+++
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/SummarizationDAOImpl.java
2009-10-22 09:41:27 UTC (rev 5319)
@@ -120,7 +120,7 @@
public XMLDBResult getSummaryData() throws PerfSONARException {
StringBuffer sb = new StringBuffer();
sb.append(DECLARE_NMWG_NAMESPACE);
-
sb.append("/nmwg:store[@type='LSStore-summary']/nmwg:data");
+
sb.append("/nmwg:store[@type='LSStore-summary']/nmwg:metadata");

return performXQuery(sb.toString());
}


  • perfsonar: r5319 - in branches/new-structure-with-base2/ps-mdm-ls: . contrib/SOAPRequestAuxilary/src/pl/psnc src/main/java/org/perfsonar/service/lookupservice/registration src/main/java/org/perfsonar/service/lookupservice/storage/exist, svnlog, 10/22/2009

Archive powered by MHonArc 2.6.16.

Top of Page