bloritsch 2002/07/29 09:51:14
Modified: instrument altrmiproxies.xml build.xml default.properties
Removed: instrument-client .cvsignore altrmiproxies.xml
ant.properties.sample build.xml default.properties
instrument-client/example .cvsignore ant.properties.sample
build.xml
instrument-client/example/bin client.bat client.sh
cpappend.bat
instrument-client/src/java/org/apache/avalon/excalibur/instrument/client
AbstractInternalFrame.java
AbstractOptionDialog.java
AbstractTabularOptionDialog.java ConnectDialog.java
CreateSampleDialog.java DesktopPane.java
InstrumentClientFrame.java
InstrumentManagerConnection.java
InstrumentManagerConnectionListener.java
InstrumentManagerFrame.java
InstrumentSampleFrame.java LargeMenu.java
LineChart.java Main.java MenuBar.java
instrument-client/src/xdocs index.xml menu.xml
instrument-client/src/xdocs/images Thumbs.db
instrument-client/src/xdocs/stylesheets project.xml
instrument-manager .cvsignore ant.properties.sample
build.xml default.properties
instrument-manager/example .cvsignore ant.properties.sample
build.xml
instrument-manager/example/bin cpappend.bat run.bat run.sh
instrument-manager/example/conf components.xml
instrument.xml logkit.xml roles.xml
instrument-manager/example/src/java/org/apache/avalon/excalibur/instrument/example
DefaultExampleInstrumentable.java
ExampleInstrumentable.java Main.java
instrument-manager/src/java/org/apache/avalon/excalibur/instrument/component
DefaultComponentHandler.java
InstrumentComponentHandler.java
InstrumentComponentManager.java
InstrumentComponentSelector.java
InstrumentDefaultComponentFactory.java
PoolableComponentHandler.java
ThreadSafeComponentHandler.java
instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager
AbstractInstrumentSample.java
AbstractValueInstrumentSample.java
CounterInstrumentSample.java
DefaultInstrumentManager.java
InstrumentDescriptorImpl.java
InstrumentManagerClientImpl.java
InstrumentProxy.java InstrumentSample.java
InstrumentSampleDescriptorImpl.java
InstrumentSampleFactory.java
InstrumentableDescriptorImpl.java
InstrumentableProxy.java
MaximumValueInstrumentSample.java
MeanValueInstrumentSample.java
MinimumValueInstrumentSample.java
instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/altrmi
InstrumentManagerAltrmiServer.java
instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/interfaces
CounterInstrumentListener.java
InstrumentDescriptor.java InstrumentListener.java
InstrumentManagerClient.java
InstrumentSampleDescriptor.java
InstrumentSampleListener.java
InstrumentSampleSnapshot.java
InstrumentableDescriptor.java
NoSuchInstrumentException.java
NoSuchInstrumentSampleException.java
NoSuchInstrumentableException.java
ValueInstrumentListener.java
instrument-manager/src/xdocs index.xml menu.xml
instrument-manager/src/xdocs/images Thumbs.db
instrument-manager/src/xdocs/stylesheets project.xml
Log:
final merge
Revision Changes Path
1.2 +18 -12 jakarta-avalon-excalibur/instrument/altrmiproxies.xml
Index: altrmiproxies.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument/altrmiproxies.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- altrmiproxies.xml 29 Jul 2002 16:05:18 -0000 1.1
+++ altrmiproxies.xml 29 Jul 2002 16:51:10 -0000 1.2
@@ -17,28 +17,34 @@
<taskdef name="altrmiproxies"
classname="org.apache.excalibur.altrmi.generator.ant.AltrmiProxyTask">
- <classpath refid="project.class.path" />
+ <classpath>
+ <path refid="project.class.path" />
+ <pathelement path="${build.manager.classes}"/>
+ </classpath>
</taskdef>
-
-
+
+
<!-- Generates the altrmi proxies used by the client. -->
<target name="altrmiproxies">
<mkdir dir="${build.genjava}"/>
-
+
<delete>
<fileset dir="${build.genjava}" includes="AltrmiGenerated*.java"/>
</delete>
<delete>
- <fileset dir="${build.classes}" includes="AltrmiGenerated*.class"/>
+ <fileset dir="${build.client.classes}"
includes="AltrmiGenerated*.class"/>
</delete>
-
+
<altrmiproxies genname="InstrumentManagerClient"
- srcgendir="${build.genjava}"
- classgendir="${build.classes}"
-
interfaces="org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentManagerClient"
-
additionalfacades="org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentableDescriptor,org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentDescriptor,org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor">
- <classpath refid="project.class.path" />
- </altrmiproxies>
+ srcgendir="${build.genjava}"
+ classgendir="${build.client.classes}"
+
interfaces="org.apache.excalibur.instrument.manager.interfaces.InstrumentManagerClient"
+
additionalfacades="org.apache.excalibur.instrument.manager.interfaces.InstrumentableDescriptor,org.apache.excalibur.instrument.manager.interfaces.InstrumentDescriptor,org.apache.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor">
+ <classpath>
+ <path refid="project.class.path" />
+ <pathelement path="${build.manager.classes}"/>
+ </classpath>
+ </altrmiproxies>
</target>
</project>
1.27 +6 -1 jakarta-avalon-excalibur/instrument/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument/build.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- build.xml 29 Jul 2002 16:27:06 -0000 1.26
+++ build.xml 29 Jul 2002 16:51:10 -0000 1.27
@@ -131,6 +131,11 @@
</target>
+ <!-- Generates the altrmi proxies used by the client. -->
+ <target name="altrmiproxies" depends="compile">
+ <ant antfile="altrmiproxies.xml" target="altrmiproxies"/>
+ </target>
+
<!-- Compiles the unit test source code -->
<target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
<mkdir dir="${build.testsrc}"/>
@@ -181,7 +186,7 @@
</target>
<!-- Creates all the .jar file -->
- <target name="jar" depends="compile, prepare-conf" description="Generates the
jar files">
+ <target name="jar" depends="compile, prepare-conf, altrmiproxies"
description="Generates the jar files">
<mkdir dir="${build.lib}"/>
1.8 +1 -0 jakarta-avalon-excalibur/instrument/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument/default.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- default.properties 29 Jul 2002 16:05:18 -0000 1.7
+++ default.properties 29 Jul 2002 16:51:10 -0000 1.8
@@ -63,6 +63,7 @@
build.manager.classes = ${build.dir}/managerclasses
build.tests = ${build.dir}/tests
build.reports = ${build.dir}/reports
+build.genjava="${build.dir}/genjava
# Set the properties for source directories
src.dir = ${basedir}/src
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
