You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2002/01/28 08:23:45 UTC

cvs commit: xml-axis/java/test/wsdd TestStructure.java

gdaniels    02/01/27 23:23:44

  Modified:    java/src/org/apache/axis/deployment/wsdd Tag: config-work
                        WSDDChain.java WSDDDeployment.java
                        WSDDGlobalConfiguration.java WSDDHandler.java
                        WSDDService.java WSDDTargetedChain.java
                        WSDDTransport.java
               java/test/wsdd Tag: config-work TestStructure.java
  Log:
  Forgot to copy over a few more changes - make sure WSDD references
  work correctly (needs cleanup once we stabilize the design).
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.20.2.2  +2 -2      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDChain.java
  
  Index: WSDDChain.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDChain.java,v
  retrieving revision 1.20.2.1
  retrieving revision 1.20.2.2
  diff -u -r1.20.2.1 -r1.20.2.2
  --- WSDDChain.java	28 Jan 2002 06:42:59 -0000	1.20.2.1
  +++ WSDDChain.java	28 Jan 2002 07:23:44 -0000	1.20.2.2
  @@ -200,8 +200,8 @@
           context.endElement();
       }
   
  -    public void deployToRegistry(DeploymentRegistry registry)
  -            throws DeploymentException {
  +    public void deployToRegistry(WSDDDeployment registry)
  +            throws WSDDException {
           if (getQName() != null)
               registry.deployHandler(this);
           
  
  
  
  1.16.4.2  +3 -3      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployment.java
  
  Index: WSDDDeployment.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployment.java,v
  retrieving revision 1.16.4.1
  retrieving revision 1.16.4.2
  diff -u -r1.16.4.1 -r1.16.4.2
  --- WSDDDeployment.java	28 Jan 2002 06:42:59 -0000	1.16.4.1
  +++ WSDDDeployment.java	28 Jan 2002 07:23:44 -0000	1.16.4.2
  @@ -183,19 +183,19 @@
           elements = getChildElements(e, "chain");
           for (i = 0; i < elements.length; i++) {
               WSDDChain chain = new WSDDChain(elements[i]);
  -            deployHandler(chain);
  +            chain.deployToRegistry(this);
           }
   
           elements = getChildElements(e, "transport");
           for (i = 0; i < elements.length; i++) {
               WSDDTransport transport = new WSDDTransport(elements[i]);
  -            deployTransport(transport);
  +            transport.deployToRegistry(this);
           }
   
           elements = getChildElements(e, "service");
           for (i = 0; i < elements.length; i++) {
               WSDDService service = new WSDDService(elements[i]);
  -            deployService(service);
  +            service.deployToRegistry(this);
           }
   
           elements = getChildElements(e, "typeMapping");
  
  
  
  1.19.4.2  +1 -1      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDGlobalConfiguration.java
  
  Index: WSDDGlobalConfiguration.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDGlobalConfiguration.java,v
  retrieving revision 1.19.4.1
  retrieving revision 1.19.4.2
  diff -u -r1.19.4.1 -r1.19.4.2
  --- WSDDGlobalConfiguration.java	28 Jan 2002 06:42:59 -0000	1.19.4.1
  +++ WSDDGlobalConfiguration.java	28 Jan 2002 07:23:44 -0000	1.19.4.2
  @@ -212,7 +212,7 @@
           context.endElement();
       }
   
  -    public void deployToRegistry(DeploymentRegistry registry)
  +    public void deployToRegistry(WSDDDeployment registry)
               throws DeploymentException {
           if (requestFlow != null)
               requestFlow.deployToRegistry(registry);
  
  
  
  1.14.2.1  +6 -6      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDHandler.java
  
  Index: WSDDHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDHandler.java,v
  retrieving revision 1.14
  retrieving revision 1.14.2.1
  diff -u -r1.14 -r1.14.2.1
  --- WSDDHandler.java	5 Dec 2001 18:33:26 -0000	1.14
  +++ WSDDHandler.java	28 Jan 2002 07:23:44 -0000	1.14.2.1
  @@ -77,11 +77,11 @@
   {
       /**
        * Default constructor
  -     */ 
  +     */
       public WSDDHandler()
       {
       }
  -    
  +
       /**
        *
        * @param e (Element) XXX
  @@ -110,7 +110,7 @@
               attrs.addAttribute("", "name", "name",
                                  "CDATA", context.qName2String(name));
           }
  -        
  +
           attrs.addAttribute("", "type", "type",
                              "CDATA", context.qName2String(getType()));
           context.startElement(new QName(WSDDConstants.WSDD_NS, "handler"),
  @@ -119,8 +119,8 @@
           context.endElement();
       }
   
  -    public void deployToRegistry(DeploymentRegistry registry)
  -            throws DeploymentException {
  -        registry.deployHandler(this);
  +    public void deployToRegistry(WSDDDeployment deployment)
  +            throws WSDDException {
  +        deployment.deployHandler(this);
       }
   }
  
  
  
  1.30.2.2  +2 -2      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDService.java
  
  Index: WSDDService.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDService.java,v
  retrieving revision 1.30.2.1
  retrieving revision 1.30.2.2
  diff -u -r1.30.2.1 -r1.30.2.2
  --- WSDDService.java	28 Jan 2002 06:42:59 -0000	1.30.2.1
  +++ WSDDService.java	28 Jan 2002 07:23:44 -0000	1.30.2.2
  @@ -344,8 +344,8 @@
           cachedService = service;
       }
   
  -    public void deployToRegistry(DeploymentRegistry registry)
  -            throws DeploymentException {
  +    public void deployToRegistry(WSDDDeployment registry)
  +            throws WSDDException {
           registry.deployService(this);
           
           super.deployToRegistry(registry);
  
  
  
  1.4.2.2   +2 -2      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDTargetedChain.java
  
  Index: WSDDTargetedChain.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDTargetedChain.java,v
  retrieving revision 1.4.2.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- WSDDTargetedChain.java	28 Jan 2002 06:42:59 -0000	1.4.2.1
  +++ WSDDTargetedChain.java	28 Jan 2002 07:23:44 -0000	1.4.2.2
  @@ -233,8 +233,8 @@
           
       }
       
  -    public void deployToRegistry(DeploymentRegistry registry)
  -        throws DeploymentException
  +    public void deployToRegistry(WSDDDeployment registry)
  +        throws WSDDException
       {
           // deploy any named subparts
           if (requestFlow != null) {
  
  
  
  1.17.4.1  +2 -2      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDTransport.java
  
  Index: WSDDTransport.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDTransport.java,v
  retrieving revision 1.17
  retrieving revision 1.17.4.1
  diff -u -r1.17 -r1.17.4.1
  --- WSDDTransport.java	14 Nov 2001 17:26:18 -0000	1.17
  +++ WSDDTransport.java	28 Jan 2002 07:23:44 -0000	1.17.4.1
  @@ -121,8 +121,8 @@
           context.endElement();
       }
   
  -    public void deployToRegistry(DeploymentRegistry registry)
  -            throws DeploymentException {
  +    public void deployToRegistry(WSDDDeployment registry)
  +            throws WSDDException {
           registry.deployTransport(this);
           
           super.deployToRegistry(registry);
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.4.1   +2 -1      xml-axis/java/test/wsdd/TestStructure.java
  
  Index: TestStructure.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdd/TestStructure.java,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  --- TestStructure.java	14 Nov 2001 21:22:54 -0000	1.1
  +++ TestStructure.java	28 Jan 2002 07:23:44 -0000	1.1.4.1
  @@ -40,7 +40,8 @@
       public static void main(String[] args) throws Exception 
       {
           TestStructure tester = new TestStructure("TestStructure");
  -        tester.run();
  +        tester.setUp();
  +        tester.testServiceBackReference();
       }
       
       public void testChainAnonymousHandler() throws Exception