mcconnell 02/05/18 07:31:15
Modified: enterprise/time build.xml
enterprise/time/src/java/org/apache/time TimeProvider.java
Log:
updated to leverage comon/lib and Block independence
Revision Changes Path
1.7 +38 -18 jakarta-avalon-apps/enterprise/time/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/enterprise/time/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 14 May 2002 07:29:15 -0000 1.6
+++ build.xml 18 May 2002 14:31:15 -0000 1.7
@@ -86,8 +86,10 @@
<fileset dir="${orb.dist.path}">
<include name="*.jar" />
</fileset>
- <fileset dir="${tools.lib.path}">
- <include name="*.jar" />
+ <fileset dir="${common.path}/lib">
+ <include name="logkit.jar" />
+ <include name="avalon-framework.jar" />
+ <include name="excalibur-configuration.jar" />
</fileset>
</path>
@@ -243,29 +245,43 @@
</javadoc>
</target>
- <target name="loader.context">
- <available property="merlin.available"
file="${ant.home}/lib/merlin.jar"/>
- </target>
+ <target name="merlin.context">
+ <available property="merlin.available"
+ classname="org.apache.excalibur.merlin.ant.Load" >
+ <classpath>
+ <path refid="merlin.classpath"/>
+ </classpath>
+ </available>
+ </target>
+
+ <!-- Merlin execution -->
+
+ <path id="merlin.classpath">
+ <fileset dir="${common.path}/lib">
+ <include name="logkit.jar" />
+ <include name="avalon-framework.jar" />
+ <include name="excalibur-configuration.jar" />
+ <include name="excalibur-context.jar" />
+ <include name="merlin.jar" />
+ </fileset>
+ </path>
- <target name="loader.defintion" depends="loader.context"
if="merlin.available">
- <taskdef resource="merlin.properties"/>
+ <target name="merlin.defintion" depends="merlin.context"
if="merlin.available">
+ <taskdef resource="merlin.properties">
+ <classpath>
+ <path refid="merlin.classpath"/>
+ </classpath>
+ </taskdef>
</target>
- <target name="loader.validation" depends="loader.defintion"
unless="merlin.available">
+ <target name="merlin.validation" depends="merlin.defintion"
unless="merlin.available">
<echo>
-
- Merlin is not installed in your Ant library.
- In order to use the "load" task the following jar files
- must be added to your ${ant.home}/lib directory:
-
- - merlin.jar
- - avalon-framework.jar
- - logkit.jar
- - xerces.jar (pre JRE 1.4 only)
+ Ignoring load task.
+ Could not locate Merlin in the classpath.
</echo>
</target>
- <target name="demo" depends="loader.validation,time" if="merlin.available">
+ <target name="demo" depends="merlin.validation,time" if="merlin.available">
<echo message="Executing time service demo."/>
@@ -275,6 +291,10 @@
-->
<load target="org.apache.time.TimeProvider" priority="DEBUG"
disposal="${demo.disposal}" verbose="${demo.verbose}">
+
+ <classpath>
+ <path refid="merlin.classpath" />
+ </classpath>
<!--
For all of the jar files in the fileset, load the jar file
1.4 +2 -3
jakarta-avalon-apps/enterprise/time/src/java/org/apache/time/TimeProvider.java
Index: TimeProvider.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/enterprise/time/src/java/org/apache/time/TimeProvider.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TimeProvider.java 14 May 2002 07:29:15 -0000 1.3
+++ TimeProvider.java 18 May 2002 14:31:15 -0000 1.4
@@ -36,13 +36,12 @@
import org.apache.avalon.framework.activity.Executable;
import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.phoenix.Block;
import org.apache.orb.POAContext;
import org.apache.orb.util.IOR;
/**
- * <code>TimeBlock</code> compliant with the OMG CosTime interface
specification.
+ * <code>TimeProvider</code> compliant with the OMG CosTime interface
specification.
* <p><table border="1" cellpadding="3" cellspacing="0" width="100%">
* <tr bgcolor="#ccccff">
* <td colspan="2"><b><font size="+2">Lifecycle</font></b></td>
@@ -92,7 +91,7 @@
*/
public class TimeProvider extends TimeServicePOA
-implements Block, LogEnabled, Contextualizable, Configurable, Serviceable,
+implements LogEnabled, Contextualizable, Configurable, Serviceable,
Initializable, Startable, Executable, Disposable
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
