axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bu...@apache.org
Subject cvs commit: xml-axis/java/test build_functional_tests.xml
Date Tue, 27 Nov 2001 18:32:09 GMT
butek       01/11/27 10:32:09

  Modified:    java/src/org/apache/axis/utils resources.properties
               java/src/org/apache/axis/wsdl JavaDeployWriter.java
                        JavaUndeployWriter.java JavaWriter.java
               java/test build_functional_tests.xml
  Log:
  Wsdl2java now generates (un)deploy.wsdd instead of (un)deploy.xml.  With this change,
  the functional tests had to look for these new wsdd files.
  
  Revision  Changes    Path
  1.15      +12 -0     xml-axis/java/src/org/apache/axis/utils/resources.properties
  
  Index: resources.properties
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/resources.properties,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- resources.properties	2001/11/16 14:23:30	1.14
  +++ resources.properties	2001/11/27 18:32:09	1.15
  @@ -538,3 +538,15 @@
   # NOTE:  in xml entries, do not translate "XML"
   xmlRecd00=XML received:
   xmlSent00=XML sent:
  +
  +# NOTE:  in the deployXX entries, do not translate "<!--" and "-->".  These are comment
indicators.  Adding or removing whitespace to make the comment indicators line up would be
nice.  Also, do not translate "axis" or mesages:  deploy03, deploy04, deploy07 deploy08. 
Those messages are included so that the spaces can be lined up by the translator.
  +deploy00=<!-- Use this file to deploy some handlers/chains and services   -->
  +deploy01=<!-- Use this file to undeploy some handlers/chains and services -->
  +deploy02=<!-- Two ways to do this:                                        -->
  +deploy03=<!--   java org.apache.axis.utils.Admin deploy.wsdd              -->
  +deploy04=<!--   java org.apache.axis.utils.Admin undeploy.wsdd            -->
  +deploy05=<!--      from the same directory that the Axis engine runs      -->
  +deploy06=<!-- or                                                          -->
  +deploy07=<!--   java org.apache.axis.client.AdminClient deploy.wsdd       -->
  +deploy08=<!--   java org.apache.axis.client.AdminClient undeploy.wsdd     -->
  +deploy09=<!--      after the axis server is running                       -->
  
  
  
  1.5       +20 -36    xml-axis/java/src/org/apache/axis/wsdl/JavaDeployWriter.java
  
  Index: JavaDeployWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaDeployWriter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JavaDeployWriter.java	2001/11/21 16:25:56	1.4
  +++ JavaDeployWriter.java	2001/11/27 18:32:09	1.5
  @@ -84,7 +84,7 @@
           super(emitter,
                   new QName(definition.getTargetNamespace(), "deploy"),
                   "",
  -                "xml",
  +                "wsdd",
                   JavaUtils.getMessage("genDeploy00"));
           this.definition = definition;
           this.symbolTable = symbolTable;
  @@ -104,7 +104,7 @@
           try {
               writeDeployServices();
               writeDeployTypes();
  -            pw.println("</m:deploy>");
  +            pw.println("</deployment>");
               pw.close();
           }
           catch (IOException e) {
  @@ -123,7 +123,7 @@
               Service myService = (Service) mapIterator.next();
   
               pw.println();
  -            pw.println("   <!-- " + JavaUtils.getMessage(
  +            pw.println("  <!-- " + JavaUtils.getMessage(
                       "wsdlService00", myService.getQName().getLocalPart())
                       + " -->");
               pw.println();
  @@ -141,35 +141,19 @@
       private void writeDeployTypes() throws IOException {
           Vector types = symbolTable.getTypes();
   
  -        if (types.size() == 0) return;
  -
           pw.println();
  -
  -        pw.print("   <beanMappings ");
  -        HashMap nsMap = new HashMap();
  -        int i = 1;
  -        String nsPrefix = null;
  -        for (int j = 0; j < types.size(); ++j) {
  -            Type type = (Type) types.elementAt(j);
  -            if (type.getBaseType() == null && type.getShouldEmit()) {
  -                if (!nsMap.containsKey(type.getQName().getNamespaceURI())) {
  -                  pw.println("");
  -                  nsPrefix = "ns" + i++;
  -                  nsMap.put(type.getQName().getNamespaceURI(), nsPrefix);
  -                  pw.print("     xmlns:" + nsPrefix  + "=\"" + type.getQName().getNamespaceURI()
+ "\"");
  -                }
  -            }
  -        }
  -        pw.println(">");
  -        for (int j = 0; j < types.size(); ++j) {
  -            Type type = (Type) types.elementAt(j);
  +        for (int i = 0; i < types.size(); ++i) {
  +            Type type = (Type) types.elementAt(i);
               if (type.getBaseType() == null && type.getShouldEmit()) {
  -                nsPrefix = (String)nsMap.get(type.getQName().getNamespaceURI());
  -                pw.println("     <" + nsPrefix + ":" + Utils.capitalizeFirstChar(type.getQName().getLocalPart())
  -                       + " classname=\"" + type.getJavaName() +"\"/>");
  +                pw.println("  <typeMapping");
  +                pw.println("    xmlns:ns=\"" + type.getQName().getNamespaceURI() + "\"");
  +                pw.println("    qname=\"ns:" + Utils.capitalizeFirstChar(type.getQName().getLocalPart())
+ '"');
  +                pw.println("    languageSpecificType=\"java:" + type.getJavaName() + '"');
  +                pw.println("    serializer=\"org.apache.axis.encoding.BeanSerializer\"");
  +                pw.println("    deserializer=\"org.apache.axis.encoding.BeanSerializer$BeanSerFactory\"");
  +                pw.println("  />");
               }
           }
  -        pw.println("   </beanMappings>");
       } //writeDeployTypes
   
       /**
  @@ -182,12 +166,12 @@
   
           boolean isRPC = (bEntry.getBindingStyle() == BindingEntry.STYLE_RPC);
   
  -        pw.println("   <service name=\"" + serviceName
  -                + "\" pivot=\"" + (isRPC ? "RPCDispatcher" : "MsgDispatcher") + "\">");
  +        pw.println("  <service name=\"" + serviceName
  +                + "\" provider=\"" + (isRPC ? "java:RPC" : "java:MSG") + "\">");
   
           writeDeployBinding(binding);
   
  -        pw.println("   </service>");
  +        pw.println("  </service>");
       } //writeDeployPort
   
       /**
  @@ -196,7 +180,7 @@
       private void writeDeployBinding(Binding binding) throws IOException {
           QName bindingQName = binding.getQName();
           String packageName = namespaces.getCreate(bindingQName.getNamespaceURI());
  -        pw.println("      <option name=\"className\" value=\""
  +        pw.println("      <parameter name=\"className\" value=\""
                            + packageName + "."
                            + bindingQName.getLocalPart() + "Skeleton" + "\"/>");
   
  @@ -207,16 +191,16 @@
               methodList = methodList + " " + op.getName();
           }
   
  -        pw.println("      <option name=\"methodName\" value=\"" + methodList + "\"/>");
  +        pw.println("      <parameter name=\"methodName\" value=\"" + methodList + "\"/>");
   
           if (emitter.getScope() == Emitter.APPLICATION_SCOPE) {
  -            pw.println("      <option name=\"scope\" value=\"Application\"/>");
  +            pw.println("      <parameter name=\"scope\" value=\"Application\"/>");
           }
           else if (emitter.getScope() == Emitter.REQUEST_SCOPE) {
  -            pw.println("      <option name=\"scope\" value=\"Request\"/>");
  +            pw.println("      <parameter name=\"scope\" value=\"Request\"/>");
           }
           else if (emitter.getScope() == Emitter.SESSION_SCOPE) {
  -            pw.println("      <option name=\"scope\" value=\"Session\"/>");
  +            pw.println("      <parameter name=\"scope\" value=\"Session\"/>");
           }
       } //writeDeployBinding
   
  
  
  
  1.4       +6 -6      xml-axis/java/src/org/apache/axis/wsdl/JavaUndeployWriter.java
  
  Index: JavaUndeployWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaUndeployWriter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JavaUndeployWriter.java	2001/11/21 16:25:56	1.3
  +++ JavaUndeployWriter.java	2001/11/27 18:32:09	1.4
  @@ -81,7 +81,7 @@
           super(emitter,
                   new QName(definition.getTargetNamespace(), "undeploy"),
                   "",
  -                "xml",
  +                "wsdd",
                   JavaUtils.getMessage("genUndeploy00"));
           this.definition = definition;
           this.symbolTable = symbolTable;
  @@ -100,7 +100,7 @@
       protected void writeFileBody() throws IOException {
           try {
               writeDeployServices();
  -            pw.println("</m:undeploy>");
  +            pw.println("</deployment>");
               pw.close();
           }
           catch (IOException e) {
  @@ -119,7 +119,7 @@
               Service myService = (Service) mapIterator.next();
   
               pw.println();
  -            pw.println("   <!-- " + JavaUtils.getMessage("wsdlService00",
  +            pw.println("  <!-- " + JavaUtils.getMessage("wsdlService00",
                       myService.getQName().getLocalPart()) + " -->");
               pw.println();
   
  @@ -140,9 +140,9 @@
   
           boolean isRPC = (bEntry.getBindingStyle() == BindingEntry.STYLE_RPC);
   
  -        pw.println("   <service name=\"" + serviceName
  -                + "\" pivot=\"" + (isRPC ? "RPCDispatcher" : "MsgDispatcher") + "\">");
  -        pw.println("   </service>");
  +        pw.println("  <service name=\"" + serviceName
  +                + "\" provider=\"" + (isRPC ? "java:RPC" : "java:MSG") + "\">");
  +        pw.println("  </service>");
       } //writeDeployPort
   
   } // class JavaUndeployWriter
  
  
  
  1.9       +25 -19    xml-axis/java/src/org/apache/axis/wsdl/JavaWriter.java
  
  Index: JavaWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaWriter.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JavaWriter.java	2001/11/26 16:55:58	1.8
  +++ JavaWriter.java	2001/11/27 18:32:09	1.9
  @@ -263,26 +263,32 @@
        * and opening tag.
        */
       protected void initializeDeploymentDoc(String deploymentOpName) throws IOException
{
  -        pw.println("<!--                                         " +
  -                "                    -->");
  -        pw.println("<!--Use this file to " + deploymentOpName +
  -                " some handlers/chains and services  -->");
  -        pw.println("<!--Two ways to do this:                     " +
  -                "                    -->");
  -        pw.println("<!--  java org.apache.axis.utils.Admin " +
  -                deploymentOpName + ".xml              -->");
  -        pw.println("<!--     from the same dir that the Axis " +
  -                "engine runs             -->");
  -        pw.println("<!--or                                     " +
  -                "                      -->");
  -        pw.println("<!--  java org.apache.axis.client.AdminClient " +
  -                deploymentOpName + ".xml       -->");
  -        pw.println("<!--     after the axis server is running    " +
  -                "                    -->");
  -        pw.println("<!--This file will be replaced by WSDD once " +
  -                "it's ready           -->");
  +        if ("deploy".equals(deploymentOpName)) {
  +            pw.println(JavaUtils.getMessage("deploy00"));
  +        }
  +        else {
  +            pw.println(JavaUtils.getMessage("deploy01"));
  +        }
  +        pw.println(JavaUtils.getMessage("deploy02"));
  +        if ("deploy".equals(deploymentOpName)) {
  +            pw.println(JavaUtils.getMessage("deploy03"));
  +        }
  +        else {
  +            pw.println(JavaUtils.getMessage("deploy04"));
  +        }
  +        pw.println(JavaUtils.getMessage("deploy05"));
  +        pw.println(JavaUtils.getMessage("deploy06"));
  +        if ("deploy".equals(deploymentOpName)) {
  +            pw.println(JavaUtils.getMessage("deploy07"));
  +        }
  +        else {
  +            pw.println(JavaUtils.getMessage("deploy08"));
  +        }
  +        pw.println(JavaUtils.getMessage("deploy09"));
           pw.println();
  -        pw.println("<m:" + deploymentOpName + " xmlns:m=\"AdminService\">");
  +        pw.println("<deployment");
  +        pw.println("    xmlns=\"http://xml.apache.org/axis/wsdd/\"");
  +        pw.println("    xmlns:java=\"http://xml.apache.org/axis/wsdd/providers/java\">");
       } // initializeDeploymentDoc
   
       /**
  
  
  
  1.22      +2 -2      xml-axis/java/test/build_functional_tests.xml
  
  Index: build_functional_tests.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/build_functional_tests.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- build_functional_tests.xml	2001/11/13 22:25:57	1.21
  +++ build_functional_tests.xml	2001/11/27 18:32:09	1.22
  @@ -148,12 +148,12 @@
       </copy>
       <path id="deploy.xml.files">
           <fileset dir="${build.dir}/work">
  -          <include name="**/deploy.xml"/>
  +          <include name="**/deploy.wsdd"/>
           </fileset>
       </path>
       <path id="undeploy.xml.files">
           <fileset dir="${build.dir}/work">
  -          <include name="**/undeploy.xml"/>
  +          <include name="**/undeploy.wsdd"/>
           </fileset>
       </path>
       <property name="deploy.xml.property" refid="deploy.xml.files"/>
  
  
  

Mime
View raw message