Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
Message-ID: <20051205041732.7401.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r353981 - in
 /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util:
 ArchiveFileData.java ArchiveReader.java
Date: Mon, 05 Dec 2005 04:17:31 -0000
To: axis2-cvs@ws.apache.org
From: deepal@apache.org

Author: deepal
Date: Sun Dec  4 20:17:22 2005
New Revision: 353981

URL: http://svn.apache.org/viewcvs?rev=353981&view=rev
Log:
there was a bug in ?wsdl (thx Sanka for finding the bug)

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java?rev=353981&r1=353980&r2=353981&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java Sun Dec  4 20:17:22 2005
@@ -20,7 +20,6 @@
 import org.apache.axis2.deployment.DeploymentClassLoader;
 import org.apache.axis2.deployment.DeploymentErrorMsgs;
 import org.apache.axis2.deployment.util.Utils;
-import org.apache.axis2.description.AxisService;
 import org.apache.axis2.i18n.Messages;
 
 import java.io.File;
@@ -41,12 +40,6 @@
 //    private String moduleClass;
     private String name;
 
-
-    //To store services in a serviceGroup , if there are wsdl for those servics ,
-    //so wsdl service will be created for each wsdl an those will be temeororaly store
-    //in this table
-    private HashMap service = new HashMap();
-
     private ArrayList deploybleServices = new ArrayList();
 
     public ArchiveFileData(int type, String name) {
@@ -118,36 +111,24 @@
             }
         } else {
             if (file != null) {
-                classLoader = Utils.getClassLoader(parent,file);
+                classLoader = Utils.getClassLoader(parent, file);
             }
         }
 
     }
+
     /**
      * to check whthere a given file is  a  jar file
      *
      * @param filename
      * @return boolean
      */
-    public static  boolean isServiceArchiveFile(String filename) {
+    public static boolean isServiceArchiveFile(String filename) {
         return ((filename.endsWith(".jar")) | (filename.endsWith(".aar")));
     }
 
-    public static  boolean isModuleArchiveFile(String filename) {
+    public static boolean isModuleArchiveFile(String filename) {
         return ((filename.endsWith(".jar")) || (filename.endsWith(".mar")));
-    }
-
-
-    public void addService(AxisService servicedesc){
-        service.put(servicedesc.getName().getLocalPart(),servicedesc);
-    }
-
-    public AxisService getService(String serviceName){
-        return (AxisService)service.get(serviceName);
-    }
-
-    public HashMap getService() {
-        return service;
     }
 
     public ArrayList getDeploybleServices() {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?rev=353981&r1=353980&r2=353981&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Sun Dec  4 20:17:22 2005
@@ -16,14 +16,7 @@
 
 package org.apache.axis2.deployment.repository.util;
 
-import org.apache.axis2.deployment.DeploymentConstants;
-import org.apache.axis2.deployment.DeploymentEngine;
-import org.apache.axis2.deployment.DeploymentErrorMsgs;
-import org.apache.axis2.deployment.DeploymentException;
-import org.apache.axis2.deployment.DescriptionBuilder;
-import org.apache.axis2.deployment.ModuleBuilder;
-import org.apache.axis2.deployment.ServiceBuilder;
-import org.apache.axis2.deployment.ServiceGroupBuilder;
+import org.apache.axis2.deployment.*;
 import org.apache.axis2.description.AxisDescWSDLComponentFactory;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.AxisServiceGroup;
@@ -43,15 +36,7 @@
 import javax.wsdl.WSDLException;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -248,14 +233,12 @@
         OMElement services = builder.buildOM();
         rootelementName = services.getLocalName();
         if (SERVICE_ELEMENT.equals(rootelementName)) {
-            AxisService axisService = engine.getCurrentFileItem().
-                    getService(DescriptionBuilder.getShortFileName(
-                            engine.getCurrentFileItem().getName()));
+            AxisService axisService = (AxisService) wsdlServices.get(
+                    DescriptionBuilder.getShortFileName(engine.getCurrentFileItem().getName()));
             if (axisService == null) {
                 axisService = new AxisService(
                         new QName(DescriptionBuilder.getShortFileName(
                                 engine.getCurrentFileItem().getName())));
-                engine.getCurrentFileItem().addService(axisService);
             }
             axisService.setParent(axisServiceGroup);
             axisService.setClassLoader(engine.getCurrentFileItem().getClassLoader());