You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by br...@apache.org on 2007/04/06 22:49:18 UTC
svn commit: r526311 - in /incubator/yoko/trunk/bindings/src:
main/java/org/apache/yoko/bindings/corba/
test/java/org/apache/yoko/bindings/corba/
Author: bravi
Date: Fri Apr 6 15:49:17 2007
New Revision: 526311
URL: http://svn.apache.org/viewvc?view=rev&rev=526311
Log:
Fix for the CXF API changes in the Conduit class.
Modified:
incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java
incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaServerConduit.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaSystemExceptionTest.java
Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java?view=diff&rev=526311&r1=526310&r2=526311
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java Fri Apr 6 15:49:17 2007
@@ -84,7 +84,7 @@
orb = CorbaBindingHelper.getDefaultORB(config);
}
- public void send(Message message) throws IOException {
+ public void prepare(Message message) throws IOException {
try {
AddressType address = endpointInfo.getExtensor(AddressType.class);
Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaServerConduit.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaServerConduit.java?view=diff&rev=526311&r1=526310&r2=526311
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaServerConduit.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaServerConduit.java Fri Apr 6 15:49:17 2007
@@ -60,7 +60,7 @@
orb = CorbaBindingHelper.getDefaultORB(config);
}
- public void send(Message message) throws IOException {
+ public void prepare(Message message) throws IOException {
try {
AddressType address = endpointInfo.getExtensor(AddressType.class);
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java?view=diff&rev=526311&r1=526310&r2=526311
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java Fri Apr 6 15:49:17 2007
@@ -116,7 +116,7 @@
assertTrue("conduit should not be null", conduit != null);
}
- public void testSend() throws Exception {
+ public void testPrepare() throws Exception {
setupServiceInfo("http://yoko.apache.org/simple",
"/wsdl/simpleIdl.wsdl", "SimpleCORBAService",
"SimpleCORBAPort");
@@ -125,7 +125,7 @@
CorbaConduit conduit = new CorbaConduit(endpointInfo, destination.getAddress(), orbConfig);
Message message = new MessageImpl();
try {
- conduit.send(message);
+ conduit.prepare(message);
} catch (Exception ex) {
ex.printStackTrace();
}
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java?view=diff&rev=526311&r1=526310&r2=526311
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java Fri Apr 6 15:49:17 2007
@@ -99,7 +99,7 @@
assertTrue("conduit should not be null", conduit != null);
}
- public void testSend() throws Exception {
+ public void testPrepare() throws Exception {
setupServiceInfo("http://yoko.apache.org/simple",
"/wsdl/simpleIdl.wsdl", "SimpleCORBAService",
"SimpleCORBAPort");
@@ -107,7 +107,7 @@
CorbaServerConduit conduit = new CorbaServerConduit(endpointInfo, destination.getAddress(), orbConfig);
Message message = new MessageImpl();
try {
- conduit.send(message);
+ conduit.prepare(message);
} catch (Exception ex) {
ex.printStackTrace();
}
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaSystemExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaSystemExceptionTest.java?view=diff&rev=526311&r1=526310&r2=526311
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaSystemExceptionTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaSystemExceptionTest.java Fri Apr 6 15:49:17 2007
@@ -131,8 +131,11 @@
assertTrue(true);
return;
} catch (Exception ex) {
- assertTrue(false);
- return;
+ Throwable t = ex.getCause();
+ if ((t != null) && (t instanceof org.omg.CORBA.COMM_FAILURE)) {
+ assertTrue(true);
+ return;
+ }
}
assertTrue(false);
}
@@ -144,8 +147,11 @@
assertTrue(true);
return;
} catch (Exception ex) {
- assertTrue(false);
- return;
+ Throwable t = ex.getCause();
+ if ((t != null) && (t instanceof org.omg.CORBA.TRANSIENT)) {
+ assertTrue(true);
+ return;
+ }
}
assertTrue(false);
}
@@ -157,8 +163,11 @@
assertTrue(true);
return;
} catch (Exception ex) {
- assertTrue(false);
- return;
+ Throwable t = ex.getCause();
+ if ((t != null) && (t instanceof org.omg.CORBA.NO_PERMISSION)) {
+ assertTrue(true);
+ return;
+ }
}
assertTrue(false);
}