Author: isurues
Date: Thu Jan 6 07:24:25 2011
New Revision: 1055772
URL: http://svn.apache.org/viewvc?rev=1055772&view=rev
Log:
Fixing https://issues.apache.org/jira/browse/AXIS2-4101. Removed support for
other extensions inside the repository/services folder. This is beacuese, we
can't select the correct deployer only by looking at the file extension. And
also, removed unwanted map in DeploymentEngine which keeps a 1 to 1 mapping
(which is no longer valid) between the extension and the deployer. Changed a
test case also to match the change..
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
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
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/deployment/CustomDeployerTest.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java?rev=1055772&r1=1055771&r2=1055772&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
Thu Jan 6 07:24:25 2011
@@ -386,7 +386,6 @@ public class AxisConfigBuilder extends D
}
private void processDeployers(Iterator deployerItr) {
- HashMap extensionToDeployerMappingMap = new HashMap();
Map<String, Map<String, Deployer>> deployers = new HashMap<String,
Map<String, Deployer>>();
while (deployerItr.hasNext()) {
OMElement element = (OMElement) deployerItr.next();
@@ -429,10 +428,8 @@ public class AxisConfigBuilder extends D
deployers.put(directory, extensionMap);
}
extensionMap.put(extension, deployer);
- extensionToDeployerMappingMap.put(extension, deployer);
}
if (deploymentEngine != null) {
-
deploymentEngine.setExtensionToDeployerMappingMap(extensionToDeployerMappingMap);
deploymentEngine.setDeployers(deployers);
}
}
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=1055772&r1=1055771&r2=1055772&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
Thu Jan 6 07:24:25 2011
@@ -134,10 +134,6 @@ public abstract class DeploymentEngine i
//To deploy modules (both mar and expanded)
protected ModuleDeployer moduleDeployer;
- //to keep map of which deployer can process which file extension ,
- // for example ServiceDeployer will process .aar file
- private HashMap extensionToDeployerMappingMap = new HashMap();
-
private Map<String, Map<String, Deployer>> deployerMap = new
HashMap<String, Map<String, Deployer>>();
private Lock lock = new ReentrantLock();
@@ -1343,10 +1339,6 @@ public abstract class DeploymentEngine i
return repositoryDir;
}
- public void setExtensionToDeployerMappingMap(HashMap
extensionToDeployerMappingMap) {
- this.extensionToDeployerMappingMap = extensionToDeployerMappingMap;
- }
-
public void setDeployers(Map<String, Map<String, Deployer>> deployerMap) {
this.deployerMap = deployerMap;
}
@@ -1373,10 +1365,6 @@ public abstract class DeploymentEngine i
return (extensionMap != null) ? extensionMap.get(extension) : null;
}
- public Deployer getDeployerForExtension(String extension) {
- return (Deployer) extensionToDeployerMappingMap.get(extension);
- }
-
/**
* Clean up the mess
*/
@@ -1450,7 +1438,6 @@ public abstract class DeploymentEngine i
deployerMap.put(directory, extensionMap);
}
extensionMap.put(extension, deployer);
- extensionToDeployerMappingMap.put(extension, deployer);
} finally {
lock.unlock();
}
@@ -1492,10 +1479,6 @@ public abstract class DeploymentEngine i
log.debug("Deployer " + deployer.getClass().getName() + "
is removed");
}
}
-
- if (extensionToDeployerMappingMap.containsKey(extension)) {
- extensionToDeployerMappingMap.remove(extension);
- }
} finally {
lock.unlock();
}
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=1055772&r1=1055771&r2=1055772&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 07:24:25 2011
@@ -353,15 +353,6 @@ public class RepositoryListener implemen
if
(DeploymentFileData.isServiceArchiveFile(file.getName())) {
addFileToDeploy(file,
deploymentEngine.getServiceDeployer(),
WSInfo.TYPE_SERVICE);
- } else {
- String ext =
DeploymentFileData.getFileExtension(file.getName());
- Deployer deployer =
deploymentEngine.getDeployerForExtension(ext);
- // If we found a deployer for this type of file, use
it. Otherwise
- // ignore the file.
- if (deployer != null) {
-
deployer.setDirectory(deploymentEngine.getServicesDir().getName());
- addFileToDeploy(file, deployer,
WSInfo.TYPE_SERVICE);
- }
}
}
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/deployment/CustomDeployerTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/deployment/CustomDeployerTest.java?rev=1055772&r1=1055771&r2=1055772&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/deployment/CustomDeployerTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/deployment/CustomDeployerTest.java
Thu Jan 6 07:24:25 2011
@@ -37,8 +37,7 @@ public class CustomDeployerTest extends
assertTrue("Init was not called", CustomDeployer.initCalled);
assertEquals("Wrong directory", "widgets", CustomDeployer.directory);
assertEquals("Wrong extension", "svc", CustomDeployer.extension);
- assertEquals("Wrong number of deployed items", 2,
CustomDeployer.deployedItems);
- assertTrue("George wasn't found", CustomDeployer.georgeDeployed);
+ assertEquals("Wrong number of deployed items", 1,
CustomDeployer.deployedItems);
assertTrue("Mary wasn't found", CustomDeployer.maryDeployed);
assertEquals("Parameter not set correctly",
