gdaniels 2002/07/03 13:21:43
Modified: java/src/org/apache/axis/deployment/wsdd
WSDDDeployableItem.java
java/test/functional TestJAXRPCSamples.java
java/samples/stock ComInfoService.java
java/samples/attachments attachdeploy.wsdd
Log:
Merge WSDD fixes over from beta-3
Revision Changes Path
1.43 +15 -6
xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployableItem.java
Index: WSDDDeployableItem.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployableItem.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- WSDDDeployableItem.java 3 Jul 2002 17:50:33 -0000 1.42
+++ WSDDDeployableItem.java 3 Jul 2002 20:21:43 -0000 1.43
@@ -121,7 +121,6 @@
/**
*
* @param e (Element) XXX
- * @param n (String) XXX
* @throws WSDDException XXX
*/
public WSDDDeployableItem(Element e)
@@ -297,12 +296,24 @@
if (scope == SCOPE_SINGLETON) {
synchronized (this) {
if (singletonInstance == null)
- singletonInstance = makeNewInstance(registry);
+ singletonInstance = getNewInstance(registry);
}
return singletonInstance;
}
- return makeNewInstance(registry);
+ return getNewInstance(registry);
+ }
+
+ private Handler getNewInstance(EngineConfiguration registry)
+ throws ConfigurationException
+ {
+ QName type = getType();
+ if (type == null ||
+ WSDDConstants.URI_WSDD_JAVA.equals(type.getNamespaceURI())) {
+ return makeNewInstance(registry);
+ } else {
+ return registry.getHandler(type);
+ }
}
/**
@@ -326,7 +337,6 @@
}
if (c != null) {
-
try {
h = (Handler)createInstance(c);
} catch (Exception e) {
@@ -350,6 +360,7 @@
}
}
} else {
+ // !!! Should never get here!
h = registry.getHandler(getType());
}
@@ -360,7 +371,6 @@
*
* @param _class XXX
* @return XXX
- * @throws Exception XXX
*/
Object createInstance(Class _class)
throws InstantiationException, IllegalAccessException
@@ -370,7 +380,6 @@
/**
*
- * @param type XXX
* @return XXX
* @throws ClassNotFoundException XXX
*/
1.9 +3 -3 xml-axis/java/test/functional/TestJAXRPCSamples.java
Index: TestJAXRPCSamples.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/functional/TestJAXRPCSamples.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestJAXRPCSamples.java 3 Jul 2002 18:47:07 -0000 1.8
+++ TestJAXRPCSamples.java 3 Jul 2002 20:21:43 -0000 1.9
@@ -123,11 +123,11 @@
log.info("Testing deployment...");
doTestDeploy();
log.info("Testing service...");
- String[] args = {"IBM", "symbol"};
+ String[] args = {"-uuser3", "-wpass3", "IBM", "symbol"};
GetInfo.main(args);
- args = new String[] {"ALLR", "name"};
+ args = new String[] {"-uuser3", "-wpass3", "MACR", "name"};
GetInfo.main(args);
- args = new String[] {"CSCO", "address"};
+ args = new String[] {"-uuser3", "-wpass3", "CSCO", "address"};
GetInfo.main(args);
log.info("Testing undeployment...");
doTestUndeploy();
1.9 +2 -2 xml-axis/java/samples/stock/ComInfoService.java
Index: ComInfoService.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/stock/ComInfoService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ComInfoService.java 30 Oct 2001 16:46:32 -0000 1.8
+++ ComInfoService.java 3 Jul 2002 20:21:43 -0000 1.9
@@ -69,8 +69,8 @@
"International Business Machines",
"Armonk, NY" },
- {"ALLR",
- "Allaire",
+ {"MACR",
+ "Macromedia",
"Newton, MA" },
{"CSCO",
1.7 +0 -1 xml-axis/java/samples/attachments/attachdeploy.wsdd
Index: attachdeploy.wsdd
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/attachments/attachdeploy.wsdd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- attachdeploy.wsdd 23 Apr 2002 20:22:54 -0000 1.6
+++ attachdeploy.wsdd 3 Jul 2002 20:21:43 -0000 1.7
@@ -5,7 +5,6 @@
<service name="urn:EchoAttachmentsService" provider="java:RPC" >
<parameter name="className" value="samples.attachments.EchoAttachmentsService"/>
<parameter name="allowedMethods" value="echo echoDir"/>
- <requestFlow type="checks"/>
<operation name="echo" returnQName="returnqname" returnType="ns1:DataHandler" >
<parameter name="dh" type="ns1:DataHandler"/>
</operation>
