cxf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Glen Mazza <glen.ma...@verizon.net>
Subject Re: svn commit: r583674 - in /incubator/cxf/trunk/tools/wsdlto: frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/ frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/ frontend/jaxws/src/test/j...
Date Fri, 12 Oct 2007 01:35:49 GMT
Am Donnerstag, den 11.10.2007, 04:20 +0000 schrieb ema@apache.org:
> Author: ema
> Date: Wed Oct 10 21:20:48 2007
> New Revision: 583674
> 
> Modified:
> incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
> URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java?rev=583674&r1=583673&r2=583674&view=diff
> ==============================================================================
> --- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
(original)
> +++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
Wed Oct 10 21:20:48 2007
> @@ -18,11 +18,15 @@
>   */
>  package org.apache.cxf.tools.wsdlto.frontend.jaxws.customization;
>  
>  
>      private void copyBindingsToWsdl(Node node, Node bindings, MapNamespaceContext ctx)
{
> @@ -345,50 +358,71 @@
>  
>          } else if (isValidJaxbBindingFile(reader)) {
> -            jaxbBindings.add(is);
> +            String schemaLocation = root.getAttribute("schemaLocation");
> +            if (StringUtils.isEmpty(schemaLocation)) {
> +                root.setAttribute("schemaLocation", wsdlURL);
> +                try {
> +                    File tmpFile = FileUtils.createTempFile("jaxbbinding", ".xml");
> +                    XMLUtils.writeTo(root, new FileOutputStream(tmpFile));
> +                    InputSource newis = new InputSource(URIParserUtil.getAbsoluteURI(tmpFile
> +                        .getAbsolutePath()));
> +                    jaxbBindings.add(newis);
> +                    tmpFile.deleteOnExit();
> +                } catch (Exception e) {
> +                    Message msg = new Message("FAILED_TO_ADD_SCHEMALOACTION", LOG, bindingFile);


..._SCHEMALOCATION



> Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/Messages.properties
> URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/Messages.properties?rev=583674&r1=583673&r2=583674&view=diff
> ==============================================================================
> --- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/Messages.properties
(original)
> +++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/Messages.properties
Wed Oct 10 21:20:48 2007
> @@ -20,10 +20,11 @@
>  #
>  STAX_PARSER_ERROR = StAX parser error, check your external binding file(s)
>  UNKNOWN_BINDING_FILE= Unknown external binding files : {0}
> -NOT_POINTTO_URL = External binding file: {0} does not point to the specified wsdl: {2},
resolved as {1}
> +CAN_NOT_FIND_BINDING_WSDL = Can not read the specified wsdl {0} that external binding
file {1} points


...that external binding file {1} refers to    [or ...points to]


> Added:
> incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/CustomizedWSDLLocator.java
> URL:
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/CustomizedWSDLLocator.java?rev=583674&view=auto
> ==============================================================================
> ---
> incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/CustomizedWSDLLocator.java
(added)
> +++
> incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/CustomizedWSDLLocator.java


> +   
> +    private Map<String, Element> elementMap;
> +    private String lastestImportURI;


latestImportURI


> +    private boolean resolveFormMap;


resolveFromMap


> +            
> +        } catch (URISyntaxException e) {
> +            throw new RuntimeException("Resolve " + importLocation +
> "Failed: ", e);        


"Failed to resolve " + importLocation + ": "


> Added: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1094/hello_world.wsdl
> URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1094/hello_world.wsdl?rev=583674&view=auto
> ==============================================================================


It seems like we are creating too many WSDLs, and many of them appear to
be just copies of others.  It would be nice if they could be reused.

Regards,
Glen



Mime
View raw message