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/04/08 06:11:29 UTC
svn commit: r762855 - in
/incubator/etch/branches/name-service/services/ns/src:
main/java/etch/services/ns/ main/java/org/apache/etch/services/ns/support/
test/java/etch/services/ns/ test/java/org/apache/etch/services/ns/support/
Author: sccomer
Date: Tue Apr 7 17:06:35 2009
New Revision: 762855
URL: http://svn.apache.org/viewvc?rev=762855&view=rev
Log:
corrected some compilation problems.
Removed:
incubator/etch/branches/name-service/services/ns/src/main/java/etch/services/ns/
incubator/etch/branches/name-service/services/ns/src/test/java/etch/services/ns/
Modified:
incubator/etch/branches/name-service/services/ns/src/main/java/org/apache/etch/services/ns/support/DefaultNSLib.java
incubator/etch/branches/name-service/services/ns/src/main/java/org/apache/etch/services/ns/support/EtchTransportFactory.java
incubator/etch/branches/name-service/services/ns/src/test/java/org/apache/etch/services/ns/support/TestNSLib.java
Modified: incubator/etch/branches/name-service/services/ns/src/main/java/org/apache/etch/services/ns/support/DefaultNSLib.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/name-service/services/ns/src/main/java/org/apache/etch/services/ns/support/DefaultNSLib.java?rev=762855&r1=762854&r2=762855&view=diff
==============================================================================
--- incubator/etch/branches/name-service/services/ns/src/main/java/org/apache/etch/services/ns/support/DefaultNSLib.java (original)
+++ incubator/etch/branches/name-service/services/ns/src/main/java/org/apache/etch/services/ns/support/DefaultNSLib.java Tue Apr 7 17:06:35 2009
@@ -35,6 +35,9 @@
import org.apache.etch.util.core.io.Session;
+/**
+ * Default implementation of NSLib.
+ */
public class DefaultNSLib extends NSLib
{
private final static int INITIAL_ALARM_DELAY = 1;
@@ -69,7 +72,6 @@
return NameServiceHelper.newServer( nsUri, null,
new NameServiceHelper.NameServiceClientFactory()
{
- @Override
public NameServiceClient newNameServiceClient(
RemoteNameServiceServer server )
throws Exception
@@ -113,6 +115,11 @@
}
}
+ /**
+ * @param nsUri
+ * @return appropriate instance of RemoteNameServiceServer
+ * @throws Exception
+ */
public RemoteNameServiceServer getServer( String nsUri ) throws Exception
{
synchronized( serversByNsUri )
@@ -148,7 +155,6 @@
this.ttl = ttl;
}
- @Override
public int wakeup( AlarmManager manager, Object state, long due )
{
try
Modified: incubator/etch/branches/name-service/services/ns/src/main/java/org/apache/etch/services/ns/support/EtchTransportFactory.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/name-service/services/ns/src/main/java/org/apache/etch/services/ns/support/EtchTransportFactory.java?rev=762855&r1=762854&r2=762855&view=diff
==============================================================================
--- incubator/etch/branches/name-service/services/ns/src/main/java/org/apache/etch/services/ns/support/EtchTransportFactory.java (original)
+++ incubator/etch/branches/name-service/services/ns/src/main/java/org/apache/etch/services/ns/support/EtchTransportFactory.java Tue Apr 7 17:06:35 2009
@@ -94,7 +94,7 @@
/**
*
- * @param etchUri uri based on the etch scheme
+ * @param uri uri based on the etch scheme
* @param resources
*/
public EtchTransport( String uri, Resources resources )
@@ -108,26 +108,22 @@
}
- @Override
public void transportMessage( Who recipient, Message msg )
throws Exception
{
transport.transportMessage( recipient, msg );
}
- @Override
public SessionMessage getSession()
{
return session;
}
- @Override
public void setSession( SessionMessage session )
{
this.session = session;
}
- @Override
public void transportControl( Object control, Object value )
throws Exception
{
@@ -183,14 +179,12 @@
"to implement the control: " + control );
}
- @Override
public void transportNotify( Object event ) throws Exception
{
if ( transport != null )
transport.transportNotify( event );
}
- @Override
public Object transportQuery( Object query ) throws Exception
{
if ( transport != null )
@@ -201,21 +195,18 @@
}
- @Override
public boolean sessionMessage( Who sender, Message msg )
throws Exception
{
return session.sessionMessage( sender, msg );
}
- @Override
public void sessionControl( Object control, Object value )
throws Exception
{
session.sessionControl( control, value );
}
- @Override
public void sessionNotify( Object event ) throws Exception
{
/*
@@ -241,13 +232,11 @@
}
}
- @Override
public Object sessionQuery( Object query ) throws Exception
{
return session.sessionQuery( query );
}
- @Override
public int wakeup( AlarmManager manager, Object state, long due )
{
try
@@ -289,51 +278,44 @@
private ServerFactory session = new ServerFactory()
{
private ServerFactory _session;
- @Override
+
public void newServer( String arg0, Resources arg1,
TransportMessage arg2 ) throws Exception
{
_session.newServer( arg0, arg1, arg2 );
}
- @Override
public ValueFactory newValueFactory()
{
return _session.newValueFactory();
}
- @Override
public void sessionControl( Object arg0, Object arg1 )
throws Exception
{
_session.sessionControl( arg0, arg1 );
}
- @Override
public void sessionNotify( Object arg0 ) throws Exception
{
_session.sessionNotify( arg0 );
}
- @Override
public Object sessionQuery( Object arg0 ) throws Exception
{
return _session.sessionQuery( arg0 );
}
- @Override
public Session getSession()
{
return _session;
}
- @Override
public void setSession( Session arg0 )
{
_session = (ServerFactory)arg0;
}
- @Override
public void transportControl( Object arg0, Object arg1 )
throws Exception
{
@@ -341,21 +323,19 @@
}
- @Override
public void transportNotify( Object arg0 ) throws Exception
{
// TODO Auto-generated method stub
}
- @Override
public Object transportQuery( Object arg0 ) throws Exception
{
// TODO Auto-generated method stub
return null;
}
};
- @Override
+
public void transportControl( Object control, Object value )
throws Exception
{
@@ -379,25 +359,21 @@
}
}
- @Override
public void transportNotify( Object event ) throws Exception
{
transport.transportNotify( event );
}
- @Override
public Object transportQuery( Object query ) throws Exception
{
return transport.transportQuery( query );
}
- @Override
public ServerFactory getSession()
{
return (ServerFactory) session.getSession();
}
- @Override
public void setSession( ServerFactory session )
{
this.session.setSession( session );
Modified: incubator/etch/branches/name-service/services/ns/src/test/java/org/apache/etch/services/ns/support/TestNSLib.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/name-service/services/ns/src/test/java/org/apache/etch/services/ns/support/TestNSLib.java?rev=762855&r1=762854&r2=762855&view=diff
==============================================================================
--- incubator/etch/branches/name-service/services/ns/src/test/java/org/apache/etch/services/ns/support/TestNSLib.java (original)
+++ incubator/etch/branches/name-service/services/ns/src/test/java/org/apache/etch/services/ns/support/TestNSLib.java Tue Apr 7 17:06:35 2009
@@ -338,19 +338,16 @@
*/
private class MySession implements Session
{
- @Override
public void sessionControl( Object arg0, Object arg1 ) throws Exception
{
System.out.println( "session control" );
}
- @Override
public void sessionNotify( Object arg0 ) throws Exception
{
System.out.println( "session notify: " + arg0 );
}
- @Override
public Object sessionQuery( Object arg0 ) throws Exception
{
System.out.println( "sessionQuery: " + arg0 );