svn commit: r1055748 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java

[is...@apache.org]

Author: isurues
Date: Thu Jan  6 04:54:30 2011
New Revision: 1055748

URL: http://svn.apache.org/viewvc?rev=1055748&view=rev
Log:
removing the logic to detect undeployable folders in the deployer which has become outdated with the hierarchical services model. That is because, it searches recursively for services..

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=1055748&r1=1055747&r2=1055748&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 Thu Jan  6 04:54:30 2011
@@ -314,7 +314,7 @@ public class RepositoryListener implemen
     }
 
     /**
-     * Searches a given folder for jar files and adds them to a list in the WSInfolist class.
+     * Searches a given folder for aar files and adds them to a list in the WSInfolist class.
      * If sub folders found, those are also searched for services.
      * Ex : repository/services/foo/1.0.0/echo.aar
      *      repository/services/foo/1.0.1/echo.aar
@@ -330,11 +330,6 @@ public class RepositoryListener implemen
         File[] files = root.listFiles();
 
         if (files != null && files.length > 0) {
-            /**
-             * This undeployableDir flag is used to check whether this folder (root) doesn't contain
-             * any deployable artifacts.
-             */
-            boolean undeployableDir = true;
             for (File file : files) {
                 if (isSourceControlDir(file)) {
                     continue;
@@ -353,13 +348,11 @@ public class RepositoryListener implemen
                         } else {
                             findServicesInDirectory(file);
                         }
-                        undeployableDir = false;
                     }
                 } else {
                     if (DeploymentFileData.isServiceArchiveFile(file.getName())) {
                         addFileToDeploy(file, deploymentEngine.getServiceDeployer(),
                                         WSInfo.TYPE_SERVICE);
-                        undeployableDir = false;
                     } else {
                         String ext = DeploymentFileData.getFileExtension(file.getName());
                         Deployer deployer = deploymentEngine.getDeployerForExtension(ext);
@@ -368,15 +361,10 @@ public class RepositoryListener implemen
                         if (deployer != null) {
                             deployer.setDirectory(deploymentEngine.getServicesDir().getName());
                             addFileToDeploy(file, deployer, WSInfo.TYPE_SERVICE);
-                            undeployableDir = false;
                         }
                     }
                 }
             }
-            if (!servicesDir && undeployableDir) {
-                log.error(Messages.getMessage(DeploymentErrorMsgs.SERVICE_XML_NOT_FOUND,
-                        root.getName()));
-            }
         }
     }