Author: azeez
Date: Fri May 21 14:12:45 2010
New Revision: 947015
URL: http://svn.apache.org/viewvc?rev=947015&view=rev
Log:
Ignore directories starting with .
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?rev=947015&r1=947014&r2=947015&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
Fri May 21 14:12:45 2010
@@ -339,7 +339,23 @@ public class RepositoryListener implemen
if (isSourceControlDir(file)) {
continue;
}
- if (!file.isDirectory()) {
+ if (file.isDirectory()) {
+ if (!(servicesDir &&
"lib".equalsIgnoreCase(file.getName())) &&
+ !file.getName().startsWith(".")) {
+ File servicesXML = new File(file,
DeploymentConstants.SERVICES_XML);
+ if (!servicesXML.exists()) {
+ servicesXML =
+ new File(file,
DeploymentConstants.SERVICES_XML.toLowerCase());
+ }
+ if (servicesXML.exists()) {
+ addFileToDeploy(file,
deploymentEngine.getServiceDeployer(),
+ WSInfo.TYPE_SERVICE);
+ } else {
+ findServicesInDirectory(file);
+ }
+ undeployableDir = false;
+ }
+ } else {
if
(DeploymentFileData.isServiceArchiveFile(file.getName())) {
addFileToDeploy(file,
deploymentEngine.getServiceDeployer(),
WSInfo.TYPE_SERVICE);
@@ -355,21 +371,6 @@ public class RepositoryListener implemen
undeployableDir = false;
}
}
- } else {
- if (!(servicesDir &&
"lib".equalsIgnoreCase(file.getName()))) {
- File servicesXML = new File(file,
DeploymentConstants.SERVICES_XML);
- if (!servicesXML.exists()) {
- servicesXML =
- new File(file,
DeploymentConstants.SERVICES_XML.toLowerCase());
- }
- if (servicesXML.exists()) {
- addFileToDeploy(file,
deploymentEngine.getServiceDeployer(),
- WSInfo.TYPE_SERVICE);
- } else {
- findServicesInDirectory(file);
- }
- undeployableDir = false;
- }
}
}
if (!servicesDir && undeployableDir) {
