axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdani...@apache.org
Subject cvs commit: ws-axis/java/tools/org/apache/axis/tools/ant/wsdl Wsdl2javaAntTask.java
Date Wed, 13 Apr 2005 16:22:53 GMT
gdaniels    2005/04/13 09:22:53

  Modified:    java/src/org/apache/axis/i18n resource.properties
               java/src/org/apache/axis/wsdl WSDL2Java.java
               java/src/org/apache/axis/wsdl/gen Parser.java
               java/src/org/apache/axis/wsdl/symbolTable SymbolTable.java
               java/src/org/apache/axis/wsdl/toJava Emitter.java
               java/test/wsdl/clash build.xml
               java/test/wsdl/interop4/groupH/simpleDocLit build.xml
               java/test/wsdl/marshall2 build.xml
               java/test/wsdl/qnameser build.xml
               java/test/wsdl/roundtrip build.xml
               java/tools/org/apache/axis/tools/ant/wsdl
                        Wsdl2javaAntTask.java
  Log:
  unwrapArrays -> wrapArrays.  Makes much more sense. :)
  
  Default is now OFF (don't wrap arrays with beans)
  
  Revision  Changes    Path
  1.116     +1 -1      ws-axis/java/src/org/apache/axis/i18n/resource.properties
  
  Index: resource.properties
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/i18n/resource.properties,v
  retrieving revision 1.115
  retrieving revision 1.116
  diff -u -r1.115 -r1.116
  --- resource.properties	12 Apr 2005 22:18:15 -0000	1.115
  +++ resource.properties	13 Apr 2005 16:22:52 -0000	1.116
  @@ -1071,7 +1071,7 @@
   cannotCreateTextNode00=Exception creating text node
   cannotFindObjectForClass00=No object was found for class type {0}
   NullDelegate=Null delegate passed to TypeMappingDelegate constructor
  -optionUnwrapArrays=Prefers building arrays to beans for wrapped XML array types (defaults
to on).
  +optionWrapArrays=Prefers building beans to straight arrays for wrapped XML array types
(defaults to off).
   
   #                                                                    #
   # In-use keys                                                        #
  
  
  
  1.57      +7 -7      ws-axis/java/src/org/apache/axis/wsdl/WSDL2Java.java
  
  Index: WSDL2Java.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/WSDL2Java.java,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- WSDL2Java.java	12 Apr 2005 22:18:15 -0000	1.56
  +++ WSDL2Java.java	13 Apr 2005 16:22:52 -0000	1.57
  @@ -93,8 +93,8 @@
       /** Field ALLOW_INVALID_URL_OPT */
       protected static final int ALLOW_INVALID_URL_OPT = 'u';
       
  -    /** */
  -    protected static final int UNWRAP_ARRAYS_OPT = 'w';
  +    /** Wrap arrays option */
  +    protected static final int WRAP_ARRAYS_OPT = 'w';
   
       /** Field emitter */
       private Emitter emitter;
  @@ -182,10 +182,10 @@
   						Messages.getMessage("implementationClassName")),
                   new CLOptionDescriptor("allowInvalidURL", CLOptionDescriptor.ARGUMENT_DISALLOWED,
                           ALLOW_INVALID_URL_OPT, Messages.getMessage("optionAllowInvalidURL")),
  -                new CLOptionDescriptor("unwrapArrays",
  +                new CLOptionDescriptor("wrapArrays",
                                          CLOptionDescriptor.ARGUMENT_OPTIONAL,
  -                                       UNWRAP_ARRAYS_OPT,
  -                                       Messages.getMessage("optionUnwrapArrays")),
  +                                       WRAP_ARRAYS_OPT,
  +                                       Messages.getMessage("optionWrapArrays")),
                   };
   
       /**
  @@ -330,8 +330,8 @@
                   emitter.setAllowInvalidURL(true);
                   break;
   
  -            case UNWRAP_ARRAYS_OPT:
  -                emitter.setUnwrapArrays(false);
  +            case WRAP_ARRAYS_OPT:
  +                emitter.setWrapArrays(true);
                   break;
   
               default :
  
  
  
  1.24      +3 -3      ws-axis/java/src/org/apache/axis/wsdl/gen/Parser.java
  
  Index: Parser.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/gen/Parser.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Parser.java	12 Apr 2005 22:18:16 -0000	1.23
  +++ Parser.java	13 Apr 2005 16:22:52 -0000	1.24
  @@ -66,8 +66,8 @@
       /** Field password */
       protected String password = null;
   
  -    /** If this is true, we'll prefer "String[]" to "ArrayOfString" for literal wrapped
arrays */
  -    protected boolean unwrapArrays = true;
  +    /** If this is false, we'll prefer "String[]" to "ArrayOfString" for literal wrapped
arrays */
  +    protected boolean wrapArrays = false;
   
       // Timeout, in milliseconds, to let the Emitter do its work
   
  @@ -296,7 +296,7 @@
           symbolTable = new SymbolTable(genFactory.getBaseTypeMapping(), imports,
                   verbose, nowrap);
           symbolTable.setQuiet(quiet);
  -        symbolTable.setUnwrapArrays(unwrapArrays);
  +        symbolTable.setWrapArrays(wrapArrays);
   
           // We run the actual Emitter in a thread that we can kill
           WSDLRunnable runnable = new WSDLRunnable(symbolTable, wsdlURI);
  
  
  
  1.119     +5 -9      ws-axis/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java
  
  Index: SymbolTable.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java,v
  retrieving revision 1.118
  retrieving revision 1.119
  diff -u -r1.118 -r1.119
  --- SymbolTable.java	12 Apr 2005 22:18:16 -0000	1.118
  +++ SymbolTable.java	13 Apr 2005 16:22:52 -0000	1.119
  @@ -167,11 +167,11 @@
       /** Field wsdlURI */
       private String wsdlURI = null;
   
  -    /** If this is true, we will "unwrap" literal arrays, generating a plan "String[]"
instead
  +    /** If this is false, we will "unwrap" literal arrays, generating a plan "String[]"
instead
        * of "ArrayOfString" when encountering an element containing a single maxOccurs="unbounded"
        * inner element.
        */
  -    private boolean unwrapArrays;
  +    private boolean wrapArrays;
   
       Set arrayTypeQNames = new HashSet();
   
  @@ -1175,7 +1175,7 @@
   
                   // If we're supposed to unwrap arrays, supply someplace to put the "inner"
QName
                   // so we can propagate it into the appropriate metadata container.
  -                QNameHolder itemQName = unwrapArrays ? new QNameHolder() : null;
  +                QNameHolder itemQName = wrapArrays ? null : new QNameHolder();
   
                   numDims.value = 0;
   
  @@ -3777,11 +3777,7 @@
           return messageEntries;
       }
   
  -    public boolean shouldUnwrapArrays() {
  -        return unwrapArrays;
  -    }
  -
  -    public void setUnwrapArrays(boolean unwrapArrays) {
  -        this.unwrapArrays = unwrapArrays;
  +    public void setWrapArrays(boolean wrapArrays) {
  +        this.wrapArrays = wrapArrays;
       }
   }    // class SymbolTable
  
  
  
  1.87      +2 -2      ws-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java
  
  Index: Emitter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java,v
  retrieving revision 1.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- Emitter.java	12 Apr 2005 22:18:16 -0000	1.86
  +++ Emitter.java	13 Apr 2005 16:22:53 -0000	1.87
  @@ -1079,7 +1079,7 @@
           return true;
       }
   
  -    public void setUnwrapArrays(boolean unwrapArrays) {
  -        this.unwrapArrays = unwrapArrays;
  +    public void setWrapArrays(boolean wrapArrays) {
  +        this.wrapArrays = wrapArrays;
       }
   }
  
  
  
  1.15      +1 -1      ws-axis/java/test/wsdl/clash/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/test/wsdl/clash/build.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- build.xml	12 Apr 2005 22:18:17 -0000	1.14
  +++ build.xml	13 Apr 2005 16:22:53 -0000	1.15
  @@ -63,7 +63,7 @@
   
       <wsdl2java url="${axis.home}/test/wsdl/clash/duplicate-element.wsdl"
                  output="${axis.home}/build/work"
  -               unwrapArrays="no">
  +               wrapArrays="yes">
       </wsdl2java>
   
       <copy todir="${build.dir}/work/test/wsdl/clash" overwrite="yes">
  
  
  
  1.7       +1 -1      ws-axis/java/test/wsdl/interop4/groupH/simpleDocLit/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/test/wsdl/interop4/groupH/simpleDocLit/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	12 Apr 2005 22:18:17 -0000	1.6
  +++ build.xml	13 Apr 2005 16:22:53 -0000	1.7
  @@ -54,7 +54,7 @@
           <!-- generate skeletons -->
           <wsdl2java url="${axis.home}/test/wsdl/interop4/groupH/simpleDocLit/simple-doc-literal.wsdl"
               output="${root.dir}/build/work" skeletonDeploy="no"
  -            serverSide="yes" unwrapArrays="no">
  +            serverSide="yes" wrapArrays="yes">
               <mapping namespace="http://soapinterop.org/wsdl" package="test.wsdl.interop4.groupH.simpleDocLit"/>
               <mapping namespace="http://soapinterop.org/types" package="test.wsdl.interop4.groupH.simpleDocLit"/>
               <mapping namespace="http://soapinterop.org/types/part" package="test.wsdl.interop4.groupH.simpleDocLit"/>
  
  
  
  1.3       +1 -1      ws-axis/java/test/wsdl/marshall2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/test/wsdl/marshall2/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	12 Apr 2005 22:18:17 -0000	1.2
  +++ build.xml	13 Apr 2005 16:22:53 -0000	1.3
  @@ -59,7 +59,7 @@
                  serverSide="yes"
                  typeMappingVersion="1.3"
                  testcase="yes"
  -               unwrapArrays="no">
  +               wrapArrays="yes">
       </wsdl2java>
   
       <copy todir="${build.dir}/work/test/wsdl/marshall2" overwrite="yes">
  
  
  
  1.3       +1 -1      ws-axis/java/test/wsdl/qnameser/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/test/wsdl/qnameser/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	12 Apr 2005 22:18:17 -0000	1.2
  +++ build.xml	13 Apr 2005 16:22:53 -0000	1.3
  @@ -59,7 +59,7 @@
                  skeletonDeploy="yes"
                  noWrapped="true"
                  testcase="no"
  -               unwrapArrays="no">
  +               wrapArrays="yes">
           <mapping namespace="http://tempuri.org/" package="test.wsdl.qnameser"/>
       </wsdl2java>
   
  
  
  
  1.12      +1 -1      ws-axis/java/test/wsdl/roundtrip/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/test/wsdl/roundtrip/build.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- build.xml	12 Apr 2005 22:18:17 -0000	1.11
  +++ build.xml	13 Apr 2005 16:22:53 -0000	1.12
  @@ -131,7 +131,7 @@
                  noimports="no"
                  verbose="no"
                  testcase="no"
  -               unwrapArrays="no">
  +               wrapArrays="yes">
           <mapping namespace="http://roundtrip.wsdl.test" package="test.wsdl.roundtrip"/>
       </wsdl2java>
   
  
  
  
  1.30      +6 -6      ws-axis/java/tools/org/apache/axis/tools/ant/wsdl/Wsdl2javaAntTask.java
  
  Index: Wsdl2javaAntTask.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/tools/org/apache/axis/tools/ant/wsdl/Wsdl2javaAntTask.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- Wsdl2javaAntTask.java	12 Apr 2005 22:18:17 -0000	1.29
  +++ Wsdl2javaAntTask.java	13 Apr 2005 16:22:53 -0000	1.30
  @@ -118,7 +118,7 @@
        */
       private boolean failOnNetworkErrors = false;
   
  -    private boolean unwrapArrays = true;
  +    private boolean wrapArrays = false;
   
       public Wsdl2javaAntTask() {
       }
  @@ -245,7 +245,7 @@
               emitter.setTypeMappingVersion(typeMappingVersion);
               emitter.setNowrap(noWrapped);
               emitter.setAllowInvalidURL(allowInvalidURL);
  -            emitter.setUnwrapArrays(unwrapArrays);
  +            emitter.setWrapArrays(wrapArrays);
               if (namespaceMappingFile != null) {
                   emitter.setNStoPkg(namespaceMappingFile.toString());
               }
  @@ -560,14 +560,14 @@
   
   
       /**
  -     * Set the unwrap arrays flag - if false this will make new classes
  +     * Set the wrap arrays flag - if true this will make new classes
        * like "ArrayOfString" for literal "wrapped" arrays.  Otherwise it
        * will use "String []" and generate appropriate metadata.
        *
  -     * @param unwrapArrays
  +     * @param wrapArrays
        */
  -    public void setUnwrapArrays(boolean unwrapArrays) {
  -        this.unwrapArrays = unwrapArrays;
  +    public void setWrapArrays(boolean wrapArrays) {
  +        this.wrapArrays = wrapArrays;
       }
   
       /**
  
  
  

Mime
View raw message