Author: andreasmyth
Date: Wed Oct 25 10:09:30 2006
New Revision: 467713
URL: http://svn.apache.org/viewvc?view=rev&rev=467713
Log:
Fixed path to catalog files and add local versions of DTDs in order to build
cxf-rt-ws-policy, cxf-rt-ws-rm without depending on a network connection.
Start building service model for the RM protocol messages.
Added:
incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/XMLSchema.dtd
incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/datatypes.dtd
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/Messages.properties
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java
incubator/cxf/trunk/rt/ws/policy/pom.xml
incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/catalog.cat
incubator/cxf/trunk/rt/ws/rm/pom.xml
incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMConstants.java
incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/impl/Proxy.java
incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/impl/RMEndpoint.java
incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/impl/RMInterceptor.java
incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/catalog.cat
incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/impl/ProxyTest.java
incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/impl/RMInterceptorTest.java
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/Messages.properties
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/Messages.properties?view=diff&rev=467713&r1=467712&r2=467713
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/Messages.properties
(original)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/Messages.properties
Wed Oct 25 10:09:30 2006
@@ -25,3 +25,4 @@
WSDL_GENERATION_BAD_RESULT_MSG = Generator returned with exit value {0}.
EXTENSION_ADD_FAILED_MSG = Failed to add extension element.
SERVICE_CREATION_MSG = Failed to create service.
+NO_SUCH_SERVICE_EXC = Could not find definition for service {0}.
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java?view=diff&rev=467713&r1=467712&r2=467713
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java
(original)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java
Wed Oct 25 10:09:30 2006
@@ -66,7 +66,7 @@
public Service create() {
javax.wsdl.Service wsdlService = definition.getService(serviceName);
if (wsdlService == null) {
- throw new ServiceConstructionException(new
Message("NO_SUCH_SERVICE", LOG, serviceName));
+ throw new ServiceConstructionException(new
Message("NO_SUCH_SERVICE_EXC", LOG, serviceName));
}
ServiceInfo si = new
WSDLServiceBuilder(getBus()).buildService(definition, wsdlService);
Modified: incubator/cxf/trunk/rt/ws/policy/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/pom.xml?view=diff&rev=467713&r1=467712&r2=467713
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/policy/pom.xml Wed Oct 25 10:09:30 2006
@@ -57,7 +57,7 @@
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/ws-policy.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/ws-policy.xjb</bindingFile>
- <catalog>catalog.cat</catalog>
+
<catalog>${basedir}/src/main/resources/schemas/catalog.cat</catalog>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/main/java/org/oasis_open</deleteDir>
<deleteDir>${basedir}/target/generated/src/main/java/org/w3</deleteDir>
Added: incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/XMLSchema.dtd
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/XMLSchema.dtd?view=auto&rev=467713
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/XMLSchema.dtd
(added)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/XMLSchema.dtd
Wed Oct 25 10:09:30 2006
@@ -0,0 +1,402 @@
+<!-- DTD for XML Schemas: Part 1: Structures
+ Public Identifier: "-//W3C//DTD XMLSCHEMA 200102//EN"
+ Official Location: http://www.w3.org/2001/XMLSchema.dtd -->
+<!-- $Id: XMLSchema.dtd,v 1.31 2001/10/24 15:50:16 ht Exp $ -->
+<!-- Note this DTD is NOT normative, or even definitive. --> <!--d-->
+<!-- prose copy in the structures REC is the definitive version --> <!--d-->
+<!-- (which shouldn't differ from this one except for this --> <!--d-->
+<!-- comment and entity expansions, but just in case) --> <!--d-->
+<!-- With the exception of cases with multiple namespace
+ prefixes for the XML Schema namespace, any XML document which is
+ not valid per this DTD given redefinitions in its internal subset of the
+ 'p' and 's' parameter entities below appropriate to its namespace
+ declaration of the XML Schema namespace is almost certainly not
+ a valid schema. -->
+
+<!-- The simpleType element and its constituent parts
+ are defined in XML Schema: Part 2: Datatypes -->
+<!ENTITY % xs-datatypes PUBLIC 'datatypes' 'datatypes.dtd' >
+
+<!ENTITY % p 'xs:'> <!-- can be overriden in the internal subset of a
+ schema document to establish a different
+ namespace prefix -->
+<!ENTITY % s ':xs'> <!-- if %p is defined (e.g. as foo:) then you must
+ also define %s as the suffix for the appropriate
+ namespace declaration (e.g. :foo) -->
+<!ENTITY % nds 'xmlns%s;'>
+
+<!-- Define all the element names, with optional prefix -->
+<!ENTITY % schema "%p;schema">
+<!ENTITY % complexType "%p;complexType">
+<!ENTITY % complexContent "%p;complexContent">
+<!ENTITY % simpleContent "%p;simpleContent">
+<!ENTITY % extension "%p;extension">
+<!ENTITY % element "%p;element">
+<!ENTITY % unique "%p;unique">
+<!ENTITY % key "%p;key">
+<!ENTITY % keyref "%p;keyref">
+<!ENTITY % selector "%p;selector">
+<!ENTITY % field "%p;field">
+<!ENTITY % group "%p;group">
+<!ENTITY % all "%p;all">
+<!ENTITY % choice "%p;choice">
+<!ENTITY % sequence "%p;sequence">
+<!ENTITY % any "%p;any">
+<!ENTITY % anyAttribute "%p;anyAttribute">
+<!ENTITY % attribute "%p;attribute">
+<!ENTITY % attributeGroup "%p;attributeGroup">
+<!ENTITY % include "%p;include">
+<!ENTITY % import "%p;import">
+<!ENTITY % redefine "%p;redefine">
+<!ENTITY % notation "%p;notation">
+
+<!-- annotation elements -->
+<!ENTITY % annotation "%p;annotation">
+<!ENTITY % appinfo "%p;appinfo">
+<!ENTITY % documentation "%p;documentation">
+
+<!-- Customisation entities for the ATTLIST of each element type.
+ Define one of these if your schema takes advantage of the
+ anyAttribute='##other' in the schema for schemas -->
+
+<!ENTITY % schemaAttrs ''>
+<!ENTITY % complexTypeAttrs ''>
+<!ENTITY % complexContentAttrs ''>
+<!ENTITY % simpleContentAttrs ''>
+<!ENTITY % extensionAttrs ''>
+<!ENTITY % elementAttrs ''>
+<!ENTITY % groupAttrs ''>
+<!ENTITY % allAttrs ''>
+<!ENTITY % choiceAttrs ''>
+<!ENTITY % sequenceAttrs ''>
+<!ENTITY % anyAttrs ''>
+<!ENTITY % anyAttributeAttrs ''>
+<!ENTITY % attributeAttrs ''>
+<!ENTITY % attributeGroupAttrs ''>
+<!ENTITY % uniqueAttrs ''>
+<!ENTITY % keyAttrs ''>
+<!ENTITY % keyrefAttrs ''>
+<!ENTITY % selectorAttrs ''>
+<!ENTITY % fieldAttrs ''>
+<!ENTITY % includeAttrs ''>
+<!ENTITY % importAttrs ''>
+<!ENTITY % redefineAttrs ''>
+<!ENTITY % notationAttrs ''>
+<!ENTITY % annotationAttrs ''>
+<!ENTITY % appinfoAttrs ''>
+<!ENTITY % documentationAttrs ''>
+
+<!ENTITY % complexDerivationSet "CDATA">
+ <!-- #all or space-separated list drawn from derivationChoice -->
+<!ENTITY % blockSet "CDATA">
+ <!-- #all or space-separated list drawn from
+ derivationChoice + 'substitution' -->
+
+<!ENTITY % mgs '%all; | %choice; | %sequence;'>
+<!ENTITY % cs '%choice; | %sequence;'>
+<!ENTITY % formValues '(qualified|unqualified)'>
+
+
+<!ENTITY % attrDecls '((%attribute;| %attributeGroup;)*,(%anyAttribute;)?)'>
+
+<!ENTITY % particleAndAttrs '((%mgs; | %group;)?, %attrDecls;)'>
+
+<!-- This is used in part2 -->
+<!ENTITY % restriction1 '((%mgs; | %group;)?)'>
+
+%xs-datatypes;
+
+<!-- the duplication below is to produce an unambiguous content model
+ which allows annotation everywhere -->
+<!ELEMENT %schema; ((%include; | %import; | %redefine; | %annotation;)*,
+ ((%simpleType; | %complexType;
+ | %element; | %attribute;
+ | %attributeGroup; | %group;
+ | %notation; ),
+ (%annotation;)*)* )>
+<!ATTLIST %schema;
+ targetNamespace %URIref; #IMPLIED
+ version CDATA #IMPLIED
+ %nds; %URIref; #FIXED
'http://www.w3.org/2001/XMLSchema'
+ xmlns CDATA #IMPLIED
+ finalDefault %complexDerivationSet; ''
+ blockDefault %blockSet; ''
+ id ID #IMPLIED
+ elementFormDefault %formValues; 'unqualified'
+ attributeFormDefault %formValues; 'unqualified'
+ xml:lang CDATA #IMPLIED
+ %schemaAttrs;>
+<!-- Note the xmlns declaration is NOT in the Schema for Schemas,
+ because at the Infoset level where schemas operate,
+ xmlns(:prefix) is NOT an attribute! -->
+<!-- The declaration of xmlns is a convenience for schema authors -->
+
+<!-- The id attribute here and below is for use in external references
+ from non-schemas using simple fragment identifiers.
+ It is NOT used for schema-to-schema reference, internal or
+ external. -->
+
+<!-- a type is a named content type specification which allows attribute
+ declarations-->
+<!-- -->
+
+<!ELEMENT %complexType; ((%annotation;)?,
+ (%simpleContent;|%complexContent;|
+ %particleAndAttrs;))>
+
+<!ATTLIST %complexType;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ abstract %boolean; #IMPLIED
+ final %complexDerivationSet; #IMPLIED
+ block %complexDerivationSet; #IMPLIED
+ mixed (true|false) 'false'
+ %complexTypeAttrs;>
+
+<!-- particleAndAttrs is shorthand for a root type -->
+<!-- mixed is disallowed if simpleContent, overriden if complexContent
+ has one too. -->
+
+<!-- If anyAttribute appears in one or more referenced attributeGroups
+ and/or explicitly, the intersection of the permissions is used -->
+
+<!ELEMENT %complexContent; ((%annotation;)?, (%restriction;|%extension;))>
+<!ATTLIST %complexContent;
+ mixed (true|false) #IMPLIED
+ id ID #IMPLIED
+ %complexContentAttrs;>
+
+<!-- restriction should use the branch defined above, not the simple
+ one from part2; extension should use the full model -->
+
+<!ELEMENT %simpleContent; ((%annotation;)?, (%restriction;|%extension;))>
+<!ATTLIST %simpleContent;
+ id ID #IMPLIED
+ %simpleContentAttrs;>
+
+<!-- restriction should use the simple branch from part2, not the
+ one defined above; extension should have no particle -->
+
+<!ELEMENT %extension; ((%annotation;)?, (%particleAndAttrs;))>
+<!ATTLIST %extension;
+ base %QName; #REQUIRED
+ id ID #IMPLIED
+ %extensionAttrs;>
+
+<!-- an element is declared by either:
+ a name and a type (either nested or referenced via the type attribute)
+ or a ref to an existing element declaration -->
+
+<!ELEMENT %element; ((%annotation;)?, (%complexType;| %simpleType;)?,
+ (%unique; | %key; | %keyref;)*)>
+<!-- simpleType or complexType only if no type|ref attribute -->
+<!-- ref not allowed at top level -->
+<!ATTLIST %element;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ ref %QName; #IMPLIED
+ type %QName; #IMPLIED
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ nillable %boolean; #IMPLIED
+ substitutionGroup %QName; #IMPLIED
+ abstract %boolean; #IMPLIED
+ final %complexDerivationSet; #IMPLIED
+ block %blockSet; #IMPLIED
+ default CDATA #IMPLIED
+ fixed CDATA #IMPLIED
+ form %formValues; #IMPLIED
+ %elementAttrs;>
+<!-- type and ref are mutually exclusive.
+ name and ref are mutually exclusive, one is required -->
+<!-- In the absence of type AND ref, type defaults to type of
+ substitutionGroup, if any, else the ur-type, i.e. unconstrained -->
+<!-- default and fixed are mutually exclusive -->
+
+<!ELEMENT %group; ((%annotation;)?,(%mgs;)?)>
+<!ATTLIST %group;
+ name %NCName; #IMPLIED
+ ref %QName; #IMPLIED
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ id ID #IMPLIED
+ %groupAttrs;>
+
+<!ELEMENT %all; ((%annotation;)?, (%element;)*)>
+<!ATTLIST %all;
+ minOccurs (1) #IMPLIED
+ maxOccurs (1) #IMPLIED
+ id ID #IMPLIED
+ %allAttrs;>
+
+<!ELEMENT %choice; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
+<!ATTLIST %choice;
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ id ID #IMPLIED
+ %choiceAttrs;>
+
+<!ELEMENT %sequence; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
+<!ATTLIST %sequence;
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ id ID #IMPLIED
+ %sequenceAttrs;>
+
+<!-- an anonymous grouping in a model, or
+ a top-level named group definition, or a reference to same -->
+
+<!-- Note that if order is 'all', group is not allowed inside.
+ If order is 'all' THIS group must be alone (or referenced alone) at
+ the top level of a content model -->
+<!-- If order is 'all', minOccurs==maxOccurs==1 on element/any inside -->
+<!-- Should allow minOccurs=0 inside order='all' . . . -->
+
+<!ELEMENT %any; (%annotation;)?>
+<!ATTLIST %any;
+ namespace CDATA '##any'
+ processContents (skip|lax|strict) 'strict'
+ minOccurs %nonNegativeInteger; '1'
+ maxOccurs CDATA '1'
+ id ID #IMPLIED
+ %anyAttrs;>
+
+<!-- namespace is interpreted as follows:
+ ##any - - any non-conflicting WFXML at all
+
+ ##other - - any non-conflicting WFXML from namespace other
+ than targetNamespace
+
+ ##local - - any unqualified non-conflicting
WFXML/attribute
+ one or - - any non-conflicting WFXML from
+ more URI the listed namespaces
+ references
+
+ ##targetNamespace ##local may appear in the above list,
+ with the obvious meaning -->
+
+<!ELEMENT %anyAttribute; (%annotation;)?>
+<!ATTLIST %anyAttribute;
+ namespace CDATA '##any'
+ processContents (skip|lax|strict) 'strict'
+ id ID #IMPLIED
+ %anyAttributeAttrs;>
+<!-- namespace is interpreted as for 'any' above -->
+
+<!-- simpleType only if no type|ref attribute -->
+<!-- ref not allowed at top level, name iff at top level -->
+<!ELEMENT %attribute; ((%annotation;)?, (%simpleType;)?)>
+<!ATTLIST %attribute;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ ref %QName; #IMPLIED
+ type %QName; #IMPLIED
+ use (prohibited|optional|required) #IMPLIED
+ default CDATA #IMPLIED
+ fixed CDATA #IMPLIED
+ form %formValues; #IMPLIED
+ %attributeAttrs;>
+<!-- type and ref are mutually exclusive.
+ name and ref are mutually exclusive, one is required -->
+<!-- default for use is optional when nested, none otherwise -->
+<!-- default and fixed are mutually exclusive -->
+<!-- type attr and simpleType content are mutually exclusive -->
+
+<!-- an attributeGroup is a named collection of attribute decls, or a
+ reference thereto -->
+<!ELEMENT %attributeGroup; ((%annotation;)?,
+ (%attribute; | %attributeGroup;)*,
+ (%anyAttribute;)?) >
+<!ATTLIST %attributeGroup;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ ref %QName; #IMPLIED
+ %attributeGroupAttrs;>
+
+<!-- ref iff no content, no name. ref iff not top level -->
+
+<!-- better reference mechanisms -->
+<!ELEMENT %unique; ((%annotation;)?, %selector;, (%field;)+)>
+<!ATTLIST %unique;
+ name %NCName; #REQUIRED
+ id ID #IMPLIED
+ %uniqueAttrs;>
+
+<!ELEMENT %key; ((%annotation;)?, %selector;, (%field;)+)>
+<!ATTLIST %key;
+ name %NCName; #REQUIRED
+ id ID #IMPLIED
+ %keyAttrs;>
+
+<!ELEMENT %keyref; ((%annotation;)?, %selector;, (%field;)+)>
+<!ATTLIST %keyref;
+ name %NCName; #REQUIRED
+ refer %QName; #REQUIRED
+ id ID #IMPLIED
+ %keyrefAttrs;>
+
+<!ELEMENT %selector; ((%annotation;)?)>
+<!ATTLIST %selector;
+ xpath %XPathExpr; #REQUIRED
+ id ID #IMPLIED
+ %selectorAttrs;>
+<!ELEMENT %field; ((%annotation;)?)>
+<!ATTLIST %field;
+ xpath %XPathExpr; #REQUIRED
+ id ID #IMPLIED
+ %fieldAttrs;>
+
+<!-- Schema combination mechanisms -->
+<!ELEMENT %include; (%annotation;)?>
+<!ATTLIST %include;
+ schemaLocation %URIref; #REQUIRED
+ id ID #IMPLIED
+ %includeAttrs;>
+
+<!ELEMENT %import; (%annotation;)?>
+<!ATTLIST %import;
+ namespace %URIref; #IMPLIED
+ schemaLocation %URIref; #IMPLIED
+ id ID #IMPLIED
+ %importAttrs;>
+
+<!ELEMENT %redefine; (%annotation; | %simpleType; | %complexType; |
+ %attributeGroup; | %group;)*>
+<!ATTLIST %redefine;
+ schemaLocation %URIref; #REQUIRED
+ id ID #IMPLIED
+ %redefineAttrs;>
+
+<!ELEMENT %notation; (%annotation;)?>
+<!ATTLIST %notation;
+ name %NCName; #REQUIRED
+ id ID #IMPLIED
+ public CDATA #REQUIRED
+ system %URIref; #IMPLIED
+ %notationAttrs;>
+
+<!-- Annotation is either application information or documentation -->
+<!-- By having these here they are available for datatypes as well
+ as all the structures elements -->
+
+<!ELEMENT %annotation; (%appinfo; | %documentation;)*>
+<!ATTLIST %annotation; %annotationAttrs;>
+
+<!-- User must define annotation elements in internal subset for this
+ to work -->
+<!ELEMENT %appinfo; ANY> <!-- too restrictive -->
+<!ATTLIST %appinfo;
+ source %URIref; #IMPLIED
+ id ID #IMPLIED
+ %appinfoAttrs;>
+<!ELEMENT %documentation; ANY> <!-- too restrictive -->
+<!ATTLIST %documentation;
+ source %URIref; #IMPLIED
+ id ID #IMPLIED
+ xml:lang CDATA #IMPLIED
+ %documentationAttrs;>
+
+<!NOTATION XMLSchemaStructures PUBLIC
+ 'structures' 'http://www.w3.org/2001/XMLSchema.xsd' >
+<!NOTATION XML PUBLIC
+ 'REC-xml-1998-0210' 'http://www.w3.org/TR/1998/REC-xml-19980210' >
Modified:
incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/catalog.cat
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/catalog.cat?view=diff&rev=467713&r1=467712&r2=467713
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/catalog.cat
(original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/catalog.cat Wed
Oct 25 10:09:30 2006
@@ -22,4 +22,4 @@
SYSTEM
"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
"oasis-200401-wss-wssecurity-utility-1.0.xsd"
SYSTEM "http://www.w3.org/2001/xml.xsd"; "xml.xsd"
SYSTEM "http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd";
"xmldsig-core-schema.xsd"
-
+PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "XMLSchema.dtd"
Added: incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/datatypes.dtd
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/datatypes.dtd?view=auto&rev=467713
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/datatypes.dtd
(added)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/datatypes.dtd
Wed Oct 25 10:09:30 2006
@@ -0,0 +1,203 @@
+<!--
+ DTD for XML Schemas: Part 2: Datatypes
+ $Id: datatypes.dtd,v 1.23 2001/03/16 17:36:30 ht Exp $
+ Note this DTD is NOT normative, or even definitive. - - the
+ prose copy in the datatypes REC is the definitive version
+ (which shouldn't differ from this one except for this comment
+ and entity expansions, but just in case)
+ -->
+
+<!--
+ This DTD cannot be used on its own, it is intended
+ only for incorporation in XMLSchema.dtd, q.v.
+ -->
+
+<!-- Define all the element names, with optional prefix -->
+<!ENTITY % simpleType "%p;simpleType">
+<!ENTITY % restriction "%p;restriction">
+<!ENTITY % list "%p;list">
+<!ENTITY % union "%p;union">
+<!ENTITY % maxExclusive "%p;maxExclusive">
+<!ENTITY % minExclusive "%p;minExclusive">
+<!ENTITY % maxInclusive "%p;maxInclusive">
+<!ENTITY % minInclusive "%p;minInclusive">
+<!ENTITY % totalDigits "%p;totalDigits">
+<!ENTITY % fractionDigits "%p;fractionDigits">
+<!ENTITY % length "%p;length">
+<!ENTITY % minLength "%p;minLength">
+<!ENTITY % maxLength "%p;maxLength">
+<!ENTITY % enumeration "%p;enumeration">
+<!ENTITY % whiteSpace "%p;whiteSpace">
+<!ENTITY % pattern "%p;pattern">
+
+<!--
+ Customisation entities for the ATTLIST of each element
+ type. Define one of these if your schema takes advantage
+ of the anyAttribute='##other' in the schema for schemas
+ -->
+
+<!ENTITY % simpleTypeAttrs "">
+<!ENTITY % restrictionAttrs "">
+<!ENTITY % listAttrs "">
+<!ENTITY % unionAttrs "">
+<!ENTITY % maxExclusiveAttrs "">
+<!ENTITY % minExclusiveAttrs "">
+<!ENTITY % maxInclusiveAttrs "">
+<!ENTITY % minInclusiveAttrs "">
+<!ENTITY % totalDigitsAttrs "">
+<!ENTITY % fractionDigitsAttrs "">
+<!ENTITY % lengthAttrs "">
+<!ENTITY % minLengthAttrs "">
+<!ENTITY % maxLengthAttrs "">
+<!ENTITY % enumerationAttrs "">
+<!ENTITY % whiteSpaceAttrs "">
+<!ENTITY % patternAttrs "">
+
+<!-- Define some entities for informative use as attribute
+ types -->
+<!ENTITY % URIref "CDATA">
+<!ENTITY % XPathExpr "CDATA">
+<!ENTITY % QName "NMTOKEN">
+<!ENTITY % QNames "NMTOKENS">
+<!ENTITY % NCName "NMTOKEN">
+<!ENTITY % nonNegativeInteger "NMTOKEN">
+<!ENTITY % boolean "(true|false)">
+<!ENTITY % simpleDerivationSet "CDATA">
+<!--
+ #all or space-separated list drawn from derivationChoice
+ -->
+
+<!--
+ Note that the use of 'facet' below is less restrictive
+ than is really intended: There should in fact be no
+ more than one of each of minInclusive, minExclusive,
+ maxInclusive, maxExclusive, totalDigits, fractionDigits,
+ length, maxLength, minLength within datatype,
+ and the min- and max- variants of Inclusive and Exclusive
+ are mutually exclusive. On the other hand, pattern and
+ enumeration may repeat.
+ -->
+<!ENTITY % minBound "(%minInclusive; | %minExclusive;)">
+<!ENTITY % maxBound "(%maxInclusive; | %maxExclusive;)">
+<!ENTITY % bounds "%minBound; | %maxBound;">
+<!ENTITY % numeric "%totalDigits; | %fractionDigits;">
+<!ENTITY % ordered "%bounds; | %numeric;">
+<!ENTITY % unordered
+ "%pattern; | %enumeration; | %whiteSpace; | %length; |
+ %maxLength; | %minLength;">
+<!ENTITY % facet "%ordered; | %unordered;">
+<!ENTITY % facetAttr
+ "value CDATA #REQUIRED
+ id ID #IMPLIED">
+<!ENTITY % fixedAttr "fixed %boolean; #IMPLIED">
+<!ENTITY % facetModel "(%annotation;)?">
+<!ELEMENT %simpleType;
+ ((%annotation;)?, (%restriction; | %list; | %union;))>
+<!ATTLIST %simpleType;
+ name %NCName; #IMPLIED
+ final %simpleDerivationSet; #IMPLIED
+ id ID #IMPLIED
+ %simpleTypeAttrs;>
+<!-- name is required at top level -->
+<!ELEMENT %restriction; ((%annotation;)?,
+ (%restriction1; |
+ ((%simpleType;)?,(%facet;)*)),
+ (%attrDecls;))>
+<!ATTLIST %restriction;
+ base %QName; #IMPLIED
+ id ID #IMPLIED
+ %restrictionAttrs;>
+<!--
+ base and simpleType child are mutually exclusive,
+ one is required.
+
+ restriction is shared between simpleType and
+ simpleContent and complexContent (in XMLSchema.xsd).
+ restriction1 is for the latter cases, when this
+ is restricting a complex type, as is attrDecls.
+ -->
+<!ELEMENT %list; ((%annotation;)?,(%simpleType;)?)>
+<!ATTLIST %list;
+ itemType %QName; #IMPLIED
+ id ID #IMPLIED
+ %listAttrs;>
+<!--
+ itemType and simpleType child are mutually exclusive,
+ one is required
+ -->
+<!ELEMENT %union; ((%annotation;)?,(%simpleType;)*)>
+<!ATTLIST %union;
+ id ID #IMPLIED
+ memberTypes %QNames; #IMPLIED
+ %unionAttrs;>
+<!--
+ At least one item in memberTypes or one simpleType
+ child is required
+ -->
+
+<!ELEMENT %maxExclusive; %facetModel;>
+<!ATTLIST %maxExclusive;
+ %facetAttr;
+ %fixedAttr;
+ %maxExclusiveAttrs;>
+<!ELEMENT %minExclusive; %facetModel;>
+<!ATTLIST %minExclusive;
+ %facetAttr;
+ %fixedAttr;
+ %minExclusiveAttrs;>
+
+<!ELEMENT %maxInclusive; %facetModel;>
+<!ATTLIST %maxInclusive;
+ %facetAttr;
+ %fixedAttr;
+ %maxInclusiveAttrs;>
+<!ELEMENT %minInclusive; %facetModel;>
+<!ATTLIST %minInclusive;
+ %facetAttr;
+ %fixedAttr;
+ %minInclusiveAttrs;>
+
+<!ELEMENT %totalDigits; %facetModel;>
+<!ATTLIST %totalDigits;
+ %facetAttr;
+ %fixedAttr;
+ %totalDigitsAttrs;>
+<!ELEMENT %fractionDigits; %facetModel;>
+<!ATTLIST %fractionDigits;
+ %facetAttr;
+ %fixedAttr;
+ %fractionDigitsAttrs;>
+
+<!ELEMENT %length; %facetModel;>
+<!ATTLIST %length;
+ %facetAttr;
+ %fixedAttr;
+ %lengthAttrs;>
+<!ELEMENT %minLength; %facetModel;>
+<!ATTLIST %minLength;
+ %facetAttr;
+ %fixedAttr;
+ %minLengthAttrs;>
+<!ELEMENT %maxLength; %facetModel;>
+<!ATTLIST %maxLength;
+ %facetAttr;
+ %fixedAttr;
+ %maxLengthAttrs;>
+
+<!-- This one can be repeated -->
+<!ELEMENT %enumeration; %facetModel;>
+<!ATTLIST %enumeration;
+ %facetAttr;
+ %enumerationAttrs;>
+
+<!ELEMENT %whiteSpace; %facetModel;>
+<!ATTLIST %whiteSpace;
+ %facetAttr;
+ %fixedAttr;
+ %whiteSpaceAttrs;>
+
+<!-- This one can be repeated -->
+<!ELEMENT %pattern; %facetModel;>
+<!ATTLIST %pattern;
+ %facetAttr;
+ %patternAttrs;>
Modified: incubator/cxf/trunk/rt/ws/rm/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/pom.xml?view=diff&rev=467713&r1=467712&r2=467713
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/rm/pom.xml Wed Oct 25 10:09:30 2006
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-simple</artifactId>
+ <artifactId>cxf-rt-bindings-soap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -69,6 +69,11 @@
<artifactId>cxf-common-utilities</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-simple</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
@@ -80,26 +85,26 @@
<artifactId>easymockclassextension</artifactId>
<scope>test</scope>
</dependency>
-
- <!--
-
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-soap</artifactId>
+ <artifactId>cxf-rt-transports-http</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- -->
+
+
</dependencies>
<build>
@@ -118,7 +123,7 @@
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/wsdl/wsrm.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/wsrm.xjb</bindingFile>
- <catalog>catalog.cat</catalog>
+
<catalog>${basedir}/src/main/resources/schemas/wsdl/catalog.cat</catalog>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/ws/addressing</deleteDir>
</deleteDirs>
Modified:
incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMConstants.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMConstants.java?view=diff&rev=467713&r1=467712&r2=467713
==============================================================================
---
incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMConstants.java
(original)
+++
incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMConstants.java
Wed Oct 25 10:09:30 2006
@@ -74,6 +74,15 @@
* The set of headers understood by the protocol binding.
*/
private static final Set<QName> HEADERS;
+
+ private static final QName WSRM_CREATE_SEQUENCE_QNAME =
+ new QName(WSRM_NAMESPACE_NAME, "CreateSequence");
+
+ private static final QName WSRM_CREATE_SEQUENCE_RESPONSE_QNAME =
+ new QName(WSRM_NAMESPACE_NAME, "CreateSequenceResponse");
+
+ private static final QName WSRM_TERMINATE_SEQUENCE_QNAME =
+ new QName(WSRM_NAMESPACE_NAME, "TerminateSequence");
private static final String WSRM_CREATE_SEQUENCE_ACTION =
WSRM_NAMESPACE_NAME + "/CreateSequence";
@@ -124,6 +133,18 @@
public static Set<QName> getHeaders() {
return HEADERS;
+ }
+
+ public static QName getCreateSequenceOperationName() {
+ return WSRM_CREATE_SEQUENCE_QNAME;
+ }
+
+ public static QName getCreateSequenceResponseOperationName() {
+ return WSRM_CREATE_SEQUENCE_RESPONSE_QNAME;
+ }
+
+ public static QName getTerminateSequenceOperationName() {
+ return WSRM_TERMINATE_SEQUENCE_QNAME;
}
public static String getCreateSequenceAction() {
Modified:
incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/impl/Proxy.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/impl/Proxy.java?view=diff&rev=467713&r1=467712&r2=467713
==============================================================================
---
incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/impl/Proxy.java
(original)
+++
incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/impl/Proxy.java
Wed Oct 25 10:09:30 2006
@@ -24,37 +24,47 @@
import java.util.logging.Logger;
import javax.xml.bind.JAXBException;
+import javax.xml.namespace.QName;
-import org.apache.cxf.Bus;
+import org.apache.cxf.databinding.DataBinding;
import org.apache.cxf.jaxb.JAXBDataBinding;
import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
+import org.apache.cxf.service.ServiceImpl;
+import org.apache.cxf.service.factory.ServiceConstructionException;
+import org.apache.cxf.service.model.BindingInfo;
+import org.apache.cxf.service.model.InterfaceInfo;
+import org.apache.cxf.service.model.MessageInfo;
+import org.apache.cxf.service.model.OperationInfo;
+import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.ws.addressing.RelatesToType;
import org.apache.cxf.ws.addressing.v200408.EndpointReferenceType;
import org.apache.cxf.ws.rm.DestinationSequence;
+import org.apache.cxf.ws.rm.RMConstants;
-
/**
*
*/
public class Proxy {
+ static final QName SERVICE_NAME =
+ new QName(RMConstants.WSRM_NAMESPACE_NAME, "SequenceAbstractService");
+ static final QName INTERFACE_NAME =
+ new QName(RMConstants.WSRM_NAMESPACE_NAME,
"SequenceAbstractPortType");
+
private static final Logger LOG = Logger.getLogger(Proxy.class.getName());
private RMEndpoint reliableEndpoint;
private Service service;
-
- Proxy(Bus bus, RMEndpoint rme) {
+
+ Proxy(RMEndpoint rme) {
reliableEndpoint = rme;
- if (null != bus) {
- buildService(bus);
- }
+ buildService();
}
-
+
RMEndpoint getReliableEndpoint() {
return reliableEndpoint;
}
-
+
Source getSource() {
return reliableEndpoint.getSource();
}
@@ -62,27 +72,71 @@
Service getService() {
return service;
}
-
+
void acknowledge(DestinationSequence ds) throws IOException {
-
+
}
-
- void createSequence(org.apache.cxf.ws.addressing.EndpointReferenceType to,
- EndpointReferenceType acksTo,
+
+ void createSequence(org.apache.cxf.ws.addressing.EndpointReferenceType to,
EndpointReferenceType acksTo,
RelatesToType relatesTo) throws IOException {
- service.getServiceInfo();
+ OperationInfo oi = service.getServiceInfo().getInterface()
+ .getOperation(RMConstants.getCreateSequenceOperationName());
+ invokeOneway(oi, null);
}
- final void buildService(Bus bus) {
- ReflectionServiceFactoryBean serviceFactory = new
ReflectionServiceFactoryBean();
+ final void buildService() {
+ ServiceInfo si = new ServiceInfo();
+ si.setName(SERVICE_NAME);
+ buildInterfaceInfo(si);
+ buildBindingInfo(si);
+ service = new ServiceImpl(si);
+ DataBinding dataBinding = null;
try {
- serviceFactory.setDataBinding(new
JAXBDataBinding(SequenceService.class));
- } catch (JAXBException ex) {
- LOG.log(Level.SEVERE, "Failed to build service.", ex);
+ dataBinding = new JAXBDataBinding(SequenceService.class);
+ } catch (JAXBException e) {
+ throw new ServiceConstructionException(e);
}
- serviceFactory.setBus(bus);
- serviceFactory.setServiceClass(SequenceService.class);
- // that's the default: serviceFactory.setWrapped(true);
- service = serviceFactory.create();
+
+ service.setDataBinding(dataBinding);
+ }
+
+ final void buildInterfaceInfo(ServiceInfo si) {
+ InterfaceInfo ii = new InterfaceInfo(si, INTERFACE_NAME);
+ buildOperationInfo(ii);
+ }
+
+ final void buildOperationInfo(InterfaceInfo ii) {
+ OperationInfo oi = null;
+ MessageInfo mi = null;
+
+ oi = ii.addOperation(RMConstants.getCreateSequenceOperationName());
+ mi = oi.createMessage(RMConstants.getCreateSequenceOperationName());
+ oi.setInput(mi.getName().getLocalPart(), mi);
+
+ oi =
ii.addOperation(RMConstants.getCreateSequenceResponseOperationName());
+ mi =
oi.createMessage(RMConstants.getCreateSequenceResponseOperationName());
+ oi.setInput(mi.getName().getLocalPart(), mi);
+
+ oi = ii.addOperation(RMConstants.getTerminateSequenceOperationName());
+ mi = oi.createMessage(RMConstants.getTerminateSequenceOperationName());
+ oi.setInput(mi.getName().getLocalPart(), mi);
+ }
+
+ final void buildBindingInfo(ServiceInfo si) {
+ // use same binding id as for application endpoint
+ if (null != reliableEndpoint) {
+ String bindingId =
reliableEndpoint.getEndpoint().getEndpointInfo().getBinding().getBindingId();
+ BindingInfo bi = new BindingInfo(si, bindingId);
+ bi.buildOperation(RMConstants.getCreateSequenceOperationName(),
"create", null);
+
bi.buildOperation(RMConstants.getCreateSequenceResponseOperationName(),
"createResponse", null);
+ bi.buildOperation(RMConstants.getTerminateSequenceOperationName(),
"terminate", null);
+ si.addBinding(bi);
+ }
+ }
+
+ void invokeOneway(OperationInfo oi, Object[] params) {
+ LOG
+ .log(Level.INFO, "Invoking out-of-band RM protocol message {0}.",
oi == null ? null : oi
+ .getName());
}
}
Modified:
incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/impl/RMEndpoint.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/impl/RMEndpoint.java?view=diff&rev=467713&r1=467712&r2=467713
==============================================================================
---
incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/impl/RMEndpoint.java
(original)
+++
incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/impl/RMEndpoint.java
Wed Oct 25 10:09:30 2006
@@ -36,7 +36,9 @@
endpoint = e;
source = new Source(this);
destination = new Destination(this);
- proxy = new Proxy(interceptor.getBus(), this);
+ if (null != endpoint) {
+ proxy = new Proxy(this);
+ }
}
public QName getName() {
Modified:
incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/impl/RMInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/impl/RMInterceptor.java?view=diff&rev=467713&r1=467712&r2=467713
==============================================================================
---
incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/impl/RMInterceptor.java
(original)
+++
incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/impl/RMInterceptor.java
Wed Oct 25 10:09:30 2006
@@ -176,14 +176,11 @@
}
boolean isApplicationMessage = isAplicationMessage(action);
- System.out.println("isApplicationMessage: " + isApplicationMessage);
RMProperties rmpsOut =
(RMProperties)RMContextUtils.retrieveRMProperties(message, true);
if (null == rmpsOut) {
rmpsOut = new RMProperties();
RMContextUtils.storeRMProperties(message, rmpsOut, true);
- } else {
- System.out.println("Got existing RMPropertiesImpl");
}
RMProperties rmpsIn = null;
Modified:
incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/catalog.cat
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/catalog.cat?view=diff&rev=467713&r1=467712&r2=467713
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/catalog.cat
(original)
+++ incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/catalog.cat
Wed Oct 25 10:09:30 2006
@@ -19,5 +19,5 @@
--
-SYSTEM "http://schemas.xmlsoap.org/ws/2004/08/addressing"; "addressing.xsd"
+SYSTEM "http://schemas.xmlsoap.org/ws/2004/08/addressing";
"../../../../../../../../common/metacode/src/main/resources/schemas/wsdl/addressing.xsd"
Modified:
incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/impl/ProxyTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/impl/ProxyTest.java?view=diff&rev=467713&r1=467712&r2=467713
==============================================================================
---
incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/impl/ProxyTest.java
(original)
+++
incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/impl/ProxyTest.java
Wed Oct 25 10:09:30 2006
@@ -20,29 +20,20 @@
package org.apache.cxf.ws.rm.impl;
-import java.util.List;
import javax.xml.namespace.QName;
import junit.framework.TestCase;
-import org.apache.cxf.Bus;
-import org.apache.cxf.bus.cxf.CXFBusFactory;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.InterfaceInfo;
-import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
-
public class ProxyTest extends TestCase {
public void testConstruction() {
- Bus bus = new CXFBusFactory().createBus();
- IMocksControl control = EasyMock.createNiceControl();
- RMEndpoint rme = control.createMock(RMEndpoint.class);
- Proxy proxy = new Proxy(bus, rme);
+
+ Proxy proxy = new Proxy(null);
Service service = proxy.getService();
ServiceInfo si = service.getServiceInfo();
assertNotNull("service info is null", si);
@@ -52,10 +43,7 @@
assertEquals(3, intf.getOperations().size());
String ns = si.getName().getNamespaceURI();
- OperationInfo opi = intf.getOperation(new QName(ns, "createSequence"));
- assertEquals("createSequence",
opi.getInput().getName().getLocalPart());
-
- List<MessagePartInfo> messageParts = opi.getInput().getMessageParts();
- assertEquals(1, messageParts.size());
+ OperationInfo oi = intf.getOperation(new QName(ns, "CreateSequence"));
+ assertNotNull("No operation info.", oi);
}
}
Modified:
incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/impl/RMInterceptorTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/impl/RMInterceptorTest.java?view=diff&rev=467713&r1=467712&r2=467713
==============================================================================
---
incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/impl/RMInterceptorTest.java
(original)
+++
incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/impl/RMInterceptorTest.java
Wed Oct 25 10:09:30 2006
@@ -136,11 +136,11 @@
EasyMock.expect(message.get(Message.REQUESTOR_ROLE)).andReturn(Boolean.TRUE).times(2);
Exchange exchange = control.createMock(Exchange.class);
EasyMock.expect(message.getExchange()).andReturn(exchange).times(2);
- Endpoint endpoint = control.createMock(Endpoint.class);
-
EasyMock.expect(exchange.get(Endpoint.class)).andReturn(endpoint).times(2);
+ // Endpoint endpoint = control.createMock(Endpoint.class);
+ EasyMock.expect(exchange.get(Endpoint.class)).andReturn(null).times(2);
control.replay();
RMEndpoint reliableEndpoint = rmi.getReliableEndpoint(message);
- assertSame(endpoint, reliableEndpoint.getEndpoint());
+ // assertSame(endpoint, reliableEndpoint.getEndpoint());
RMEndpoint rme = rmi.getReliableEndpoint(message);
assertSame(reliableEndpoint, rme);
control.verify();
