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 ri...@apache.org on 2006/07/12 17:48:31 UTC
svn commit: r421345 - in /incubator/yoko/trunk/core/src:
main/java/org/apache/yoko/orb/OCI/ main/java/org/apache/yoko/orb/OCI/IIOP/
test/java/test/iiopplugin/
Author: rickmcguire
Date: Wed Jul 12 10:48:31 2006
New Revision: 421345
URL: http://svn.apache.org/viewvc?rev=421345&view=rev
Log:
YOKO-87 ConnectionHelper iiop plugins may require access to hosting ORB.
Modified:
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/ConnectionHelper.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/DefaultConnectionHelper.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/iiop.java
incubator/yoko/trunk/core/src/test/java/test/iiopplugin/ClientPlugin.java
incubator/yoko/trunk/core/src/test/java/test/iiopplugin/ServerPlugin.java
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/ConnectionHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/ConnectionHelper.java?rev=421345&r1=421344&r2=421345&view=diff
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/ConnectionHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/ConnectionHelper.java Wed Jul 12 10:48:31 2006
@@ -28,6 +28,7 @@
import java.net.Socket;
import java.net.ServerSocket;
+import org.omg.CORBA.ORB;
import org.omg.CORBA.Policy;
import org.omg.IOP.IOR;
@@ -45,7 +46,7 @@
public interface ConnectionHelper
{
- public void init(String parms);
+ public void init(ORB orb, String parms);
public Socket createSocket(IOR ior, Policy[] policies, InetAddress address, int port) throws IOException, ConnectException;
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/DefaultConnectionHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/DefaultConnectionHelper.java?rev=421345&r1=421344&r2=421345&view=diff
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/DefaultConnectionHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/DefaultConnectionHelper.java Wed Jul 12 10:48:31 2006
@@ -28,12 +28,13 @@
import java.net.Socket;
import java.net.ServerSocket;
+import org.omg.CORBA.ORB;
import org.omg.CORBA.Policy;
import org.omg.IOP.IOR;
public class DefaultConnectionHelper implements ConnectionHelper {
- public void init(String parms) {
+ public void init(ORB orb, String parms) {
// no initializer parameters required by this version.
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/iiop.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/iiop.java?rev=421345&r1=421344&r2=421345&view=diff
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/iiop.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/iiop.java Wed Jul 12 10:48:31 2006
@@ -52,7 +52,7 @@
Class c = loader.loadClass(connectionHelper);
helper = (org.apache.yoko.orb.OCI.IIOP.ConnectionHelper) c.newInstance();
// give this a chance to initializer
- helper.init(helperArgs);
+ helper.init(orb, helperArgs);
} catch (Exception ex) {
throw new org.omg.CORBA.INITIALIZE("unable to load IIOP ConnectionHelper plug-in `" + connectionHelper + "':\n" + ex.getMessage());
}
Modified: incubator/yoko/trunk/core/src/test/java/test/iiopplugin/ClientPlugin.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/test/java/test/iiopplugin/ClientPlugin.java?rev=421345&r1=421344&r2=421345&view=diff
==============================================================================
--- incubator/yoko/trunk/core/src/test/java/test/iiopplugin/ClientPlugin.java (original)
+++ incubator/yoko/trunk/core/src/test/java/test/iiopplugin/ClientPlugin.java Wed Jul 12 10:48:31 2006
@@ -30,6 +30,7 @@
import org.apache.yoko.orb.OCI.IIOP.ConnectionHelper;
import org.omg.CORBA.DynAnyPackage.Invalid;
+import org.omg.CORBA.ORB;
import org.omg.CORBA.Policy;
import org.omg.IOP.IOR;
@@ -47,7 +48,7 @@
}
- public void init(String parms) {
+ public void init(ORB orb, String parms) {
System.out.println("Initializing client-side connection helper with parms " + parms);
if (!parms.equals(CLIENT_ARGS)) {
throw new IllegalArgumentException("Invalid client initialization argument " + parms);
Modified: incubator/yoko/trunk/core/src/test/java/test/iiopplugin/ServerPlugin.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/test/java/test/iiopplugin/ServerPlugin.java?rev=421345&r1=421344&r2=421345&view=diff
==============================================================================
--- incubator/yoko/trunk/core/src/test/java/test/iiopplugin/ServerPlugin.java (original)
+++ incubator/yoko/trunk/core/src/test/java/test/iiopplugin/ServerPlugin.java Wed Jul 12 10:48:31 2006
@@ -31,6 +31,7 @@
import org.apache.yoko.orb.OCI.IIOP.ConnectionHelper;
import org.omg.CORBA.DynAnyPackage.Invalid;
import org.omg.CORBA.Policy;
+import org.omg.CORBA.ORB;
import org.omg.IOP.IOR;
@@ -48,7 +49,7 @@
}
- public void init(String parms) {
+ public void init(ORB orb, String parms) {
System.out.println("Initializing server-side connection helper with parms " + parms);
if (!parms.equals(SERVER_ARGS)) {
throw new IllegalArgumentException("Invalid server initialization argument " + parms);