You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2002/09/11 14:47:26 UTC
cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix BlockContext.java BlockEvent.java AbstractBlock.java Block.java BlockListener.java Constants.java
donaldp 2002/09/11 05:47:26
Modified: . build.xml docs.xml
src/java/org/apache/avalon/phoenix BlockContext.java
BlockEvent.java
Added: src/compat/org/apache/avalon/phoenix AbstractBlock.java
Block.java BlockListener.java Constants.java
Removed: src/java/org/apache/avalon/phoenix AbstractBlock.java
Block.java BlockListener.java Constants.java
Log:
Migrate the deprecated files to a new source hierarchy. This will make it easier to maintain and see which files are deprecated and which are not.
Revision Changes Path
1.166 +3 -1 jakarta-avalon-phoenix/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/build.xml,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- build.xml 8 Sep 2002 02:39:56 -0000 1.165
+++ build.xml 11 Sep 2002 12:47:25 -0000 1.166
@@ -43,6 +43,7 @@
<!-- Set the properties for source directories -->
<property name="src.dir" value="src"/>
<property name="java.dir" value="${src.dir}/java"/>
+ <property name="compat.dir" value="${src.dir}/compat"/>
<property name="conf.dir" value="${src.dir}/conf"/>
<property name="script.dir" value="${src.dir}/script"/>
<property name="lib.dir" value="lib"/>
@@ -177,7 +178,7 @@
<mkdir dir="${build.src}"/>
<copy todir="${build.src}">
- <fileset dir="${java.dir}">
+ <fileset dir="${compat.dir}">
<include name="${constants.file}" />
</fileset>
</copy>
@@ -202,6 +203,7 @@
deprecation="${build.deprecation}">
<classpath refid="project.class.path" />
<src path="${build.src}" />
+ <src path="${compat.dir}" />
<exclude name="${constants.file}" />
<exclude name="org/apache/avalon/phoenix/frontends/PhoenixServlet.java" unless="servlet.present"/>
<exclude name="org/apache/avalon/phoenix/frontends/ComposableServlet.java" unless="servlet.present"/>
1.12 +2 -1 jakarta-avalon-phoenix/docs.xml
Index: docs.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/docs.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- docs.xml 9 Jul 2002 07:29:18 -0000 1.11
+++ docs.xml 11 Sep 2002 12:47:25 -0000 1.12
@@ -20,6 +20,7 @@
<property name="build.javadocs" value="${build.dir}/javadocs"/>
<property name="src.dir" value="src"/>
<property name="java.dir" value="${src.dir}/java"/>
+ <property name="compat.dir" value="${src.dir}/compat"/>
<property name="xdocs.dir" value="src/xdocs"/>
<property name="jakarta-site.dir" value="../jakarta-site"/>
<property name="dist.base" value="distributions"/>
@@ -94,7 +95,7 @@
<mkdir dir="${build.javadocs}"/>
<javadoc packagenames="org.apache.*"
- sourcepath="${java.dir}"
+ sourcepath="${java.dir}:${compat.dir}"
destdir="${build.javadocs}">
<classpath refid="project.class.path" />
<doclet name="com.sun.tools.doclets.standard.Standard">
1.1 jakarta-avalon-phoenix/src/compat/org/apache/avalon/phoenix/AbstractBlock.java
Index: AbstractBlock.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.phoenix;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
/**
* This is an <code>AbstractBlock</code> that makes deployment a bit
* easier.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version CVS $Revision: 1.1 $ $Date: 2002/09/11 12:47:26 $
* @deprecated As Block interface is deprecated this class is also
* deprecated with no replacement.
*/
public abstract class AbstractBlock
extends AbstractLogEnabled
implements Block, Contextualizable, Composable, Configurable
{
private BlockContext m_context;
private Configuration m_configuration;
private ComponentManager m_componentManager;
public void contextualize( final Context context )
{
m_context = (BlockContext)context;
}
public void configure( final Configuration configuration )
throws ConfigurationException
{
m_configuration = configuration;
}
public void compose( final ComponentManager componentManager )
throws ComponentException
{
m_componentManager = componentManager;
}
protected final BlockContext getBlockContext()
{
return m_context;
}
protected final ComponentManager getComponentManager()
{
return m_componentManager;
}
/**
* Retrieve cached configuration values.
*
* @return the configuration
* @deprecated No Block should be relying on AbstractBlock to implement Configurable
*/
protected final Configuration getConfiguration()
{
return m_configuration;
}
}
1.1 jakarta-avalon-phoenix/src/compat/org/apache/avalon/phoenix/Block.java
Index: Block.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.phoenix;
import org.apache.avalon.framework.component.Component;
/**
* The main interface to implement for Applications hosted in Phoenix.
*
* @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
* @deprecated Deprecated with no replacement as marker interfaces
* limit flexability when integrating systems.
*/
public interface Block
extends Component
{
}
1.1 jakarta-avalon-phoenix/src/compat/org/apache/avalon/phoenix/BlockListener.java
Index: BlockListener.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.phoenix;
import java.util.EventListener;
/**
* Implementations of this interface receive notifications about
* changes to the state of Blocks in the Server Application
* they are a part of. The implementation <em>must</em> have a zero argument
* constructor and is instantiated before any other component of the Server
* Application. To receive notification events, the implementation class
* should be specified in the <tt>assembly.xml</tt> descriptor.
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @deprecated This interface has been replaced by ApplicationListener
*/
public interface BlockListener
extends EventListener
{
/**
* Notification that a block has just been added
* to Server Application.
*
* @param event the BlockEvent
*/
void blockAdded( BlockEvent event );
/**
* Notification that a block is just about to be
* removed from Server Application.
*
* @param event the BlockEvent
*/
void blockRemoved( BlockEvent event );
}
1.1 jakarta-avalon-phoenix/src/compat/org/apache/avalon/phoenix/Constants.java
Index: Constants.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.phoenix;
/**
* Package access to kernel constants.
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @deprecated User code should not be directly referencing this class
*/
public interface Constants
{
String SOFTWARE = "@@NAME@@";
String VERSION = "@@VERSION@@";
String DATE = "@@DATE@@";
}
1.17 +1 -1 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/BlockContext.java
Index: BlockContext.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/BlockContext.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BlockContext.java 6 Sep 2002 11:13:34 -0000 1.16
+++ BlockContext.java 11 Sep 2002 12:47:26 -0000 1.17
@@ -83,7 +83,7 @@
* stop objects from using the Block when it is in an invalid state.
*
* <p>The proxy also allows Phoenix to associate "Context" information with
- * the object. For instance, a {@link Block} may expect to run with a
+ * the object. For instance, a Block may expect to run with a
* specific ContextClassLoader set. However if this Block were to be passed
* to another component that processed the Block in a thread that did not
* have the correct context information setup, then the Block could fail
1.10 +2 -2 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/BlockEvent.java
Index: BlockEvent.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/BlockEvent.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BlockEvent.java 6 Sep 2002 11:13:34 -0000 1.9
+++ BlockEvent.java 11 Sep 2002 12:47:26 -0000 1.10
@@ -12,8 +12,8 @@
/**
* This is the class that is used to deliver notifications
- * about {@link Block}s state changes to the
- * {@link BlockListener}s of a Server Application.
+ * about Blocks state changes to the {@link org.apache.avalon.phoenix.BlockListener}s
+ * of a Server Application.
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
*/
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>