You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by le...@apache.org on 2003/07/24 18:15:15 UTC
cvs commit: avalon-excalibur/instrument-manager/src/java/org/apache/excalibur/instrument/manager/altrmi InstrumentManagerAltrmiServer.java
leif 2003/07/24 09:15:15
Modified: instrument-manager build.xml default.properties
instrument-manager/src/java/org/apache/excalibur/instrument/manager/altrmi
InstrumentManagerAltrmiServer.java
Log:
altrmi was upgraded to 0.9.6 but somebody forgot to check to make sure things built :-/
Revision Changes Path
1.44 +15 -7 avalon-excalibur/instrument-manager/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/instrument-manager/build.xml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- build.xml 31 May 2003 15:48:19 -0000 1.43
+++ build.xml 24 Jul 2003 16:15:15 -0000 1.44
@@ -40,6 +40,11 @@
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkInstrument"/>
+
+ <available classname="org.apache.altrmi.server.ServerException"
+ property="altrmi.present">
+ <classpath refid="project.class.path"/>
+ </available>
</target>
<target name="dependencies-test" depends="dist-jar, dependencies"
@@ -48,15 +53,18 @@
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkJUnit"/>
</target>
-
+
+ <target name="warn-altrmi" depends="dependencies" unless="altrmi.present">
+ <echo message="**********************************************************************"/>
+ <echo message="WARNING - Version ${altrmi.version} of the altrmi libraries could not "/>
+ <echo message=" be found, the altrmi connector will be missing from the jar "/>
+ <echo message=" file."/>
+ <echo message="Expected: ${altrmi-common.jar}"/>
+ <echo message="**********************************************************************"/>
+ </target>
<!-- Compiles the source code -->
- <target name="compile" depends="dependencies" description="Compiles the source code">
-
- <available classname="org.apache.altrmi.server.ServerException"
- property="altrmi.present">
- <classpath refid="project.class.path"/>
- </available>
+ <target name="compile" depends="dependencies, warn-altrmi" description="Compiles the source code">
<mkdir dir="${build.classes}"/>
1.19 +4 -3 avalon-excalibur/instrument-manager/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/instrument-manager/default.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- default.properties 5 Mar 2003 04:03:24 -0000 1.18
+++ default.properties 24 Jul 2003 16:15:15 -0000 1.19
@@ -23,9 +23,10 @@
# ----- AltRMI -----
altrmi.home=${basedir}/../lib
-altrmi-common.jar=${altrmi.home}/altrmi-common-0.9.2.jar
-altrmi-server-impl.jar=${altrmi.home}/altrmi-server-impl-0.9.2.jar
-altrmi-server-interfaces.jar=${altrmi.home}/altrmi-server-interfaces-0.9.2.jar
+altrmi.version=0.9.6
+altrmi-common.jar=${altrmi.home}/altrmi-common-${altrmi.version}.jar
+altrmi-server-impl.jar=${altrmi.home}/altrmi-server-impl-${altrmi.version}.jar
+altrmi-server-interfaces.jar=${altrmi.home}/altrmi-server-interfaces-${altrmi.version}.jar
# ----- Excalibur Instrument -----
excalibur-instrument.home=${basedir}/../instrument/dist
1.7 +2 -2 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InstrumentManagerAltrmiServer.java 26 Feb 2003 17:20:53 -0000 1.6
+++ InstrumentManagerAltrmiServer.java 24 Jul 2003 16:15:15 -0000 1.7
@@ -97,7 +97,7 @@
InstrumentManagerClientLocalImpl client = new InstrumentManagerClientLocalImpl( manager );
System.out.println( "Creating CompleteSocketCustomStreamServer..." );
- m_server = new CompleteSocketCustomStreamServer( port );
+ m_server = new CompleteSocketCustomStreamServer.WithSimpleDefaults( port );
System.out.println( "Publishing InstrumentManagerClient..." );
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org