perfsonar-dev - perfsonar: r2493 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: ls plugins test
Subject: perfsonar development work
List archive
perfsonar: r2493 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: ls plugins test
Chronological Thread
- From:
- To:
- Subject: perfsonar: r2493 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: ls plugins test
- Date: Tue, 3 Jul 2007 03:29:14 -0400
Author: nina
Date: 2007-07-03 03:29:14 -0400 (Tue, 03 Jul 2007)
New Revision: 2493
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSQueryRequestFull.xml
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSResponseListener.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/LSRequestTest.java
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSQueryRequest.xml
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSRequest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IPerfsonarRequest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/MAEndpoint.java
Log:
Lookup service client updates
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSQueryRequest.xml
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSQueryRequest.xml
2007-07-02 14:04:07 UTC (rev 2492)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSQueryRequest.xml
2007-07-03 07:29:14 UTC (rev 2493)
@@ -28,14 +28,12 @@
declare namespace
perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";;
declare namespace
psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";;
declare namespace
xquery="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/";;
+
+ for $service in
/nmwg:store/nmwg:metadata/perfsonar:subject/psservice:service
+ let $type :=
data($service/psservice:serviceType)
+ where contains($type,'MA')
+ return $service
- for $metadata in /nmwg:store/nmwg:metadata
- let $metadata_id := $metadata/@id
- let $data :=
/nmwg:store/nmwg:data[@metadataIdRef=$metadata_id]
- where $metadata//psservice:serviceType="MA"
- return <lookup-storage-from-query>
- {$metadata} {$data}
- </lookup-storage-from-query>
</xquery:subject>
<nmwg:eventType>service.lookup.xquery</nmwg:eventType>
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSQueryRequestFull.xml
Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSRequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSRequest.java
2007-07-02 14:04:07 UTC (rev 2492)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSRequest.java
2007-07-03 07:29:14 UTC (rev 2493)
@@ -41,9 +41,21 @@
import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
public class LSRequest extends AbstractMARequest {
+ protected String resource;
+ public String getResource() {
+ return resource;
+ }
+ public void setResource(String resource) {
+ this.resource = resource;
+ }
+
+ public LSRequest(String resource) {
+ setResource(resource);
+ }
+
public LSRequest() {
- // TODO Auto-generated constructor stub
+ this("org/perfsonar/perfsonarui/ls/LSQueryRequest.xml");
}
@Override
@@ -51,7 +63,7 @@
throws Exception {
String inputFile;
- inputFile =
"org/perfsonar/perfsonarui/ls/LSQueryRequest.xml";
+ inputFile = resource;
Document request = null;
DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
@@ -104,13 +116,12 @@
// TODO Auto-generated method stub
return null;
}
-
+
public void process(IUserData uData, Document response,
- IPerfsonarResponse listener) throws Exception {
- // TODO Auto-generated method stub
-
- }
-
+ final IPerfsonarResponse listener) throws Exception {
+ throw new Exception("Not implemented. Use LSResponseListener
instead");
+ }
+
}
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSResponseListener.java
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IPerfsonarRequest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IPerfsonarRequest.java
2007-07-02 14:04:07 UTC (rev 2492)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IPerfsonarRequest.java
2007-07-03 07:29:14 UTC (rev 2493)
@@ -46,7 +46,8 @@
public static final String MA_MetadataKeyRequest = "MetadataKeyRequest";
public static final String MA_SetupDataRequest = "SetupDataRequest";
public static final String MA_MetadataRetrieveRequest =
"MetadataRetrieveRequest"; //this is "MetadataKeyRequest" with no parameters
- public static final String MA_EchoRequest = "EchoRequest";
+ public static final String MA_EchoRequest = "EchoRequest";
+ public static final String LS_QueryRequest = "LSQueryRequest";
public static String E_MESSAGE = "message";
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/MAEndpoint.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/MAEndpoint.java
2007-07-02 14:04:07 UTC (rev 2492)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/MAEndpoint.java
2007-07-03 07:29:14 UTC (rev 2493)
@@ -41,6 +41,7 @@
*/
public class MAEndpoint extends Observable {
protected boolean enabled = true;
+ protected String description;
protected String title = "";
protected String endpoint = "";
protected String authRealm = "";
@@ -215,5 +216,11 @@
setChanged();
notifyObservers();
}
+ public String getDescription() {
+ return description;
+ }
+ public void setDescription(String description) {
+ this.description = description;
+ }
}
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/LSRequestTest.java
- perfsonar: r2493 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: ls plugins test, svnlog, 07/03/2007
Archive powered by MHonArc 2.6.16.