axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r123171 - in webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment: . repository/utill
Date Thu, 23 Dec 2004 07:15:15 GMT
Author: deepal
Date: Wed Dec 22 23:15:13 2004
New Revision: 123171

URL: http://svn.apache.org/viewcvs?view=rev&rev=123171
Log:
remove get/setserviceClassName from axisservice
Modified:
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/repository/utill/HDFileItem.java

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java?view=diff&rev=123171&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java&r1=123170&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java&r2=123171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
Wed Dec 22 23:15:13 2004
@@ -102,6 +102,9 @@
         this.serverconfigName = configFileName;
     }
 
+    public HDFileItem getCurrentFileItem() {
+        return currentFileItem;
+    }
 
     /**
      * This method should use inorder to get the referance to servermetadata
@@ -229,8 +232,8 @@
                 }
                 urlsToLoadFrom = new URL[]{file.toURL()};
                 loader1 = new URLClassLoader(urlsToLoadFrom, parent);
-                if(! service.getServiceClassName().equals("")){
-                    serviceclass = Class.forName(service.getServiceClassName(), true, loader1);
+                if(! currentFileItem.getClassName().equals("")){
+                    serviceclass = Class.forName(currentFileItem.getClassName(), true, loader1);
                 }
                 service.setServiceClass(serviceclass);
             } catch (MalformedURLException e) {

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java?view=diff&rev=123171&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java&r1=123170&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java&r2=123171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java
Wed Dec 22 23:15:13 2004
@@ -114,7 +114,7 @@
                     String ST = pullparser.getLocalName();
                     if (ST.equals(serviceXMLST)) {
                         procesServiceXML(axisService);
-                        axisService.setName(new QName(archiveName));
+                        axisService.setName(new QName(getShortFileName(dpengine.getCurrentFileItem().getFile().getName())));
                     }
                     //processStartElement();
                     break;//todo this has to be chenfed only for testng
@@ -234,7 +234,7 @@
                                 for (int i = 0; i < attribCount; i++) {
                                     String attname = pullparser.getAttributeLocalName(i);
                                     String attvalue = pullparser.getAttributeValue(i);
-                                    axisService.setServiceClassName(attvalue);
+                                    dpengine.getCurrentFileItem().setClassName(attvalue);
                                 }
                             }
                         } else {
@@ -813,6 +813,17 @@
             return value;
         }
         return in;
+    }
+
+    private String getShortFileName(String fileName){
+      char seperator = '.';
+        String value = null;
+        int index = fileName.indexOf(seperator);
+        if (index > 0) {
+            value = fileName.substring(0 , index);
+            return value;
+        }
+        return fileName;
     }
 
     /**

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/repository/utill/HDFileItem.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/repository/utill/HDFileItem.java?view=diff&rev=123171&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/repository/utill/HDFileItem.java&r1=123170&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/repository/utill/HDFileItem.java&r2=123171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/repository/utill/HDFileItem.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/repository/utill/HDFileItem.java
Wed Dec 22 23:15:13 2004
@@ -26,6 +26,15 @@
 
     private File file;
     private int type;
+    private String className;
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
 
     public HDFileItem(File file, int type) {
         this.file = file;

Mime
View raw message