[xgws-dev] CVS Update: codes/xsul/java/modules/lead/xsul/lead
Aleksander Andrzej Slominski
xgws-dev_at_extreme.indiana.edu
Wed Oct 4 17:40:01 2006
aslom 06/10/04 17:39:52
Modified: xsul/java/modules/lead/xsul/lead LeadContextHeader.java
lead-context.xsd lead-crosscut-parameters.xsd
xml-name-value-list.xsd
Log:
added error sink epr (Srinath idea)
Revision Changes Path
1.12 +32 -6 codes/xsul/java/modules/lead/xsul/lead/LeadContextHeader.java
Index: LeadContextHeader.java
===================================================================
RCS file: /l/extreme/cvs/codes/xsul/java/modules/lead/xsul/lead/LeadContextHeader.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -t -w -r1.11 -r1.12
--- LeadContextHeader.java 26 Sep 2006 17:17:53 -0000 1.11
+++ LeadContextHeader.java 4 Oct 2006 21:39:52 -0000 1.12
@@ -1,7 +1,7 @@
/* -*- mode: Java; c-basic-offset: 4; indent-tabs-mode: nil; -*- //------100-columns-wide------>|*/
/* Copyright (c) 2002-2005 Extreme! Lab, Indiana University. All rights reserved.
* This software is open source. See the bottom of this file for the licence.
- * $Id: LeadContextHeader.java,v 1.11 2006/09/26 17:17:53 aslom Exp $ */
+ * $Id: LeadContextHeader.java,v 1.12 2006/10/04 21:39:52 aslom Exp $ */
package xsul.lead;
import javax.xml.namespace.QName;
@@ -36,6 +36,7 @@
public final static String RESOURCE_CATALOG_URL = "resource-catalog-url";
//public final static String PROPERTIES_FILE_URL = "properties-file-url";
public final static String EVENT_SINK_EPR = "event-sink-epr";
+ public final static String ERROR_SINK_EPR = "error-sink-epr";
public final static String USER_DN = "user-dn";
@@ -118,6 +119,31 @@
return new WsaEndpointReference(el);
}
}
+
+ public void setErrorSink(WsaEndpointReference epr) {
+ //epr.setNamespace(builder.newNamespace(XmlElement.NO_NAMESPACE)); //CHECKME
+ epr.setNamespace(NS);
+ epr.setName(ERROR_SINK_EPR);
+ XmlElement el = element(NS, ERROR_SINK_EPR);
+ if(el != null) {
+ replaceChild(epr, el);
+ } else {
+ addChild(1, epr); //addChild(epr);
+ }
+ }
+
+ public WsaEndpointReference getErrorSink() {
+ XmlElement el = element(NS, ERROR_SINK_EPR);
+ if(el == null) {
+ return null;
+ }
+ if(el instanceof WsaEndpointReference) {
+ return (WsaEndpointReference) el;
+ } else {
+ return new WsaEndpointReference(el);
+ }
+ }
+
}
/*
1.7 +15 -1 codes/xsul/java/modules/lead/xsul/lead/lead-context.xsd
Index: lead-context.xsd
===================================================================
RCS file: /l/extreme/cvs/codes/xsul/java/modules/lead/xsul/lead/lead-context.xsd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -t -w -r1.6 -r1.7
--- lead-context.xsd 3 Oct 2006 20:22:31 -0000 1.6
+++ lead-context.xsd 4 Oct 2006 21:39:52 -0000 1.7
@@ -73,6 +73,19 @@
</complexType>
</element>
+
+ <element name="error-sink-epr">
+ <annotation><documentation xml:lang="en">
+ EPR for WS-Eventing sink where to send errors (optional)
+ NOTE: system level warnings, errors, etc good for debugging.
+ </documentation></annotation>
+ <complexType>
+ <sequence>
+ <any namespace="##any" minOccurs="0"/>
+ </sequence>
+ </complexType>
+ </element>
+
<element name="user-dn" type="string">
<annotation><documentation xml:lang="en">
String that identifies user running this experiment. (REQUIRED in context
@@ -94,11 +107,12 @@
<element minOccurs="0" maxOccurs="1" ref="lead:dsc-url"/>
<element minOccurs="0" maxOccurs="1" ref="lead:resource-catalog-url"/>
<element minOccurs="0" maxOccurs="1" ref="lead:event-sink-epr"/>
+ <element minOccurs="0" maxOccurs="1" ref="lead:error-sink-epr"/>
<!-- this is required element to make open content model works (as much as it can be done in XS 1.0 ...) -->
<!-- for description see: http://www.xfront.com/ExtensibleContentModels.html -->
<!-- and http://www.xml.com/lpt/a/2002/07/03/schema_design.html -->
<element minOccurs="1" maxOccurs="1" ref="lead:user-dn"/>
- <any namespace="##any" minOccurs="0" maxOccurs="unbounded" />
+ <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
<!-- <any namespace="##targetNamespace" processContents="strict"
minOccurs="0" maxOccurs="unbounded" />
<any namespace="##other" processContents="lax" minOccurs="0"
1.5 +1 -1 codes/xsul/java/modules/lead/xsul/lead/lead-crosscut-parameters.xsd
Index: lead-crosscut-parameters.xsd
===================================================================
RCS file: /l/extreme/cvs/codes/xsul/java/modules/lead/xsul/lead/lead-crosscut-parameters.xsd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -t -w -r1.4 -r1.5
--- lead-crosscut-parameters.xsd 27 Sep 2006 19:13:25 -0000 1.4
+++ lead-crosscut-parameters.xsd 4 Oct 2006 21:39:52 -0000 1.5
@@ -12,7 +12,7 @@
List of elements from crosscut namespace (and others)
</documentation></annotation>
<sequence>
- <any namespace="##any" minOccurs="0"/>
+ <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
</sequence>
</complexType>
1.2 +1 -1 codes/xsul/java/modules/lead/xsul/lead/xml-name-value-list.xsd
Index: xml-name-value-list.xsd
===================================================================
RCS file: /l/extreme/cvs/codes/xsul/java/modules/lead/xsul/lead/xml-name-value-list.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -t -w -r1.1 -r1.2
--- xml-name-value-list.xsd 31 May 2006 22:12:15 -0000 1.1
+++ xml-name-value-list.xsd 4 Oct 2006 21:39:52 -0000 1.2
@@ -12,7 +12,7 @@
</documentation></annotation>
<sequence>
- <any namespace="##any" minOccurs="0"/>
+ <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
</sequence>
</complexType>