You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by sc...@apache.org on 2009/02/23 17:53:33 UTC
svn commit: r747079 - in /incubator/etch/branches/router: ./
services/router/ services/router/src/main/java/cisco/uc/cuae/etchrouter/
services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/
services/router/src/test/java/cisco/uc/cuae/etchrouter/t...
Author: sccomer
Date: Mon Feb 23 16:53:32 2009
New Revision: 747079
URL: http://svn.apache.org/viewvc?rev=747079&view=rev
Log:
fix api changes and recover from etch package name changes.
Modified:
incubator/etch/branches/router/.classpath
incubator/etch/branches/router/services/router/ (props changed)
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ApplicationConnectionInfo.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ApplicationInstallInfo.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ConnectionStackInfo.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/DynamicValueFactory.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERRemote.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERRemoteClient.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERRemoteServer.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERStub.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERStubHelper.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterManager.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterManagerHelper.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterMessageFilter.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterMgrTransportFactory.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ImplClient.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ImplServer.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/PluginInstallInfo.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/LocalEnumImportExportHelper.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/LocalStructImportExportHelper.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/LocalTypeImportExportHelper.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/StructValueImportExportHelper.java
incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/XmlBindingDataParser.java
incubator/etch/branches/router/services/router/src/test/java/cisco/uc/cuae/etchrouter/test/utils/PluginTestServerRunner.java
Modified: incubator/etch/branches/router/.classpath
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/.classpath?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/.classpath (original)
+++ incubator/etch/branches/router/.classpath Mon Feb 23 16:53:32 2009
@@ -41,6 +41,8 @@
<classpathentry kind="src" path="binding-python/compiler/src/main/resources"/>
<classpathentry kind="src" path="interoptester/src/main/java"/>
<classpathentry kind="src" path="interoptester/src/test/java"/>
+ <classpathentry kind="src" path="services/router/src/main/java"/>
+ <classpathentry kind="src" path="services/router/target/generated-sources/main/etch/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ETCH_DEPENDENT_JARS"/>
<classpathentry kind="output" path="bin"/>
Propchange: incubator/etch/branches/router/services/router/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 23 16:53:32 2009
@@ -0,0 +1 @@
+target
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ApplicationConnectionInfo.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ApplicationConnectionInfo.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ApplicationConnectionInfo.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ApplicationConnectionInfo.java Mon Feb 23 16:53:32 2009
@@ -29,8 +29,8 @@
import cisco.uc.cuae.etchrouter.plugin.PluginMember;
import cisco.uc.cuae.etchrouter.plugin.PluginMemberConnection;
import cisco.uc.cuae.etchrouter.utils.ApplicationAttributes;
-import etch.bindings.java.msg.Direction;
-import etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.Direction;
+import org.apache.etch.bindings.java.msg.Type;
/**
*
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ApplicationInstallInfo.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ApplicationInstallInfo.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ApplicationInstallInfo.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ApplicationInstallInfo.java Mon Feb 23 16:53:32 2009
@@ -20,7 +20,7 @@
import java.util.HashMap;
import java.util.Map;
-import etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.Type;
public class ApplicationInstallInfo
{
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ConnectionStackInfo.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ConnectionStackInfo.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ConnectionStackInfo.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ConnectionStackInfo.java Mon Feb 23 16:53:32 2009
@@ -17,10 +17,10 @@
package cisco.uc.cuae.etchrouter;
import cisco.uc.cuae.etchrouter.utils.UniqueKeyGenerator;
-import etch.bindings.java.msg.ValueFactory;
-import etch.bindings.java.support.DeliveryService;
-import etch.bindings.java.transport.MailboxManager;
-import etch.util.core.io.Connection;
+import org.apache.etch.bindings.java.msg.ValueFactory;
+import org.apache.etch.bindings.java.support.DeliveryService;
+import org.apache.etch.bindings.java.transport.MailboxManager;
+import org.apache.etch.util.core.io.Connection;
/**
*
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/DynamicValueFactory.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/DynamicValueFactory.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/DynamicValueFactory.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/DynamicValueFactory.java Mon Feb 23 16:53:32 2009
@@ -22,12 +22,12 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import etch.bindings.java.msg.Type;
-import etch.bindings.java.msg.TypeMap;
-import etch.bindings.java.support.Class2TypeMap;
-import etch.bindings.java.support.DefaultValueFactory;
-import etch.bindings.java.support.Validator_long;
-import etch.bindings.java.support.Validator_string;
+import org.apache.etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.TypeMap;
+import org.apache.etch.bindings.java.support.Class2TypeMap;
+import org.apache.etch.bindings.java.support.DefaultValueFactory;
+import org.apache.etch.bindings.java.support.Validator_long;
+import org.apache.etch.bindings.java.support.Validator_string;
/**
*
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERRemote.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERRemote.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERRemote.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERRemote.java Mon Feb 23 16:53:32 2009
@@ -16,9 +16,9 @@
*/
package cisco.uc.cuae.etchrouter;
-import etch.bindings.java.msg.ValueFactory;
-import etch.bindings.java.support.DeliveryService;
-import etch.bindings.java.support.RemoteBase;
+import org.apache.etch.bindings.java.msg.ValueFactory;
+import org.apache.etch.bindings.java.support.DeliveryService;
+import org.apache.etch.bindings.java.support.RemoteBase;
/**
*
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERRemoteClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERRemoteClient.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERRemoteClient.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERRemoteClient.java Mon Feb 23 16:53:32 2009
@@ -16,8 +16,8 @@
*/
package cisco.uc.cuae.etchrouter;
-import etch.bindings.java.msg.ValueFactory;
-import etch.bindings.java.support.DeliveryService;
+import org.apache.etch.bindings.java.msg.ValueFactory;
+import org.apache.etch.bindings.java.support.DeliveryService;
public class ERRemoteClient extends ERRemote
{
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERRemoteServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERRemoteServer.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERRemoteServer.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERRemoteServer.java Mon Feb 23 16:53:32 2009
@@ -16,8 +16,8 @@
*/
package cisco.uc.cuae.etchrouter;
-import etch.bindings.java.msg.ValueFactory;
-import etch.bindings.java.support.DeliveryService;
+import org.apache.etch.bindings.java.msg.ValueFactory;
+import org.apache.etch.bindings.java.support.DeliveryService;
public class ERRemoteServer extends ERRemote
{
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERStub.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERStub.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERStub.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERStub.java Mon Feb 23 16:53:32 2009
@@ -16,9 +16,9 @@
*/
package cisco.uc.cuae.etchrouter;
-import etch.bindings.java.support.DeliveryService;
-import etch.bindings.java.support.Pool;
-import etch.bindings.java.support.StubBase;
+import org.apache.etch.bindings.java.support.DeliveryService;
+import org.apache.etch.bindings.java.support.Pool;
+import org.apache.etch.bindings.java.support.StubBase;
public class ERStub extends StubBase<ImplBase>
{
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERStubHelper.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERStubHelper.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERStubHelper.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ERStubHelper.java Mon Feb 23 16:53:32 2009
@@ -16,10 +16,10 @@
*/
package cisco.uc.cuae.etchrouter;
-import etch.bindings.java.msg.Message;
-import etch.bindings.java.support.DeliveryService;
-import etch.bindings.java.support.StubHelper;
-import etch.util.core.Who;
+import org.apache.etch.bindings.java.msg.Message;
+import org.apache.etch.bindings.java.support.DeliveryService;
+import org.apache.etch.bindings.java.support.StubHelper;
+import org.apache.etch.util.core.Who;
/**
*
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterManager.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterManager.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterManager.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterManager.java Mon Feb 23 16:53:32 2009
@@ -38,17 +38,17 @@
import cisco.uc.cuae.etchrouter.utils.StructValueImportExportHelper;
import cisco.uc.cuae.etchrouter.utils.XmlBindingData;
import cisco.uc.cuae.etchrouter.utils.XmlBindingDataParser;
-import etch.bindings.java.msg.Direction;
-import etch.bindings.java.msg.Field;
-import etch.bindings.java.msg.Message;
-import etch.bindings.java.msg.StructValue;
-import etch.bindings.java.msg.Type;
-import etch.bindings.java.support.DeliveryService;
-import etch.bindings.java.support.Mailbox;
-import etch.bindings.java.support.ServerFactory;
-import etch.util.core.Who;
-import etch.util.core.io.Session;
-import etch.util.core.io.Transport;
+import org.apache.etch.bindings.java.msg.Direction;
+import org.apache.etch.bindings.java.msg.Field;
+import org.apache.etch.bindings.java.msg.Message;
+import org.apache.etch.bindings.java.msg.StructValue;
+import org.apache.etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.support.DeliveryService;
+import org.apache.etch.bindings.java.support.Mailbox;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.util.core.Who;
+import org.apache.etch.util.core.io.Session;
+import org.apache.etch.util.core.io.Transport;
/**
* Main class for the Etch Router service
@@ -534,7 +534,7 @@
return _localMethodsMap.get( aType )!=null;
}
- private Transport<ServerFactory> _listener = null;
+ private ServerFactory _listener = null;
private PluginStateMonitor _pluginMon = null;
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterManagerHelper.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterManagerHelper.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterManagerHelper.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterManagerHelper.java Mon Feb 23 16:53:32 2009
@@ -17,14 +17,18 @@
package cisco.uc.cuae.etchrouter;
import cisco.uc.cuae.etchrouter.ConnectionStackInfo.ConnectionType;
-import etch.bindings.java.msg.ValueFactory;
-import etch.bindings.java.support.DefaultServerFactory;
-import etch.bindings.java.support.DeliveryService;
-import etch.bindings.java.support.Pool;
-import etch.bindings.java.support.ServerFactory;
-import etch.bindings.java.support.TransportHelper;
-import etch.util.Resources;
-import etch.util.core.io.Transport;
+import org.apache.etch.bindings.java.msg.ValueFactory;
+import org.apache.etch.bindings.java.support.DefaultServerFactory;
+import org.apache.etch.bindings.java.support.DeliveryService;
+import org.apache.etch.bindings.java.support.Pool;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.bindings.java.support.TransportHelper;
+import org.apache.etch.bindings.java.transport.DefaultDeliveryService;
+import org.apache.etch.bindings.java.transport.MailboxManager;
+import org.apache.etch.bindings.java.transport.PlainMailboxManager;
+import org.apache.etch.bindings.java.transport.TransportMessage;
+import org.apache.etch.util.Resources;
+import org.apache.etch.util.core.io.Transport;
/**
*
@@ -43,31 +47,43 @@
* @return
* @throws Exception
*/
- public static Transport<ServerFactory> newListener( final EtchRouterManager routerMgr, final String uri,
+ public static ServerFactory newListener( final EtchRouterManager routerMgr, final String uri,
Resources resources )
throws Exception
{
final Resources res = initResources( resources );
res.put( EtchRouterManager._ETCH_ROUTER_MANAGER, routerMgr );
- return EtchRouterMgrTransportFactory.getListener( uri, res,
- new DefaultServerFactory( routerMgr )
- {
- public void newServer( DeliveryService d, ValueFactory vf ) throws Exception
+ final Transport<ServerFactory> listener = EtchRouterMgrTransportFactory.getListener( uri, res );
+
+ return new DefaultServerFactory( listener, routerMgr )
+ {
+ public void newServer( String uri, Resources resources,
+ TransportMessage transport ) throws Exception
{
+ ValueFactory vf = (ValueFactory) resources.get( Transport.VALUE_FACTORY );
+ MailboxManager x = new PlainMailboxManager( transport, uri, res );
+ DeliveryService d = new DefaultDeliveryService( x, uri, res );
ConnectionStackInfo info = routerMgr.getConnectionStackInfo( d );
ERRemoteClient client = new ERRemoteClient( d, vf, routerMgr, info );
ImplServer server = new ImplServer( client, routerMgr );
Pool qp = (Pool) res.get( QUEUED_POOL );
Pool fp = (Pool) res.get( FREE_POOL );
new ERStub( d, server, qp, fp );
+ client._start();
}
public ValueFactory newValueFactory()
{
return new DynamicValueFactory( uri );
}
- } );
+
+ @Override
+ public String toString()
+ {
+ return "PerfHelper.ServerFactory/" + listener;
+ }
+ };
}
/**
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterMessageFilter.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterMessageFilter.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterMessageFilter.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterMessageFilter.java Mon Feb 23 16:53:32 2009
@@ -23,14 +23,14 @@
import cisco.uc.cuae.etchrouter.ConnectionStackInfo.ConnectionType;
import cisco.uc.cuae.etchrouter.plugin.PluginGroup;
import cisco.uc.cuae.etchrouter.plugin.PluginMemberConnection;
-import etch.bindings.java.msg.Direction;
-import etch.bindings.java.msg.Message;
-import etch.bindings.java.msg.Type;
-import etch.bindings.java.transport.SessionMessage;
-import etch.bindings.java.transport.TransportMessage;
-import etch.util.Resources;
-import etch.util.URL;
-import etch.util.core.Who;
+import org.apache.etch.bindings.java.msg.Direction;
+import org.apache.etch.bindings.java.msg.Message;
+import org.apache.etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.transport.SessionMessage;
+import org.apache.etch.bindings.java.transport.TransportMessage;
+import org.apache.etch.util.Resources;
+import org.apache.etch.util.URL;
+import org.apache.etch.util.core.Who;
/**
*
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterMgrTransportFactory.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterMgrTransportFactory.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterMgrTransportFactory.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/EtchRouterMgrTransportFactory.java Mon Feb 23 16:53:32 2009
@@ -20,26 +20,26 @@
import javax.net.ssl.SSLSocket;
-import etch.bindings.java.msg.ValueFactory;
-import etch.bindings.java.support.DeliveryService;
-import etch.bindings.java.support.ServerFactory;
-import etch.bindings.java.transport.DefaultDeliveryService;
-import etch.bindings.java.transport.MailboxManager;
-import etch.bindings.java.transport.Messagizer;
-import etch.bindings.java.transport.PlainMailboxManager;
-import etch.bindings.java.transport.TcpTransportFactory;
-import etch.bindings.java.transport.TransportMessage;
-import etch.util.Resources;
-import etch.util.URL;
-import etch.util.core.io.Packetizer;
-import etch.util.core.io.SessionListener;
-import etch.util.core.io.TcpConnection;
-import etch.util.core.io.TcpListener;
-import etch.util.core.io.TlsConnection;
-import etch.util.core.io.TlsListener;
-import etch.util.core.io.Transport;
-import etch.util.core.io.TransportData;
-import etch.util.core.io.TransportPacket;
+import org.apache.etch.bindings.java.msg.ValueFactory;
+import org.apache.etch.bindings.java.support.DeliveryService;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.bindings.java.transport.DefaultDeliveryService;
+import org.apache.etch.bindings.java.transport.MailboxManager;
+import org.apache.etch.bindings.java.transport.Messagizer;
+import org.apache.etch.bindings.java.transport.PlainMailboxManager;
+import org.apache.etch.bindings.java.transport.TcpTransportFactory;
+import org.apache.etch.bindings.java.transport.TransportMessage;
+import org.apache.etch.util.Resources;
+import org.apache.etch.util.URL;
+import org.apache.etch.util.core.io.Packetizer;
+import org.apache.etch.util.core.io.SessionListener;
+import org.apache.etch.util.core.io.TcpConnection;
+import org.apache.etch.util.core.io.TcpListener;
+import org.apache.etch.util.core.io.TlsConnection;
+import org.apache.etch.util.core.io.TlsListener;
+import org.apache.etch.util.core.io.Transport;
+import org.apache.etch.util.core.io.TransportData;
+import org.apache.etch.util.core.io.TransportPacket;
/**
*
@@ -65,6 +65,7 @@
return f;
}
+ // TODO these methods should not be here. they come from Transport.
static public DeliveryService getTransport( String uri,
Resources resources ) throws Exception
{
@@ -73,12 +74,13 @@
return f.newTransport( uri, resources );
}
+ // TODO these methods should not be here. they come from Transport.
static public Transport<ServerFactory> getListener( String uri,
- Resources resources, ServerFactory factory ) throws Exception
+ Resources resources ) throws Exception
{
URL u = new URL( uri );
EtchRouterMgrTransportFactory f = getFactoryByScheme( u.getScheme(), uri );
- return f.newListener( uri, resources, factory );
+ return f.newListener( uri, resources );
}
/**
@@ -143,31 +145,29 @@
@SuppressWarnings("unchecked")
@Override
- public Transport<ServerFactory> newListener( final String uri, final Resources resources, final ServerFactory factory )
+ public Transport<ServerFactory> newListener( final String uri, final Resources resources )
throws Exception
{
URL u = new URL( uri );
- Transport<SessionListener> l;
+ Transport<SessionListener<Socket>> l;
if (_isSecure)
l = new TlsListener( u, resources );
else
l = new TcpListener( u, resources );
- MySessionListener b = new MySessionListener( l, uri, resources );
- b.setSession( factory );
- return b;
+ return new MySessionListener( l, uri, resources );
}
- private class MySessionListener implements Transport<ServerFactory>, SessionListener
+ private class MySessionListener implements Transport<ServerFactory>, SessionListener<Socket>
{
/**
* @param transport
* @param uri
* @param resources
*/
- public MySessionListener( Transport<SessionListener> transport, String uri, Resources resources )
+ public MySessionListener( Transport<SessionListener<Socket>> transport, String uri, Resources resources )
{
this.transport = transport;
this.uri = uri;
@@ -176,7 +176,7 @@
transport.setSession( this );
}
- private final Transport<SessionListener> transport;
+ private final Transport<SessionListener<Socket>> transport;
private final String uri;
@@ -218,11 +218,9 @@
ValueFactory vf = session.newValueFactory();
r.put( Transport.VALUE_FACTORY, vf );
- DeliveryService d = newTransport( uri, r );
-
- session.newServer( d, vf );
+ TransportMessage t = newTransport( uri, r );
- d.transportControl( Transport.START, null );
+ session.newServer( uri, r, t );
}
public Object sessionQuery( Object query ) throws Exception
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ImplClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ImplClient.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ImplClient.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ImplClient.java Mon Feb 23 16:53:32 2009
@@ -16,7 +16,7 @@
*/
package cisco.uc.cuae.etchrouter;
-import etch.bindings.java.support.ObjSession;
+import org.apache.etch.bindings.java.support.ObjSession;
public class ImplClient extends ImplBase implements ObjSession
{
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ImplServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ImplServer.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ImplServer.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/ImplServer.java Mon Feb 23 16:53:32 2009
@@ -16,7 +16,7 @@
*/
package cisco.uc.cuae.etchrouter;
-import etch.bindings.java.support.ObjSession;
+import org.apache.etch.bindings.java.support.ObjSession;
/**
*
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/PluginInstallInfo.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/PluginInstallInfo.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/PluginInstallInfo.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/PluginInstallInfo.java Mon Feb 23 16:53:32 2009
@@ -25,7 +25,7 @@
import java.util.Properties;
import java.util.Set;
-import etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.Type;
/**
* Class
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/LocalEnumImportExportHelper.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/LocalEnumImportExportHelper.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/LocalEnumImportExportHelper.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/LocalEnumImportExportHelper.java Mon Feb 23 16:53:32 2009
@@ -21,9 +21,9 @@
import java.util.List;
import java.util.Map;
-import etch.bindings.java.msg.StructValue;
-import etch.bindings.java.msg.Type;
-import etch.bindings.java.msg.ValueFactory;
+import org.apache.etch.bindings.java.msg.StructValue;
+import org.apache.etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.ValueFactory;
public class LocalEnumImportExportHelper extends LocalTypeImportExportHelper
{
@@ -33,7 +33,7 @@
private Method _nameMethod = null;
- private Map<String, etch.bindings.java.msg.Field> _fieldMap = null;
+ private Map<String, org.apache.etch.bindings.java.msg.Field> _fieldMap = null;
public LocalEnumImportExportHelper( Type enumType, List<String> entryValues )
throws Exception
@@ -54,7 +54,7 @@
"The number of declared enum fields in Enum type '%s' is %s, but the size of entry value list is %s",
typeName, enumValues.length, _entryValues.size() ));
_enumConstMap = new HashMap<String, Object>(_entryValues.size());
- _fieldMap = new HashMap<String, etch.bindings.java.msg.Field>();
+ _fieldMap = new HashMap<String, org.apache.etch.bindings.java.msg.Field>();
_nameMethod = _typeClass.getMethod( "name", null );
for (int i=0; i<enumValues.length; i++)
{
@@ -62,7 +62,7 @@
if (!_entryValues.contains( name ))
throw new Exception(String.format( "The declared field '%s' in enum type '%s' is not included in the entry value list", name, typeName ));
_enumConstMap.put( name, enumValues[i] );
- _fieldMap.put( name, new etch.bindings.java.msg.Field(name) );
+ _fieldMap.put( name, new org.apache.etch.bindings.java.msg.Field(name) );
}
}
@@ -84,7 +84,7 @@
public Object importValue( StructValue struct )
{
- etch.bindings.java.msg.Field key = struct.keySet().iterator().next();
+ org.apache.etch.bindings.java.msg.Field key = struct.keySet().iterator().next();
return _enumConstMap.get( key.getName() );
}
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/LocalStructImportExportHelper.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/LocalStructImportExportHelper.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/LocalStructImportExportHelper.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/LocalStructImportExportHelper.java Mon Feb 23 16:53:32 2009
@@ -21,16 +21,16 @@
import java.util.List;
import java.util.Map;
-import etch.bindings.java.msg.StructValue;
-import etch.bindings.java.msg.Type;
-import etch.bindings.java.msg.ValueFactory;
+import org.apache.etch.bindings.java.msg.StructValue;
+import org.apache.etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.ValueFactory;
public class LocalStructImportExportHelper extends LocalTypeImportExportHelper
{
private List<String> _fieldNames = null;
- private Map<String, etch.bindings.java.msg.Field> _fieldMap = null;
+ private Map<String, org.apache.etch.bindings.java.msg.Field> _fieldMap = null;
private Map<String, java.lang.reflect.Field> _reflectFieldMap = null;
@@ -55,14 +55,14 @@
throw new Exception(String.format(
"The number of public fields in class type '%s' is %s, but the size of field name list is %s",
typeName, publicFields.length, _fieldNames.size() ));
- _fieldMap = new HashMap<String, etch.bindings.java.msg.Field>(publicFields.length);
+ _fieldMap = new HashMap<String, org.apache.etch.bindings.java.msg.Field>(publicFields.length);
_reflectFieldMap = new HashMap<String, java.lang.reflect.Field>(publicFields.length);
for (java.lang.reflect.Field reflectField : publicFields)
{
String name = reflectField.getName();
if (!_fieldNames.contains( name ))
throw new Exception(String.format( "The public field '%s' in class type '%s' is not included in the field name list", name, typeName ));
- _fieldMap.put( name, new etch.bindings.java.msg.Field(name) );
+ _fieldMap.put( name, new org.apache.etch.bindings.java.msg.Field(name) );
_reflectFieldMap.put( name, reflectField );
}
}
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/LocalTypeImportExportHelper.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/LocalTypeImportExportHelper.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/LocalTypeImportExportHelper.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/LocalTypeImportExportHelper.java Mon Feb 23 16:53:32 2009
@@ -16,8 +16,8 @@
*/
package cisco.uc.cuae.etchrouter.utils;
-import etch.bindings.java.msg.ImportExportHelper;
-import etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.ImportExportHelper;
+import org.apache.etch.bindings.java.msg.Type;
public abstract class LocalTypeImportExportHelper implements ImportExportHelper
{
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/StructValueImportExportHelper.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/StructValueImportExportHelper.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/StructValueImportExportHelper.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/StructValueImportExportHelper.java Mon Feb 23 16:53:32 2009
@@ -16,9 +16,9 @@
*/
package cisco.uc.cuae.etchrouter.utils;
-import etch.bindings.java.msg.ImportExportHelper;
-import etch.bindings.java.msg.StructValue;
-import etch.bindings.java.msg.ValueFactory;
+import org.apache.etch.bindings.java.msg.ImportExportHelper;
+import org.apache.etch.bindings.java.msg.StructValue;
+import org.apache.etch.bindings.java.msg.ValueFactory;
public class StructValueImportExportHelper implements ImportExportHelper
{
Modified: incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/XmlBindingDataParser.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/XmlBindingDataParser.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/XmlBindingDataParser.java (original)
+++ incubator/etch/branches/router/services/router/src/main/java/cisco/uc/cuae/etchrouter/utils/XmlBindingDataParser.java Mon Feb 23 16:53:32 2009
@@ -26,23 +26,23 @@
import java.util.logging.Logger;
import cisco.uc.cuae.etchrouter.xml.Module;
-import etch.bindings.java.msg.AsyncMode;
-import etch.bindings.java.msg.Direction;
-import etch.bindings.java.msg.Type;
-import etch.bindings.java.msg.Validator;
-import etch.bindings.java.support.DefaultValueFactory;
-import etch.bindings.java.support.Validator_StructValue;
-import etch.bindings.java.support.Validator_boolean;
-import etch.bindings.java.support.Validator_byte;
-import etch.bindings.java.support.Validator_custom;
-import etch.bindings.java.support.Validator_double;
-import etch.bindings.java.support.Validator_float;
-import etch.bindings.java.support.Validator_int;
-import etch.bindings.java.support.Validator_long;
-import etch.bindings.java.support.Validator_object;
-import etch.bindings.java.support.Validator_short;
-import etch.bindings.java.support.Validator_string;
-import etch.bindings.java.support.Validator_void;
+import org.apache.etch.bindings.java.msg.AsyncMode;
+import org.apache.etch.bindings.java.msg.Direction;
+import org.apache.etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.Validator;
+import org.apache.etch.bindings.java.support.DefaultValueFactory;
+import org.apache.etch.bindings.java.support.Validator_StructValue;
+import org.apache.etch.bindings.java.support.Validator_boolean;
+import org.apache.etch.bindings.java.support.Validator_byte;
+import org.apache.etch.bindings.java.support.Validator_custom;
+import org.apache.etch.bindings.java.support.Validator_double;
+import org.apache.etch.bindings.java.support.Validator_float;
+import org.apache.etch.bindings.java.support.Validator_int;
+import org.apache.etch.bindings.java.support.Validator_long;
+import org.apache.etch.bindings.java.support.Validator_object;
+import org.apache.etch.bindings.java.support.Validator_short;
+import org.apache.etch.bindings.java.support.Validator_string;
+import org.apache.etch.bindings.java.support.Validator_void;
/**
*
@@ -203,7 +203,7 @@
for (Module.Service.Enums.Enum.Entry entry : entries)
{
entryValues.add( entry.getValue() );
- myType.putValidator( new etch.bindings.java.msg.Field( entry.getValue()), etch.bindings.java.support.Validator_boolean.get( 0 ) );
+ myType.putValidator( new org.apache.etch.bindings.java.msg.Field( entry.getValue()), org.apache.etch.bindings.java.support.Validator_boolean.get( 0 ) );
}
try
{
@@ -427,10 +427,10 @@
{
if (isResultMethod)
{
- myType.putValidator( DefaultValueFactory._mf__inReplyTo, etch.bindings.java.support.Validator_long.get( 0 ) );
- myType.putValidator( DefaultValueFactory._mf_result, etch.bindings.java.support.Validator_RuntimeException.get() );
+ myType.putValidator( DefaultValueFactory._mf__inReplyTo, org.apache.etch.bindings.java.support.Validator_long.get( 0 ) );
+ myType.putValidator( DefaultValueFactory._mf_result, org.apache.etch.bindings.java.support.Validator_RuntimeException.get() );
}
- myType.putValidator( DefaultValueFactory._mf__messageId, etch.bindings.java.support.Validator_long.get( 0 ) );
+ myType.putValidator( DefaultValueFactory._mf__messageId, org.apache.etch.bindings.java.support.Validator_long.get( 0 ) );
List<cisco.uc.cuae.etchrouter.xml.Field> myfields = mymethod.getField();
resolveFieldValidators( myType, myfields);
if (isResultMethod) return;
@@ -473,7 +473,7 @@
String isPrimitive = myfield.getIsPrimitiveType();
String typeName = myfield.getType();
Validator validator = getWellknownValidator(typeName, nDims);
- etch.bindings.java.msg.Field thisField = new etch.bindings.java.msg.Field(fieldName);
+ org.apache.etch.bindings.java.msg.Field thisField = new org.apache.etch.bindings.java.msg.Field(fieldName);
if (validator!=null)
{
myType.putValidator( thisField, validator );
Modified: incubator/etch/branches/router/services/router/src/test/java/cisco/uc/cuae/etchrouter/test/utils/PluginTestServerRunner.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/router/services/router/src/test/java/cisco/uc/cuae/etchrouter/test/utils/PluginTestServerRunner.java?rev=747079&r1=747078&r2=747079&view=diff
==============================================================================
--- incubator/etch/branches/router/services/router/src/test/java/cisco/uc/cuae/etchrouter/test/utils/PluginTestServerRunner.java (original)
+++ incubator/etch/branches/router/services/router/src/test/java/cisco/uc/cuae/etchrouter/test/utils/PluginTestServerRunner.java Mon Feb 23 16:53:32 2009
@@ -21,8 +21,8 @@
import cisco.uc.cuae.etchrouter.test.plugin.RemoteTestPluginClient;
import cisco.uc.cuae.etchrouter.test.plugin.TestPluginHelper;
import cisco.uc.cuae.etchrouter.test.plugin.TestPluginServer;
-import etch.bindings.java.support.ServerFactory;
-import etch.util.core.io.Transport;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.util.core.io.Transport;
public class PluginTestServerRunner implements TestPluginHelper.TestPluginServerFactory
{