cxf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From TomasHofman <...@git.apache.org>
Subject [GitHub] cxf pull request: [CXF-6621] Schema imports are not handled correc...
Date Thu, 01 Oct 2015 14:16:02 GMT
GitHub user TomasHofman opened a pull request:

    https://github.com/apache/cxf/pull/93

    [CXF-6621] Schema imports are not handled correctly in generated WSDL

    ...and XSD files when using catalog rewrites
    
    Fixes these issues:
    
    - import of nested XSDs that lies in different directory tree from
      WSDL files
    
      example:
    
      ```
    jax-ws-catalog.xml contains:
      <rewriteSystem systemIdStartString="http://example.org/uri/"
    rewritePrefix="/xsd/"/>
    
    WSDL structure:
      /wsdl/service.wsdl - imports "http://example.org/uri/schema.xsd"
      /xsd/schema.xsd
      ```
    
    - import and access of nested XSDs with equal relative paths when XSDs
      are outside of WSDL directory (previously this was working only when
      XSDs were inside WSDL directory)
    
      example:
    
      ```
    jax-ws-catalog.xml contains:
      <rewriteSystem systemIdStartString="http://example.org/uri/" rewritePrefix="/xsd/"/>
    
    WSDL structure:
      /wsdl/service.wsdl - imports "http://example.org/uri/schema.xsd"
      /xsd/schema.xsd - imports "d/included.xsd"
      /xsd/d/included.xsd - imports "d/included.xsd"
      /xsd/d/d/included.xsd
      ```
    
    - accessing nested XSD and WSDL under URIs affected by rewrite rules
      which aren't directly used by WSDLs/XSDs
    
      example:
    
      ```
    jax-ws-catalog.xml contains:
      <rewriteSystem systemIdStartString="http://example.org/uri/" rewritePrefix="/wsdl/"/>
    
    WSDL structure:
      /wsdl/service.wsdl - imports "./included.wsdl"
      /wsdl/included.wsdl
    
    request for: http://example.org/uri/included.wsdl
      ```
    
    - in some cases imports weren't working when catalog rule rewritePrefix
      was "/path" instead of "classpath:/path" - catalog resolves those two
      into different values

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/TomasHofman/cxf bz-1188204

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/cxf/pull/93.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #93
    
----
commit cfe0beb8d79f43431d3d29f40cf602d06ae56ebf
Author: Tomas Hofman <thofman@redhat.com>
Date:   2015-09-29T15:10:41Z

    [CXF-6621] Schema imports are not handled correctly in generated WSDL
    
    ...and XSD files when using catalog rewrites
    
    Fixes these issues:
    
    - import of nested XSDs that lies in different directory tree from
      WSDL files
    
      example:
    
      ```
    jax-ws-catalog.xml contains:
      <rewriteSystem systemIdStartString="http://example.org/uri/"
    rewritePrefix="/xsd/"/>
    
    WSDL structure:
      /wsdl/service.wsdl - imports "http://example.org/uri/schema.xsd"
      /xsd/schema.xsd
      ```
    
    - import and access of nested XSDs with equal relative paths when XSDs
      are outside of WSDL directory (previously this was working only when
      XSDs were inside WSDL directory)
    
      example:
    
      ```
    jax-ws-catalog.xml contains:
      <rewriteSystem systemIdStartString="http://example.org/uri/" rewritePrefix="/xsd/"/>
    
    WSDL structure:
      /wsdl/service.wsdl - imports "http://example.org/uri/schema.xsd"
      /xsd/schema.xsd - imports "d/included.xsd"
      /xsd/d/included.xsd - imports "d/included.xsd"
      /xsd/d/d/included.xsd
      ```
    
    - accessing nested XSD and WSDL under URIs affected by rewrite rules
      which aren't directly used by WSDLs/XSDs
    
      example:
    
      ```
    jax-ws-catalog.xml contains:
      <rewriteSystem systemIdStartString="http://example.org/uri/" rewritePrefix="/wsdl/"/>
    
    WSDL structure:
      /wsdl/service.wsdl - imports "./included.wsdl"
      /wsdl/included.wsdl
    
    request for: http://example.org/uri/included.wsdl
      ```
    
    - in some cases imports weren't working when catalog rule rewritePrefix
      was "/path" instead of "classpath:/path" - catalog resolves those two
      into different values

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message