6:03 p.m.
Author: richard.opalka(a)jboss.com
Date: 2007-09-18 12:03:30 -0400 (Tue, 18 Sep 2007)
New Revision: 4584
Modified:
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
stack/native/branches/ropalka/trunk/src/main/resources/schema/jaxws-config_2_0.xsd
stack/native/branches/ropalka/trunk/src/main/resources/schema/jboss-ws-rm_1.0.xsd
Log:
wsrm config will be part of jaxws configs
Modified:
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
===================================================================
---
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2007-09-18
13:15:44 UTC (rev 4583)
+++
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2007-09-18
16:03:30 UTC (rev 4584)
@@ -48,6 +48,7 @@
{
registerEntity("urn:jboss:jaxrpc-config:2.0",
"schema/jaxrpc-config_2_0.xsd");
registerEntity("urn:jboss:jaxws-config:2.0",
"schema/jaxws-config_2_0.xsd");
+ registerEntity("http://www.jboss.com/ws-rm/config";,
"schema/jboss-ws-rm_1.0.xsd");
registerEntity("http://java.sun.com/xml/ns/javaee";,
"schema/javaee_web_services_1_2.xsd");
registerEntity("http://www.w3.org/2005/08/addressing";,
"schema/ws-addr.xsd");
registerEntity("http://schemas.xmlsoap.org/ws/2004/08/eventing";,
"eventing.xsd");
Modified:
stack/native/branches/ropalka/trunk/src/main/resources/schema/jaxws-config_2_0.xsd
===================================================================
---
stack/native/branches/ropalka/trunk/src/main/resources/schema/jaxws-config_2_0.xsd 2007-09-18
13:15:44 UTC (rev 4583)
+++
stack/native/branches/ropalka/trunk/src/main/resources/schema/jaxws-config_2_0.xsd 2007-09-18
16:03:30 UTC (rev 4584)
@@ -3,10 +3,12 @@
<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
targetNamespace="urn:jboss:jaxws-config:2.0"
xmlns:tns="urn:jboss:jaxws-config:2.0"
- xmlns:jbxb="http://www.jboss.org/xml/ns/jbxb"
xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ xmlns:wsrm="http://www.jboss.com/ws-rm/config"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
attributeFormDefault="unqualified" version="1.1">
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.1">
<xsd:annotation>
<xsd:documentation>
@@ -19,6 +21,8 @@
<xsd:import namespace="http://java.sun.com/xml/ns/javaee"
schemaLocation="javaee_web_services_1_2.xsd"/>
+ <xsd:import namespace="http://www.jboss.com/ws-rm/config"
schemaLocation="jboss-ws-rm_1.0.xsd"/>
+
<xsd:element name="jaxws-config"
type="tns:jaxwsConfigType"/>
<xsd:complexType name="jaxwsConfigType">
<xsd:choice>
@@ -33,7 +37,6 @@
</xsd:complexContent>
</xsd:complexType>
- <!-- client config -->
<xsd:complexType name="clientConfigType">
<xsd:complexContent>
<xsd:extension base="tns:commonConfigType"/>
@@ -43,6 +46,7 @@
<xsd:complexType name="commonConfigType">
<xsd:sequence>
<xsd:element name="config-name" type="xsd:string"/>
+ <xsd:element name="reliable-messaging"
type="wsrm:rmConfigType" minOccurs="0"/>
<xsd:element name="pre-handler-chains"
type="javaee:handler-chainsType" minOccurs="0"/>
<xsd:element name="post-handler-chains"
type="javaee:handler-chainsType" minOccurs="0"/>
<xsd:element name="feature" type="xsd:anyURI"
minOccurs="0" maxOccurs="unbounded"/>
@@ -51,13 +55,6 @@
</xsd:complexType>
<xsd:complexType name="propertyType">
- <xsd:annotation>
- <xsd:documentation>
-
- A property models name value pairs.
-
- </xsd:documentation>
- </xsd:annotation>
<xsd:sequence>
<xsd:element name="property-name" type="xsd:anyURI"/>
<xsd:element name="property-value"
type="xsd:string"/>
Modified:
stack/native/branches/ropalka/trunk/src/main/resources/schema/jboss-ws-rm_1.0.xsd
===================================================================
---
stack/native/branches/ropalka/trunk/src/main/resources/schema/jboss-ws-rm_1.0.xsd 2007-09-18
13:15:44 UTC (rev 4583)
+++
stack/native/branches/ropalka/trunk/src/main/resources/schema/jboss-ws-rm_1.0.xsd 2007-09-18
16:03:30 UTC (rev 4584)
@@ -1,51 +1,44 @@
-<?xml version="1.0" encoding="utf-8"
standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8"?>
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://www.jboss.com/ws-rm/config"
targetNamespace="http://www.jboss.com/ws-rm/config"
elementFormDefault="qualified">
- <xs:element name="jboss-ws-rm">
- <xs:annotation>
- <xs:documentation>
- This WS-RM configuration file will be used on both client and server sides.
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="delivery-assurance"
type="deliveryAssuranceType" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- Global WS-RM delivery assurance configuration that applies to all WSDL
ports.
- If there is the WS-Policy with attached WS-RM assertion in WSDL
- associated with some port or its associated binding it
- will always override this global configuration.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="provider" type="providerType">
- <xs:annotation>
- <xs:documentation>
- WS-RM specification version to be used for reliable messaging.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="message-store" type="msgStoreType">
- <xs:annotation>
- <xs:documentation>
- WS-RM message store to be used for reliable messaging.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="port" type="portType"
minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>
- WSDL port specific WS-RM delivery assurance configuration.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:complexType name="rmConfigType">
+ <xs:sequence>
+ <xs:element name="delivery-assurance"
type="deliveryAssuranceType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ Global WS-RM delivery assurance configuration that applies to all WSDL
ports.
+ If there is the WS-Policy with attached WS-RM assertion in WSDL
+ associated with some port or its associated binding it
+ will always override this global configuration.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="provider" type="providerType">
+ <xs:annotation>
+ <xs:documentation>
+ WS-RM specification version to be used for reliable messaging.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="message-store" type="msgStoreType">
+ <xs:annotation>
+ <xs:documentation>
+ WS-RM message store to be used for reliable messaging.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="port" type="portType"
minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ WSDL port specific WS-RM delivery assurance configuration.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="msgStoreType">
<xs:sequence>
<xs:element name="config-file" type="xs:string">
@@ -139,4 +132,4 @@
</xs:annotation>
</xs:attribute>
</xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>