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 2006/03/18 13:19:30 UTC
svn commit: r386841 - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/rpc/client/ core/src/org/apache/axis2/client/
core/src/org/apache/axis2/deployment/
integration/test/org/apache/axis2/engine/
integration/test/org/apache/axis2...
Author: deepal
Date: Sat Mar 18 04:19:28 2006
New Revision: 386841
URL: http://svn.apache.org/viewcvs?rev=386841&view=rev
Log:
- fixing RPCCallTest failing in JDK 1.5
- fixing : 497
- added web resources addition
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCServiceClient.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/RESTCall.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java
webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java
webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java
webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java
webservices/axis2/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java
webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java
webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCServiceClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCServiceClient.java?rev=386841&r1=386840&r2=386841&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCServiceClient.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCServiceClient.java Sat Mar 18 04:19:28 2006
@@ -98,7 +98,7 @@
throws AxisFault {
OMElement omElement = BeanUtil.getOMElement(opName, args, null);
//call the underline implementation
- super.sendReceiveNonblocking(omElement, callback);
+ super.sendReceiveNonBlocking(omElement, callback);
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/RESTCall.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/RESTCall.java?rev=386841&r1=386840&r2=386841&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/RESTCall.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/RESTCall.java Sat Mar 18 04:19:28 2006
@@ -34,7 +34,7 @@
}
public void sendReceiveNonblocking(Callback callback) throws AxisFault {
- super.sendReceiveNonblocking(OMAbstractFactory.getOMFactory().createOMElement("nothing",
+ super.sendReceiveNonBlocking(OMAbstractFactory.getOMFactory().createOMElement("nothing",
"nothing", "nothing"), callback);
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java?rev=386841&r1=386840&r2=386841&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java Sat Mar 18 04:19:28 2006
@@ -189,9 +189,6 @@
trsManager = new ListenerManager();
trsManager.init(this.configContext);
}
-// if (!trsManager.isStopped()) {
-// trsManager.start();
-// }
}
/**
@@ -460,7 +457,7 @@
}
}
- public void sendReceiveNonblocking(OMElement elem, Callback callback)
+ public void sendReceiveNonBlocking(OMElement elem, Callback callback)
throws AxisFault {
sendReceiveNonBlocking(ANON_OUT_IN_OP, elem, callback);
}
@@ -605,7 +602,7 @@
public void onComplete(AsyncResult result) {
this.envelope = result.getResponseEnvelope();
this.msgctx = result.getResponseMessageContext();
- synchronized (this){
+ synchronized (this) {
notify();
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=386841&r1=386840&r2=386841&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Sat Mar 18 04:19:28 2006
@@ -236,8 +236,8 @@
contolops.clear();
}
axisConfig.addServiceGroup(serviceGroup);
-// addAsWebResources(currentArchiveFile.getFile(),
-// serviceGroup.getServiceGroupName());
+ addAsWebResources(currentArchiveFile.getFile(),
+ serviceGroup.getServiceGroupName());
}
private void addAsWebResources(File in, String serviceFileName) {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java?rev=386841&r1=386840&r2=386841&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java Sat Mar 18 04:19:28 2006
@@ -93,7 +93,7 @@
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
- sender.sendReceiveNonblocking(payload, callback);
+ sender.sendReceiveNonBlocking(payload, callback);
int index = 0;
while (!finish) {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java?rev=386841&r1=386840&r2=386841&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java Sat Mar 18 04:19:28 2006
@@ -98,7 +98,7 @@
finish = true;
}
};
- sender.sendReceiveNonblocking(payload, callback);
+ sender.sendReceiveNonBlocking(payload, callback);
int index = 0;
while (!finish) {
Thread.sleep(1000);
@@ -144,7 +144,7 @@
sender.setOptions(options);
options.setTo(targetEPR);
- sender.sendReceiveNonblocking(payload, callback);
+ sender.sendReceiveNonBlocking(payload, callback);
int index = 0;
while (!finish) {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java?rev=386841&r1=386840&r2=386841&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java Sat Mar 18 04:19:28 2006
@@ -104,7 +104,7 @@
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
options.setTo(targetEPR);
- sender.sendReceiveNonblocking(payload, callback);
+ sender.sendReceiveNonBlocking(payload, callback);
int index = 0;
while (!finish) {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java?rev=386841&r1=386840&r2=386841&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java Sat Mar 18 04:19:28 2006
@@ -131,7 +131,7 @@
options.setAction(Constants.AXIS2_NAMESPACE_URI+"/"+operationName.getLocalPart());
sender.setOptions(options);
- sender.sendReceiveNonblocking(payload, callback);
+ sender.sendReceiveNonBlocking(payload, callback);
int index = 0;
while (!finish) {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java?rev=386841&r1=386840&r2=386841&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java Sat Mar 18 04:19:28 2006
@@ -125,7 +125,7 @@
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(clientOptions);
- sender.sendReceiveNonblocking(payload, callback);
+ sender.sendReceiveNonBlocking(payload, callback);
int index = 0;
while (!finish) {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java?rev=386841&r1=386840&r2=386841&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java Sat Mar 18 04:19:28 2006
@@ -447,8 +447,14 @@
ArrayList req = new ArrayList();
req.add(args.toArray());
- OMElement value = sender.invokeBlocking(operationName, req.toArray());
- assertEquals("MyCompany", value.getFirstElement().getFirstElement().getText());
+ ArrayList resobj = new ArrayList();
+ resobj.add(Company.class);
+ resobj.add(Company.class);
+ resobj.add(Company.class);
+ resobj.add(Company.class);
+ Object [] value = sender.invokeBlocking(operationName, req.toArray(), resobj.toArray());
+ assertEquals(4, value.length);
+ assertEquals(((Company) value[0]).getName(), "MyCompany");
}
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java?rev=386841&r1=386840&r2=386841&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java Sat Mar 18 04:19:28 2006
@@ -84,7 +84,7 @@
org.apache.axis2.Constants.VALUE_FALSE);
ServiceClient sender = new ServiceClient();
sender.setOptions(options);
- sender.sendReceiveNonblocking(element, specificCallbackObject);
+ sender.sendReceiveNonBlocking(element, specificCallbackObject);
} catch (AxisFault axisFault) {
axisFault.printStackTrace();
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java?rev=386841&r1=386840&r2=386841&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java Sat Mar 18 04:19:28 2006
@@ -71,7 +71,7 @@
org.apache.axis2.Constants.VALUE_FALSE);
ServiceClient sender = new ServiceClient();
sender.setOptions(options);
- sender.sendReceiveNonblocking(element, specificCallbackObject);
+ sender.sendReceiveNonBlocking(element, specificCallbackObject);
} catch (AxisFault axisFault) {
axisFault.printStackTrace();
} catch (Exception e) {
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java?rev=386841&r1=386840&r2=386841&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java Sat Mar 18 04:19:28 2006
@@ -71,7 +71,7 @@
org.apache.axis2.Constants.VALUE_FALSE);
ServiceClient sender = new ServiceClient();
sender.setOptions(options);
- sender.sendReceiveNonblocking(element, specificCallbackObject);
+ sender.sendReceiveNonBlocking(element, specificCallbackObject);
} catch (AxisFault axisFault) {
axisFault.printStackTrace();
} catch (Exception e) {
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java?rev=386841&r1=386840&r2=386841&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java Sat Mar 18 04:19:28 2006
@@ -68,7 +68,7 @@
org.apache.axis2.Constants.VALUE_FALSE);
ServiceClient sender = new ServiceClient();
sender.setOptions(options);
- sender.sendReceiveNonblocking(element, specificCallbackObject);
+ sender.sendReceiveNonBlocking(element, specificCallbackObject);
} catch (AxisFault axisFault) {
axisFault.printStackTrace();
} catch (Exception e) {
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java?rev=386841&r1=386840&r2=386841&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java Sat Mar 18 04:19:28 2006
@@ -81,7 +81,7 @@
try {
ServiceClient sender = new ServiceClient();
sender.setOptions(options);
- sender.sendReceiveNonblocking(requestElement, new GoogleCallBack(word));
+ sender.sendReceiveNonBlocking(requestElement, new GoogleCallBack(word));
} catch (AxisFault axisFault) {
observer.updateError(axisFault.getMessage());
Modified: webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java?rev=386841&r1=386840&r2=386841&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java Sat Mar 18 04:19:28 2006
@@ -68,7 +68,7 @@
//Non-Blocking Invocation
ServiceClient sender = new ServiceClient();
sender.setOptions(options);
- sender.sendReceiveNonblocking(payload, callback);
+ sender.sendReceiveNonBlocking(payload, callback);
//Wait till the callback receives the response.
while (!callback.isComplete()) {
Modified: webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java?rev=386841&r1=386840&r2=386841&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java Sat Mar 18 04:19:28 2006
@@ -71,7 +71,7 @@
//Non-Blocking Invocation
ServiceClient sender = new ServiceClient();
sender.setOptions(options);
- sender.sendReceiveNonblocking(payload, callback);
+ sender.sendReceiveNonBlocking(payload, callback);
//Wait till the callback receives the response.
while (!callback.isComplete()) {