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/12 13:51:43 UTC
svn commit: r555600 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment:
AxisConfigBuilder.java RepositoryListener.java ServiceBuilder.java
Author: deepal
Date: Thu Jul 12 04:51:41 2007
New Revision: 555600
URL: http://svn.apache.org/viewvc?view=rev&rev=555600
Log:
it should be possible to map different extension to a one directory when we use custom deployers
- Should't we thw meaningful exception if we can do so
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java?view=diff&rev=555600&r1=555599&r2=555600
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java Thu Jul 12 04:51:41 2007
@@ -277,8 +277,14 @@
}
deployer.setDirectory(directory);
deployer.setExtension(extension);
- if (directory != null)
- directoryToExtensionMappingMap.put(directory, extension);
+ if (directory != null) {
+ ArrayList extensionList = (ArrayList) directoryToExtensionMappingMap.get(directory);
+ if (extensionList == null) {
+ extensionList = new ArrayList();
+ }
+ extensionList.add(extension);
+ directoryToExtensionMappingMap.put(directory, extensionList);
+ }
extensionToDeployerMappingMap.put(extension, deployer);
}
if (deploymentEngine != null) {
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=555600&r1=555599&r2=555600
==============================================================================
--- 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 Thu Jul 12 04:51:41 2007
@@ -37,6 +37,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Enumeration;
+import java.util.ArrayList;
public class RepositoryListener implements DeploymentConstants {
protected static final Log log = LogFactory.getLog(RepositoryListener.class);
@@ -232,7 +233,12 @@
Iterator keys = directoryToExtensionMappingMap.keySet().iterator();
while (keys.hasNext()) {
String s = (String) keys.next();
- findFileForGivenDirectory(s, (String) directoryToExtensionMappingMap.get(s));
+ ArrayList list = (ArrayList) directoryToExtensionMappingMap.get(s);
+ for (int i = 0; i < list.size(); i++) {
+ String extension = (String) list.get(i);
+ findFileForGivenDirectory(s, extension);
+ }
+
}
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?view=diff&rev=555600&r1=555599&r2=555600
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java Thu Jul 12 04:51:41 2007
@@ -382,10 +382,7 @@
} catch (XMLStreamException e) {
throw new DeploymentException(e);
} catch (AxisFault axisFault) {
- throw new DeploymentException(
- Messages.getMessage(
- DeploymentErrorMsgs.OPERATION_PROCESS_ERROR, axisFault.getMessage()),
- axisFault);
+ throw new DeploymentException(axisFault);
}
return service;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org