gdaniels 2003/08/24 07:58:34
Modified: java/src/org/apache/axis/i18n resource.properties
java/src/org/apache/axis/configuration FileProvider.java
java/src/org/apache/axis AxisEngine.java
Log:
Fix build (for me anyway) - there was a problem with the file test where
the AdminService wasn't being recognized by its namespace, because
it was never being checked. Change AxisEngine.getService(name) to
check by namespace if the initial lookup by name fails.
TODO : Clean this up and explicitly ask to look up by namespace if
we're doing the dispatch when the body is being parsed.
Revision Changes Path
1.67 +3 -1 xml-axis/java/src/org/apache/axis/i18n/resource.properties
Index: resource.properties
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/i18n/resource.properties,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- resource.properties 18 Jul 2003 12:40:40 -0000 1.66
+++ resource.properties 24 Aug 2003 14:58:34 -0000 1.67
@@ -1201,4 +1201,6 @@
happyClientOptionalPresent=The optional components are present.
happyClientOptionalMissing=Axis is missing {0} component(s)
happyClientOptionalOK=Provided the missing functionality is not needed, the client
will work
-happyClientWarningMessageCount={0} warning message(s) were printed
\ No newline at end of file
+happyClientWarningMessageCount={0} warning message(s) were printed
+
+noService10=No service named {0} is available
\ No newline at end of file
1.46 +2 -1
xml-axis/java/src/org/apache/axis/configuration/FileProvider.java
Index: FileProvider.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/configuration/FileProvider.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- FileProvider.java 22 Aug 2003 05:36:00 -0000 1.45
+++ FileProvider.java 24 Aug 2003 14:58:34 -0000 1.46
@@ -260,7 +260,8 @@
public SOAPService getService(QName qname) throws ConfigurationException {
SOAPService service = deployment.getService(qname);
if (service == null) {
- throw new ConfigurationException(Messages.getMessage("noService06"));
+ throw new ConfigurationException(Messages.getMessage("noService10",
+ qname.toString()));
}
return service;
}
1.106 +5 -1 xml-axis/java/src/org/apache/axis/AxisEngine.java
Index: AxisEngine.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/AxisEngine.java,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- AxisEngine.java 18 Jul 2003 12:40:39 -0000 1.105
+++ AxisEngine.java 24 Aug 2003 14:58:34 -0000 1.106
@@ -274,7 +274,11 @@
try {
return config.getService(new QName(null, name));
} catch (ConfigurationException e) {
- throw new AxisFault(e);
+ try {
+ return config.getServiceByNamespaceURI(name);
+ } catch (ConfigurationException e1) {
+ throw new AxisFault(e);
+ }
}
}
