You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/04/29 16:57:42 UTC
cvs commit: avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance Appliance.java ApplianceContext.java
mcconnell 2003/04/29 07:57:42
Modified: merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl
DefaultAppliance.java DefaultApplianceContext.java
merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance
Appliance.java ApplianceContext.java
Log:
Removal of the notion of the startup policy.
Revision Changes Path
1.3 +1 -14 avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultAppliance.java
Index: DefaultAppliance.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultAppliance.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultAppliance.java 27 Apr 2003 09:28:48 -0000 1.2
+++ DefaultAppliance.java 29 Apr 2003 14:57:41 -0000 1.3
@@ -590,19 +590,6 @@
}
/**
- * Return the startup policy for the component. If TRUE, startup
- * of the component will be executed during normal lifecycle processing
- * on request for a new component instance. If FALSE the startup phase
- * will be ommitted.
- *
- * @return the startup policy
- */
- public boolean getStartupPolicy()
- {
- return m_applianceContext.getStartupPolicy();
- }
-
- /**
* Test is this profile is enabled. A profile is enabled unless explicitly disabled by an
* assembly directive, or implicity disabled as a result of an assembly failure.
*
1.2 +1 -34 avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultApplianceContext.java
Index: DefaultApplianceContext.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultApplianceContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultApplianceContext.java 26 Apr 2003 12:37:43 -0000 1.1
+++ DefaultApplianceContext.java 29 Apr 2003 14:57:41 -0000 1.2
@@ -128,11 +128,6 @@
*/
private String m_factory;
- /**
- * The startup policy.
- */
- private boolean m_startup = true;
-
//==============================================================
// constructor
//==============================================================
@@ -465,34 +460,6 @@
{
return m_config;
}
- }
-
- /**
- * Return the startup policy for the component. If TRUE, startup
- * of the component will be executed during normal lifecycle processing
- * on request for a new component instance. If FALSE the startup phase
- * will be ommitted.
- *
- * @return the startup policy
- */
- public boolean getStartupPolicy()
- {
- return m_startup;
- }
-
- /**
- * Set the startup policy for the component. If TRUE, startup
- * of the component will be executed during normal lifecycle processing
- * on request for a new component instance. If FALSE the startup phase
- * will be ommitted. This policy enables container implementations to
- * take over startup sequencing of the components they are managing.
- *
- * @param policy the startup policy
- */
- public void setStartupPolicy( boolean policy )
- {
- checkWriteable();
- m_startup = policy;
}
1.9 +1 -11 avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/Appliance.java
Index: Appliance.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/Appliance.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Appliance.java 27 Apr 2003 09:28:49 -0000 1.8
+++ Appliance.java 29 Apr 2003 14:57:41 -0000 1.9
@@ -179,16 +179,6 @@
boolean getActivationPolicy();
/**
- * Return the startup policy for the component. If TRUE, startup
- * of the component will be executed during normal lifecycle processing
- * on request for a new component instance. If FALSE the startup phase
- * will be ommitted.
- *
- * @return the startup policy
- */
- boolean getStartupPolicy();
-
- /**
* Test is this appliance is enabled. A appliance is enabled unless
* explicitly disabled by an assembly directive, or implicity disabled
* as a result of an assembly failure.
1.5 +1 -11 avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/ApplianceContext.java
Index: ApplianceContext.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/ApplianceContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ApplianceContext.java 27 Apr 2003 09:28:49 -0000 1.4
+++ ApplianceContext.java 29 Apr 2003 14:57:41 -0000 1.5
@@ -216,14 +216,4 @@
*/
Configuration getConfiguration();
- /**
- * Return the startup policy for the component. If TRUE, startup
- * of the component will be executed during normal lifecycle processing
- * on request for a new component instance. If FALSE the startup phase
- * will be ommitted.
- *
- * @return the startup policy
- */
- boolean getStartupPolicy();
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org