hammant 2003/02/17 13:23:10
Modified: instrument-manager ant.properties.sample build.xml
default.properties
instrument-manager/src/java/org/apache/excalibur/instrument/manager/altrmi
InstrumentManagerAltrmiConnector.java
InstrumentManagerAltrmiServer.java
Added: instrument-manager/lib altrmi-common-0.9.1.jar
altrmi-server-impl-0.9.1.jar
altrmi-server-interfaces-0.9.1.jar
Log:
AltRMI moved from Excalibur
Revision Changes Path
1.11 +6 -6 avalon-excalibur/instrument-manager/ant.properties.sample
Index: ant.properties.sample
===================================================================
RCS file: /home/cvs/avalon-excalibur/instrument-manager/ant.properties.sample,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ant.properties.sample 8 Feb 2003 14:40:39 -0000 1.10
+++ ant.properties.sample 17 Feb 2003 21:23:09 -0000 1.11
@@ -31,11 +31,11 @@
avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
# ----- AltRMI -----
-excalibur-altrmi.home=${basedir}/../altrmi/dist
-excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common-0.7.jar
-excalibur-altrmi-server-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-impl-0.7.jar
-excalibur-altrmi-server-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-interfaces-0.7.jar
-excalibur-altrmi-generator.jar=${excalibur-altrmi.home}/excalibur-altrmi-generator-0.7.jar
+altrmi.home=${basedir}
+altrmi-common.jar=${altrmi.home}/altrmi-common-0.9.1.jar
+altrmi-server-impl.jar=${altrmi.home}/altrmi-server-impl-0.9.1.jar
+altrmi-server-interfaces.jar=${altrmi.home}/altrmi-server-interfaces-0.9.1.jar
+altrmi-generator.jar=${altrmi.home}/altrmi-generator-0.9.1.jar
# ----- Excalibur Instrument -----
excalibur-instrument.home=${basedir}/../instrument/dist
1.34 +4 -5 avalon-excalibur/instrument-manager/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/instrument-manager/build.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- build.xml 29 Jan 2003 14:07:40 -0000 1.33
+++ build.xml 17 Feb 2003 21:23:09 -0000 1.34
@@ -13,9 +13,9 @@
<path id="project.class.path">
<pathelement location="${build.classes}"/>
<pathelement location="${avalon-framework.jar}"/>
- <pathelement location="${excalibur-altrmi-common.jar}"/>
- <pathelement location="${excalibur-altrmi-server-impl.jar}"/>
- <pathelement location="${excalibur-altrmi-server-interfaces.jar}"/>
+ <pathelement location="${altrmi-common.jar}"/>
+ <pathelement location="${altrmi-server-impl.jar}"/>
+ <pathelement location="${altrmi-server-interfaces.jar}"/>
<pathelement location="${excalibur-instrument.jar}"/>
<pathelement location="${checkstyle.jar}"/>
<pathelement path="${java.class.path}"/>
@@ -39,7 +39,6 @@
<target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkAltrmiServer"/>
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkInstrument"/>
</target>
@@ -54,7 +53,7 @@
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the source
code">
- <available classname="org.apache.excalibur.altrmi.server.ServerException"
+ <available classname="org.apache.altrmi.server.ServerException"
property="altrmi.present">
<classpath refid="project.class.path"/>
</available>
1.14 +4 -4 avalon-excalibur/instrument-manager/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/instrument-manager/default.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- default.properties 6 Feb 2003 13:38:32 -0000 1.13
+++ default.properties 17 Feb 2003 21:23:09 -0000 1.14
@@ -22,10 +22,10 @@
avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
# ----- AltRMI -----
-excalibur-altrmi.home=${basedir}/../altrmi/dist
-excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common-0.9.jar
-excalibur-altrmi-server-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-impl-0.9.jar
-excalibur-altrmi-server-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-interfaces-0.9.jar
+altrmi.home=${basedir}
+altrmi-common.jar=${altrmi.home}/lib/altrmi-common-0.9.1.jar
+altrmi-server-impl.jar=${altrmi.home}/lib/altrmi-server-impl-0.9.1.jar
+altrmi-server-interfaces.jar=${altrmi.home}/lib/altrmi-server-interfaces-0.9.1.jar
# ----- Excalibur Instrument -----
excalibur-instrument.home=${basedir}/../instrument/dist
1.3 +15 -15
avalon-excalibur/instrument-manager/src/java/org/apache/excalibur/instrument/manager/altrmi/InstrumentManagerAltrmiConnector.java
Index: InstrumentManagerAltrmiConnector.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/instrument-manager/src/java/org/apache/excalibur/instrument/manager/altrmi/InstrumentManagerAltrmiConnector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InstrumentManagerAltrmiConnector.java 14 Oct 2002 15:17:16 -0000 1.2
+++ InstrumentManagerAltrmiConnector.java 17 Feb 2003 21:23:09 -0000 1.3
@@ -21,9 +21,9 @@
import org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
import
org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
-import org.apache.excalibur.altrmi.server.PublicationDescription;
-import org.apache.excalibur.altrmi.server.impl.AbstractServer;
-import
org.apache.excalibur.altrmi.server.impl.socket.CompleteSocketCustomStreamServer;
+import org.apache.altrmi.server.PublicationDescription;
+import org.apache.altrmi.server.impl.AbstractServer;
+import org.apache.altrmi.server.impl.socket.CompleteSocketCustomStreamServer;
/**
*
@@ -37,11 +37,11 @@
{
/** The default port. */
public static final int DEFAULT_PORT = 15555;
-
+
private DefaultInstrumentManager m_manager;
private int m_port;
private AbstractServer m_server;
-
+
/*---------------------------------------------------------------
* Constructors
*-------------------------------------------------------------*/
@@ -51,7 +51,7 @@
public InstrumentManagerAltrmiConnector()
{
}
-
+
/*---------------------------------------------------------------
* InstrumentManagerConnector Methods
*-------------------------------------------------------------*/
@@ -64,7 +64,7 @@
{
m_manager = manager;
}
-
+
/*---------------------------------------------------------------
* Configurable Methods
*-------------------------------------------------------------*/
@@ -73,7 +73,7 @@
{
m_port = configuration.getAttributeAsInteger( "port", DEFAULT_PORT );
}
-
+
/*---------------------------------------------------------------
* Startable Methods
*-------------------------------------------------------------*/
@@ -82,24 +82,24 @@
{
getLogger().debug( "Starting Instrument Manager Altrmi Connector" );
InstrumentManagerClientLocalImpl client = new
InstrumentManagerClientLocalImpl( m_manager );
-
+
// Create the socket server
m_server = new CompleteSocketCustomStreamServer( m_port );
-
+
Class[] additionalFacadeClasses = new Class[]
{
InstrumentableDescriptor.class,
InstrumentDescriptor.class,
InstrumentSampleDescriptor.class
};
-
- m_server.publish( client, "InstrumentManagerClient",
+
+ m_server.publish( client, "InstrumentManagerClient",
new PublicationDescription( InstrumentManagerClient.class,
additionalFacadeClasses ) );
-
+
m_server.start();
getLogger().info( "Instrument Manager Altrmi Connector listening on port: "
+ m_port );
}
-
+
public void stop()
throws Exception
{
1.3 +17 -17
avalon-excalibur/instrument-manager/src/java/org/apache/excalibur/instrument/manager/altrmi/InstrumentManagerAltrmiServer.java
Index: InstrumentManagerAltrmiServer.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/instrument-manager/src/java/org/apache/excalibur/instrument/manager/altrmi/InstrumentManagerAltrmiServer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InstrumentManagerAltrmiServer.java 5 Jan 2003 23:28:20 -0000 1.2
+++ InstrumentManagerAltrmiServer.java 17 Feb 2003 21:23:09 -0000 1.3
@@ -16,11 +16,11 @@
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.excalibur.altrmi.server.ServerException;
-import org.apache.excalibur.altrmi.server.PublicationDescription;
-import org.apache.excalibur.altrmi.server.PublicationException;
-import org.apache.excalibur.altrmi.server.impl.AbstractServer;
-import
org.apache.excalibur.altrmi.server.impl.socket.CompleteSocketCustomStreamServer;
+import org.apache.altrmi.server.ServerException;
+import org.apache.altrmi.server.PublicationDescription;
+import org.apache.altrmi.server.PublicationException;
+import org.apache.altrmi.server.impl.AbstractServer;
+import org.apache.altrmi.server.impl.socket.CompleteSocketCustomStreamServer;
/**
*
@@ -36,10 +36,10 @@
{
/** The default port. */
public static final int DEFAULT_PORT = 15555;
-
+
private int m_port;
private AbstractServer m_server;
-
+
/*---------------------------------------------------------------
* Constructors
*-------------------------------------------------------------*/
@@ -48,34 +48,34 @@
{
this( manager, DEFAULT_PORT );
}
-
+
public InstrumentManagerAltrmiServer( DefaultInstrumentManager manager, int
port )
throws ServerException, PublicationException
{
m_port = port;
-
+
InstrumentManagerClientLocalImpl client = new
InstrumentManagerClientLocalImpl( manager );
-
+
System.out.println( "Creating CompleteSocketCustomStreamServer..." );
m_server = new CompleteSocketCustomStreamServer( port );
-
+
System.out.println( "Publishing InstrumentManagerClient..." );
-
+
Class[] additionalFacadeClasses = new Class[]
{
InstrumentableDescriptor.class,
InstrumentDescriptor.class,
InstrumentSampleDescriptor.class
};
-
- m_server.publish( client, "InstrumentManagerClient",
+
+ m_server.publish( client, "InstrumentManagerClient",
new PublicationDescription( InstrumentManagerClient.class,
additionalFacadeClasses ) );
-
+
System.out.println( "Starting CompleteSocketObjectStreamServer..." );
m_server.start();
System.out.println( "Started on port: " + port );
}
-
+
/*---------------------------------------------------------------
* Disposable Methods
*-------------------------------------------------------------*/
1.1 avalon-excalibur/instrument-manager/lib/altrmi-common-0.9.1.jar
<<Binary file>>
1.1
avalon-excalibur/instrument-manager/lib/altrmi-server-impl-0.9.1.jar
<<Binary file>>
1.1
avalon-excalibur/instrument-manager/lib/altrmi-server-interfaces-0.9.1.jar
<<Binary file>>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
