From d912f8b10834a0b6ae6384a8d2f806f9835899f9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Tue, 17 May 2005 12:45:18 +0000 Subject: [PATCH] Half-way to generated WSDL, not usable yet. --- org.glite.jp.ws-interface/Makefile | 17 +- .../interface/JobProvenancePS.wsdl | 305 --------------------- .../interface/JobProvenanceTypes.wsdl | 167 ----------- org.glite.jp.ws-interface/src/JobProvenancePS.xml | 67 +++++ .../src/JobProvenanceTypes.xml | 50 ++++ org.glite.jp.ws-interface/src/puke-wsdl.xsl | 165 ++++++++--- 6 files changed, 255 insertions(+), 516 deletions(-) delete mode 100644 org.glite.jp.ws-interface/interface/JobProvenancePS.wsdl delete mode 100644 org.glite.jp.ws-interface/interface/JobProvenanceTypes.wsdl create mode 100644 org.glite.jp.ws-interface/src/JobProvenancePS.xml create mode 100644 org.glite.jp.ws-interface/src/JobProvenanceTypes.xml diff --git a/org.glite.jp.ws-interface/Makefile b/org.glite.jp.ws-interface/Makefile index f6eb324..6f6623f 100644 --- a/org.glite.jp.ws-interface/Makefile +++ b/org.glite.jp.ws-interface/Makefile @@ -11,17 +11,20 @@ PREFIX=/opt/glite -include Makefile.inc -VPATH=${top_srcdir}/interface +VPATH=${top_srcdir}/interface:${top_srcdir}/src STAGETO=interface -WSDL=JobProvenancePS.wsdl JobProvenanceIS.wsdl JobProvenanceTypes.wsdl +XSLTPROC=xsltproc -all compile: +#WSDL=JobProvenancePS.wsdl JobProvenanceIS.wsdl JobProvenanceTypes.wsdl +WSDL=JobProvenancePS.wsdl JobProvenanceTypes.wsdl + +all compile: ${WSDL} check: @echo No unit test required for interface-only module. -stage: +stage: ${WSDL} $(MAKE) install PREFIX=${stagedir} dist: distsrc distbin @@ -41,8 +44,12 @@ install: -mkdir -p ${PREFIX}/${STAGETO} -mkdir -p ${PREFIX}/share/doc/${package}-${version} install -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version} - cd ${top_srcdir}/interface && install -m 644 ${WSDL} ${PREFIX}/${STAGETO} +# cd ${top_srcdir}/interface && install -m 644 ${WSDL} ${PREFIX}/${STAGETO} + install -m 644 ${WSDL} ${PREFIX}/${STAGETO} clean: rm -f *.h + +%.wsdl: %.xml + ${XSLTPROC} ../src/puke-wsdl.xsl $< >$@ diff --git a/org.glite.jp.ws-interface/interface/JobProvenancePS.wsdl b/org.glite.jp.ws-interface/interface/JobProvenancePS.wsdl deleted file mode 100644 index c6ebf36..0000000 --- a/org.glite.jp.ws-interface/interface/JobProvenancePS.wsdl +++ /dev/null @@ -1,305 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Register job with JP primary storage. -Job registration in LB is propagated to JP immediately so that JP is aware of the job, -despite no furhter information is available in it. - -Input: JobId - -Output: N/A - -Faults: GenericJPFault - - - - - - - Initiate upload of of sandbox/dump of job life log from LB. -WM component responsible for job sandbox management and LB server call JP to declare -intention to upload intput/output sandbox and job life log. - -Input: - -uclass: type of the upload - INPUT_SANDBOX, OUTPUT_SANDBOX, JOB_LOG - -commitTimeout: upper limit on time for which JP waits for committing this upload transaction - -contentType: MIME type of the uploaded file - -Output: - -destination: URL where the client should upload the file - -commitBefore: acutual time when the upload transaction times out - -Faults: GenericJPFault - - -Initiate upload of of sandbox/dump of job life log from LB. - - - - - - Confirm upload. -Should be called after a file upload initiaded with StartUpload is finished. - -Input: - -destination: Upload destination URL (to match with the original request) - -Output: - -Faults: GenericJPFault - - - - - - - Record a value of user tag. -JP tags are either standalone or override values of their LB counterparts. -However, JP tag values are still distinguishable those inherited from LB. -JP tags may be either strings or blobs. - -Input: - -jobid: - -tag: structure containing name, timestamp, optional sequence number to order tag values -without relying on timestamps, and string or blob value. - -Output: N/A - -Faults: GenericJPFault - - - - - - - Start feeding JP index server. -Called by the index server to start batch feed, and optionally also subscribe for incremental feed. - -JP index server subscribes with JP primary storage using a query -containing conditions on primary metadata and a list of queryable attributes -of the index server (i.e. data which should be sent to the index server). - -When a matching job record is created or modified within the primary storage -the job record data are sent to the subscribed index server. - -The subscription is soft-state, it expires after certain time unless refreshed by the client explicitely. - -In the batch mode the query has the same form -with additional flag asking for all matching records (i.e.\ not only -arriving afterwards). - -Input: - -destination: where to send the job record data - -attributes: which job record attributes should be sent to the requesting index server - -conditions: list of query conditions. Each conditions has the form Attribute Operator Value, -where Attribute is any of job record attributes and Operator is one of EQUAL, UNEQUAL, LESS, GREATER, WITHIN. - -continuous: flag determining that the query is incremental (not batch) - -Output: - -feedId: unique Id of the feed request, to be used in refresh, cancelation etc. - -expires: when the feed times out. Must be refreshed before this time. - -Faults: GenericJPFault - - - - - - - Extend batch feed subscription (used by index server) - -Input: feedId returned previously by FeedIndex - -Output: the same as for FeedIndex - -Faults: GenericJPFault - - - - - - - Retrieve job record URL's when jobid is known -Used either to bypass JP index server query for this specific case, or after the index server query to -retrieve actual job record. - -Input: jobid - -Output: - -jobLog, inputSandbox, outputSandbox, tags: URL's to components of the job record. - -Faults: GenericJPFault - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Job Provenance Primary Storage service - - - - - diff --git a/org.glite.jp.ws-interface/interface/JobProvenanceTypes.wsdl b/org.glite.jp.ws-interface/interface/JobProvenanceTypes.wsdl deleted file mode 100644 index 0df6209..0000000 --- a/org.glite.jp.ws-interface/interface/JobProvenanceTypes.wsdl +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.glite.jp.ws-interface/src/JobProvenancePS.xml b/org.glite.jp.ws-interface/src/JobProvenancePS.xml new file mode 100644 index 0000000..335fe67 --- /dev/null +++ b/org.glite.jp.ws-interface/src/JobProvenancePS.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.glite.jp.ws-interface/src/JobProvenanceTypes.xml b/org.glite.jp.ws-interface/src/JobProvenanceTypes.xml new file mode 100644 index 0000000..ebbede4 --- /dev/null +++ b/org.glite.jp.ws-interface/src/JobProvenanceTypes.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.glite.jp.ws-interface/src/puke-wsdl.xsl b/org.glite.jp.ws-interface/src/puke-wsdl.xsl index 9342e89..814fd56 100644 --- a/org.glite.jp.ws-interface/src/puke-wsdl.xsl +++ b/org.glite.jp.ws-interface/src/puke-wsdl.xsl @@ -1,13 +1,15 @@ + xmlns:jp="http://glite.org/wsdl/services/jp" + xmlns:jpe="http://glite.org/wsdl/elements/jp" + xmlns:jpt="http://glite.org/wsdl/types/jp"> @@ -17,55 +19,59 @@ name="{@name}" targetNamespace="{@ns}"> - - - - - - - - - - + - - - - - - - - - - - - + + + + + - - - - + + + + + + + + + + + + + + + + - + @@ -76,10 +82,10 @@ - + - + @@ -92,7 +98,7 @@ - : + : @@ -112,29 +118,66 @@ - + + + + + + + - + + - + + + + + + + + : + + + + + List + + + + + + - + @@ -164,4 +207,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 1.8.2.3