mcconnell 2002/09/06 23:53:11
Modified: enterprise/time build.xml
enterprise/time/src/etc time.mf
enterprise/time/src/java/org/apache/time Initializer.java
TimeProvider.java package.html
Log:
Upgrade of the implementation to support the excalibur/meta type descriptors and
Merlin packaged deployment descriptors.
Revision Changes Path
1.9 +0 -76 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 11 Jun 2002 04:25:34 -0000 1.8
+++ build.xml 7 Sep 2002 06:53:11 -0000 1.9
@@ -43,7 +43,6 @@
clean - destroy the build directory
build - invokes the general build target
dist - executes build, javadoc and support file creation
- demo - run the time server though it's full lifecycle
</echo>
</target>
@@ -89,7 +88,6 @@
<fileset dir="${common.path}/lib">
<include name="logkit.jar" />
<include name="avalon-framework.jar" />
- <include name="merlin.jar" />
</fileset>
</path>
@@ -243,80 +241,6 @@
<link href="${avalon.href}" />
<link href="${orb.href}" />
</javadoc>
- </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="merlin.jar" />
- </fileset>
- </path>
-
- <target name="merlin.defintion" depends="merlin.context" if="merlin.available">
- <taskdef resource="merlin.properties">
- <classpath>
- <path refid="merlin.classpath"/>
- </classpath>
- </taskdef>
- </target>
-
- <target name="merlin.validation" depends="merlin.defintion"
unless="merlin.available">
- <echo>
- Ignoring load task.
- Could not locate Merlin in the classpath.
- </echo>
- </target>
-
- <target name="demo" depends="merlin.validation,time" if="merlin.available">
-
- <echo message="Executing time service demo."/>
-
- <!--
- After loading jar files declared under a fileset, apply lifecycle
- pipeline processing to the class referenced in the target attribute.
- -->
-
- <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
- into the classloader.
- -->
-
- <fileset dir="${lib}">
- <include name="*.jar"/>
- </fileset>
-
- <fileset dir="${orb.lib.path}">
- <include name="*.jar"/>
- </fileset>
-
- <fileset dir="${orb.dist.path}">
- <include name="*.jar"/>
- </fileset>
-
- <fileset dir="${dist}">
- <include name="*.jar"/>
- </fileset>
-
- </load>
-
</target>
</project>
1.4 +0 -2 jakarta-avalon-apps/enterprise/time/src/etc/time.mf
Index: time.mf
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/enterprise/time/src/etc/time.mf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- time.mf 12 Mar 2002 22:18:02 -0000 1.3
+++ time.mf 7 Sep 2002 06:53:11 -0000 1.4
@@ -8,5 +8,3 @@
Implementation-Vendor: Apache Foundation
Implementation-Version: 1.0
-Name: org/apache/time/TimeProvider.class
-Avalon-Block: true
1.6 +1 -21
jakarta-avalon-apps/enterprise/time/src/java/org/apache/time/Initializer.java
Index: Initializer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/enterprise/time/src/java/org/apache/time/Initializer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Initializer.java 14 May 2002 07:29:15 -0000 1.5
+++ Initializer.java 7 Sep 2002 06:53:11 -0000 1.6
@@ -11,9 +11,6 @@
import org.omg.PortableInterceptor.ORBInitializer;
import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -29,28 +26,13 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephen McConnell</a>
*/
public class Initializer extends LoggableLocalObject
-implements Configurable, Contextualizable, ORBInitializer, Disposable
+implements Configurable, ORBInitializer, Disposable
{
private Configuration m_config;
- private Context m_context;
private TimeProvider m_target;
private boolean m_initialized = false;
- //=================================================================
- // Contextualizable
- //=================================================================
-
- /**
- * Method invoked by the Apache ORB initializer to declare the runtime context.
- * @param context Context runtime application context
- * @exception ContextException if a context related error occurs
- */
- public void contextualize( Context context ) throws ContextException
- {
- m_context = context;
- }
-
//=======================================================================
// Configurable
//=======================================================================
@@ -105,7 +87,6 @@
}
m_target = new TimeProvider();
m_target.enableLogging( getLogger().getChildLogger("provider") );
- m_target.contextualize( m_context );
m_target.configure( m_config.getChild("provider") );
DefaultServiceManager manager = new DefaultServiceManager();
manager.put( POAContext.POA_KEY, new DefaultPOAContext( root, null ) );
@@ -181,7 +162,6 @@
m_target.dispose();
m_target = null;
m_config = null;
- m_context = null;
}
}
}
1.5 +3 -32
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TimeProvider.java 18 May 2002 14:31:15 -0000 1.4
+++ TimeProvider.java 7 Sep 2002 06:53:11 -0000 1.5
@@ -65,11 +65,6 @@
* </pre>
* </td></tr>
* <tr>
- * <td valign="top">Contextualizable</td>
- * <td>
- * The <code>Context</code> value passed to the provider is used to determin if
- * the time server has deplyed as an Initializer in which case the provider will
- * be registered as an initial reference. Note: Initializer currently
disabled.</td></tr>
* <tr><td width="20%">Initalizable</td>
* <td>
* Creation of the Time POA and optional registration of the service as an initial
reference.
@@ -91,7 +86,7 @@
*/
public class TimeProvider extends TimeServicePOA
-implements LogEnabled, Contextualizable, Configurable, Serviceable,
+implements LogEnabled, Configurable, Serviceable,
Initializable, Startable, Executable, Disposable
{
@@ -105,12 +100,6 @@
private Logger m_logger;
/**
- * Application context.
- * (not used)
- */
- private Context m_context;
-
- /**
* Service static configuration.
*/
private Configuration m_config;
@@ -173,25 +162,6 @@
}
//=======================================================================
- // Contextualizable
- //=======================================================================
-
- /**
- * Set the component context.
- * @param context the component context
- * @exception ContextException if a context related exception occurs
- */
- public void contextualize( Context context )
- throws ContextException
- {
- if( getLogger().isDebugEnabled() )
- {
- getLogger().debug( "contextualization" );
- }
- m_context = context;
- }
-
- //=======================================================================
// Configurable
//=======================================================================
@@ -406,6 +376,7 @@
try
{
m_poa.the_POAManager().activate();
+ execute();
}
catch( Throwable e )
{
@@ -494,7 +465,6 @@
m_service = null;
m_config = null;
- m_context = null;
m_manager = null;
m_root = null;
m_poa = null;
@@ -586,5 +556,6 @@
DefaultTIO tio = new DefaultTIO(lower, upper);
return tio._this(this._orb());
}
+
}
1.3 +1 -2
jakarta-avalon-apps/enterprise/time/src/java/org/apache/time/package.html
Index: package.html
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/enterprise/time/src/java/org/apache/time/package.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- package.html 12 Mar 2002 22:18:02 -0000 1.2
+++ package.html 7 Sep 2002 06:53:11 -0000 1.3
@@ -1,7 +1,6 @@
<body>
<p>
-The <code>org.apache.time</code> package contains an component based implementation
of the
-<code>org.omg.CosTime.TimeService</code>.
+The <code>org.apache.time</code> package contains a
<code>org.omg.CosTime.TimeService</code> initializer and service implementation.
</p>
</body>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
