axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r559377 - in /webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/deployment: RepositoryListener.java repository/util/WSInfoList.java
Date Wed, 25 Jul 2007 09:41:19 GMT
Author: deepal
Date: Wed Jul 25 02:41:17 2007
New Revision: 559377

URL: http://svn.apache.org/viewvc?view=rev&rev=559377
Log:
getting hotupdate working for un expanded services

Modified:
    webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
    webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java

Modified: webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?view=diff&rev=559377&r1=559376&r2=559377
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
(original)
+++ webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
Wed Jul 25 02:41:17 2007
@@ -300,7 +300,7 @@
                 } else {
                     if (!"lib".equalsIgnoreCase(file.getName())) {
                         addFileToDeploy(file, deploymentEngine.getServiceDeployer(),
-                                        WSInfo.TYPE_CUSTOM);
+                                        WSInfo.TYPE_SERVICE);
                     }
                 }
             }

Modified: webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java?view=diff&rev=559377&r1=559376&r2=559377
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
(original)
+++ webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
Wed Jul 25 02:41:17 2007
@@ -64,14 +64,20 @@
      * @param file actual jar files for either Module or service
      */
     public synchronized void addWSInfoItem(File file, Deployer deployer , int type) {
-        WSInfo info = getFileItem(file,deployer,type);
-        if (deploymentEngine.isHotUpdate() && isModified(file, info)) {
-            info.setLastModifiedDate(file.lastModified());
-            WSInfo wsInfo = new WSInfo(info.getFileName(), info.getLastModifiedDate(), deployer,type);
-            deploymentEngine.addWSToUndeploy(wsInfo);           // add entry to undeploy
list
-            DeploymentFileData deploymentFileData = new DeploymentFileData(file, deployer);
-            deploymentEngine.addWSToDeploy(deploymentFileData);    // add entry to deploylist
+        WSInfo info = (WSInfo) currentJars.get(file.getName());
+        if (info != null) {
+            if (deploymentEngine.isHotUpdate() && isModified(file, info)) {
+//            info.setLastModifiedDate(file.lastModified());
+                WSInfo wsInfo = new WSInfo(info.getFileName(), info.getLastModifiedDate(),
deployer,type);
+                deploymentEngine.addWSToUndeploy(wsInfo);           // add entry to undeploy
list
+                DeploymentFileData deploymentFileData = new DeploymentFileData(file, deployer);
+                deploymentEngine.addWSToDeploy(deploymentFileData);    // add entry to deploylist
+            }
+        } else {
+            info = getFileItem(file,deployer,type);
+            setLastModifiedDate(file,info);
         }
+
         jarList.add(info.getFileName());
     }
 
@@ -174,14 +180,18 @@
     }
 
     private void setLastModifiedDate(File file, WSInfo wsInfo) {
-        File files [] = file.listFiles();
-        for (int i = 0; i < files.length; i++) {
-            File fileItem = files[i];
-            if (fileItem.isDirectory()) {
-                setLastModifiedDate(fileItem, wsInfo);
-            } else {
-                fileItem.setLastModified(wsInfo.getLastModifiedDate());
+        if (file.isDirectory()) {
+            File files [] = file.listFiles();
+            for (int i = 0; i < files.length; i++) {
+                File fileItem = files[i];
+                if (fileItem.isDirectory()) {
+                    setLastModifiedDate(fileItem, wsInfo);
+                } else {
+                    fileItem.setLastModified(wsInfo.getLastModifiedDate());
+                }
             }
+        } else {
+            file.setLastModified(wsInfo.getLastModifiedDate());
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message