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

[azeez]

Author: azeez
Date: Fri Mar  2 05:42:26 2012
New Revision: 1296057

URL: http://svn.apache.org/viewvc?rev=1296057&view=rev
Log:
Applying patch provided by Nuwan for 
https://issues.apache.org/jira/browse/AXIS2-5256 

Modified:
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
    
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/DeploymentEngine.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=1296057&r1=1296056&r2=1296057&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
 Fri Mar  2 05:42:26 2012
@@ -1413,13 +1413,12 @@ public abstract class DeploymentEngine i
             return;
         }
 
-        if (extension == null) {
-            log.error("Failed to add Deployer " + 
deployer.getClass().getName() + ": Deployer missing 'extension' attribute");
-            return;
+        //Extention is optional if the extention is not provided deployer will 
deploy the directories
+        if (extension != null) {
+            // A leading dot is redundant, so strip it.  So we allow either 
".foo" or "foo", either
+            // of which will result in extension="foo"
+            if (extension.charAt(0) == '.') extension = extension.substring(1);
         }
-        // A leading dot is redundant, so strip it.  So we allow either ".foo" 
or "foo", either
-        // of which will result in extension="foo"
-        if (extension.charAt(0) == '.') extension = extension.substring(1);
 
         // If axis2 is not initialized, Axis2 will handle the deployer init() 
and relavent service deployment
         // If axis2 is initialized and hotDeployment is on, Axis2 will handle 
the relavent service deployments.

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=1296057&r1=1296056&r2=1296057&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 Mar  2 05:42:26 2012
@@ -296,15 +296,21 @@ public class RepositoryListener implemen
                         if (isSourceControlDir(file)) {
                             continue;
                         }
-                        if (!file.isDirectory() && extension
-                                
.equals(DeploymentFileData.getFileExtension(file.getName()))) {
+                        if (extension == null && file.isDirectory()) {
                             Deployer deployer = 
deploymentEngine.getDeployer(dir, extension);
                             deployer.setDirectory(dir);
                             addFileToDeploy(file, deployer, 
WSInfo.TYPE_CUSTOM);
-                        } else if (file.isDirectory() && 
!file.getName().startsWith(".") &&
-                                !(dir.equals(directory.getName()) && 
"lib".equalsIgnoreCase(file.getName()))) {
-                            //look in the child directory also
-                            findFileForGivenDirectory(file, extension, dir);
+                        } else if (extension != null) {
+                            if (!file.isDirectory() && extension
+                                    
.equals(DeploymentFileData.getFileExtension(file.getName()))) {
+                                Deployer deployer = 
deploymentEngine.getDeployer(dir, extension);
+                                deployer.setDirectory(dir);
+                                addFileToDeploy(file, deployer, 
WSInfo.TYPE_CUSTOM);
+                            } else if (file.isDirectory() && 
!file.getName().startsWith(".") &&
+                                    !(dir.equals(directory.getName()) && 
"lib".equalsIgnoreCase(file.getName()))) {
+                                //look in the child directory also
+                                findFileForGivenDirectory(file, extension, 
dir);
+                            }
                         }
                     }
                 }