You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2007/07/25 11:39:52 UTC
svn commit: r559375 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment:
RepositoryListener.java repository/util/WSInfoList.java
Author: deepal
Date: Wed Jul 25 02:39:51 2007
New Revision: 559375
URL: http://svn.apache.org/viewvc?view=rev&rev=559375
Log:
getting hotupdate working for un expanded services
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?view=diff&rev=559375&r1=559374&r2=559375
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java Wed Jul 25 02:39:51 2007
@@ -300,7 +300,7 @@
} else {
if (!"lib".equalsIgnoreCase(file.getName())) {
addFileToDeploy(file, deploymentEngine.getServiceDeployer(),
- WSInfo.TYPE_CUSTOM);
+ WSInfo.TYPE_SERVICE);
}
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java?view=diff&rev=559375&r1=559374&r2=559375
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java Wed Jul 25 02:39:51 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