mcconnell 2003/10/18 23:09:32
Modified: meta/api project.xml
meta/api/src/java/org/apache/avalon/meta/info
InfoDescriptor.java
meta/impl project.xml
meta/impl/src/java/org/apache/avalon/meta/info/builder
XMLTypeCreator.java
meta/impl/src/java/org/apache/avalon/meta/info/writer
XMLTypeWriter.java
meta/plugin project.xml
meta/site project.xml
meta/site/xdocs/meta/info/type info.xml
meta/spi project.xml
meta/tools project.xml
meta/tools/src/java/org/apache/avalon/meta/info/builder/tags
TypeTag.java
Log:
Remove notion of a reclaimable policy and up minor version.
Revision Changes Path
1.4 +1 -1 avalon/meta/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/meta/api/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 17 Oct 2003 04:22:01 -0000 1.3
+++ project.xml 19 Oct 2003 06:09:32 -0000 1.4
@@ -6,7 +6,7 @@
<name>Avalon Meta Model API</name>
<package>org.apache.avalon.meta</package>
- <currentVersion>1.2-dev</currentVersion>
+ <currentVersion>1.2.1-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Meta Model API</shortDescription>
1.4 +4 -80
avalon/meta/api/src/java/org/apache/avalon/meta/info/InfoDescriptor.java
Index: InfoDescriptor.java
===================================================================
RCS file:
/home/cvs/avalon/meta/api/src/java/org/apache/avalon/meta/info/InfoDescriptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InfoDescriptor.java 17 Oct 2003 04:22:01 -0000 1.3
+++ InfoDescriptor.java 19 Oct 2003 06:09:32 -0000 1.4
@@ -94,10 +94,6 @@
public static final String CONSERVATIVE = "conservative";
- public static final String TERMINAL = "terminal";
-
- public static final String REDEEMABLE = "redeemable";
-
//-------------------------------------------------------------------
// immutable state
//-------------------------------------------------------------------
@@ -130,18 +126,9 @@
private final String m_schema;
/**
- * The component destruction policy. If the descruction policy is TERMINAL
- * then true otherwise the descruction policy is REDIMABLE. A teminal componet
- * shall be decommissioned on release. A redimable componet may be recycled by
- * a container if a pool is available. Otherwise, the redimable component will
- * handled as a terminal component.
- */
- private final boolean m_terminal;
-
- /**
* The component garbage collection policy. The value returned is either
- * LIBERAL, DEMOCAT or CONSERVATIVE. A component implmenting a LIBERAL policy
- * will be decommissioned if now references exist. A component declaring a
+ * LIBERAL, DEMOCAT or CONSERVATIVE. A component implementing a LIBERAL policy
+ * will be decommissioned if no references exist. A component declaring a
* DEMOCRAT policy will exist without reference so long as memory contention
* does not occur. A component implementing CONSERVATIVE policies will be
* maintained irrespective of usage and memory constraints so long as its
@@ -187,7 +174,7 @@
final Properties attributes )
throws IllegalArgumentException
{
- this( name, classname, version, lifestyle, null, null, schema, attributes );
+ this( name, classname, version, lifestyle, null, schema, attributes );
}
/**
@@ -206,7 +193,6 @@
final Version version,
final String lifestyle,
final String collection,
- final String destruction,
final String schema,
final Properties attributes )
throws IllegalArgumentException
@@ -268,28 +254,6 @@
}
}
- if ( destruction == null )
- {
- m_terminal = true;
- }
- else
- {
- if( destruction.equalsIgnoreCase( TERMINAL ) )
- {
- m_terminal = true;
- }
- else if( destruction.equalsIgnoreCase( REDEEMABLE ) )
- {
- m_terminal = false;
- }
- else
- {
- final String error =
- "Unrecognized destruction argument [" + destruction + "]";
- throw new IllegalArgumentException( error );
- }
- }
-
if ( name != null )
{
m_name = name;
@@ -341,43 +305,6 @@
*
* @return the policy
*/
- public String getDestructionPolicy()
- {
- if( m_terminal )
- {
- return TERMINAL;
- }
- else
- {
- return REDEEMABLE;
- }
- }
-
- /**
- * Return the component type redemtion policy.
- *
- * @return the policy
- */
- public boolean isRedeemable()
- {
- return !m_terminal;
- }
-
- /**
- * Return the component type termination policy.
- * This is the opositite of the redemption policy.
- * @return the policy
- */
- public boolean isTerminal()
- {
- return m_terminal;
- }
-
- /**
- * Return the component termination policy as a String.
- *
- * @return the policy
- */
public String getCollectionPolicy()
{
return m_collection;
@@ -477,7 +404,6 @@
isEqual = isEqual && m_collection.equals( info.m_collection );
isEqual = isEqual && m_name.equals( info.m_name );
isEqual = isEqual && m_lifestyle.equals( info.m_lifestyle );
- isEqual = isEqual && m_terminal == info.m_terminal;
if ( null == m_version )
{
@@ -506,8 +432,6 @@
hash ^= m_collection.hashCode();
hash >>>= 7;
-
- hash >>>= ( m_terminal ) ? 1 : 3;
if ( null != m_name )
{
1.4 +3 -5 avalon/meta/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/meta/impl/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 17 Oct 2003 04:22:01 -0000 1.3
+++ project.xml 19 Oct 2003 06:09:32 -0000 1.4
@@ -6,7 +6,7 @@
<name>Avalon Meta Model Implementation</name>
<package>org.apache.avalon.meta</package>
- <currentVersion>1.2-dev</currentVersion>
+ <currentVersion>1.2.1-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Meta Model Builder and Verification Framework</shortDescription>
@@ -21,7 +21,6 @@
<artifactId>avalon-framework-api</artifactId>
<version>4.1.5</version>
</dependency>
-
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
@@ -31,13 +30,12 @@
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
-
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-spi</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
1.4 +2 -4
avalon/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java
Index: XMLTypeCreator.java
===================================================================
RCS file:
/home/cvs/avalon/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLTypeCreator.java 17 Oct 2003 04:22:01 -0000 1.3
+++ XMLTypeCreator.java 19 Oct 2003 06:09:32 -0000 1.4
@@ -463,11 +463,9 @@
buildLifestyle( info, attributes );
final String collection =
info.getAttribute( "collection", null );
- final String destruction =
- info.getAttribute( "destruction", null );
return new InfoDescriptor(
- name, classname, version, lifestyle, collection, destruction, schema,
attributes );
+ name, classname, version, lifestyle, collection, schema, attributes );
}
/**
1.3 +1 -2
avalon/meta/impl/src/java/org/apache/avalon/meta/info/writer/XMLTypeWriter.java
Index: XMLTypeWriter.java
===================================================================
RCS file:
/home/cvs/avalon/meta/impl/src/java/org/apache/avalon/meta/info/writer/XMLTypeWriter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLTypeWriter.java 17 Oct 2003 02:03:06 -0000 1.2
+++ XMLTypeWriter.java 19 Oct 2003 06:09:32 -0000 1.3
@@ -162,7 +162,6 @@
writer.write(
"\n <lifestyle collection=\"" + info.getCollectionPolicy()
- + "\" destruction=\"" + info.getDestructionPolicy()
+ "\">" );
writer.write( info.getLifestyle() );
writer.write( "</lifestyle>" );
1.5 +4 -8 avalon/meta/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/meta/plugin/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 17 Oct 2003 04:22:01 -0000 1.4
+++ project.xml 19 Oct 2003 06:09:32 -0000 1.5
@@ -17,7 +17,6 @@
<artifactId>avalon-framework-api</artifactId>
<version>4.1.5</version>
</dependency>
-
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
@@ -27,25 +26,22 @@
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
-
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-spi</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
-
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-impl</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
-
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-tools</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
1.4 +8 -4 avalon/meta/site/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/meta/site/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 17 Oct 2003 04:22:02 -0000 1.3
+++ project.xml 19 Oct 2003 06:09:32 -0000 1.4
@@ -18,30 +18,33 @@
<artifactId>avalon-framework-impl</artifactId>
<version>4.1.5</version>
</dependency>
+
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-spi</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-impl</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-tools</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
+
<dependency>
<id>excalibur-i18n</id>
<version>1.1</version>
</dependency>
+
<dependency>
<id>excalibur-configuration</id>
<version>1.1</version>
@@ -51,6 +54,7 @@
<id>ant</id>
<version>1.5</version>
</dependency>
+
<dependency>
<id>qdox</id>
<version>1.1</version>
1.3 +1 -12 avalon/meta/site/xdocs/meta/info/type/info.xml
Index: info.xml
===================================================================
RCS file: /home/cvs/avalon/meta/site/xdocs/meta/info/type/info.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- info.xml 17 Oct 2003 02:03:06 -0000 1.2
+++ info.xml 19 Oct 2003 06:09:32 -0000 1.3
@@ -25,17 +25,6 @@
pooled components and "conservative" for singelton and thread
lifestyles.
</td>
</tr>
- <tr>
- <td>destruction</td><td>no</td>
- <td>
- Declaration of a destruction policy default override. If
- the value is "terminal" the component will be released for garbage
collection
- folowing decomissioning. If the value is "redeemable" the coponent
will be
- decommissioned and recommissioned if it is associated with compone
pool
- (otherwise the terminal policy will hold). The default policy for all
- component lifestyle is "terminal".
- </td>
- </tr>
</table>
</subsection>
1.4 +2 -2 avalon/meta/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/meta/spi/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 17 Oct 2003 04:22:02 -0000 1.3
+++ project.xml 19 Oct 2003 06:09:32 -0000 1.4
@@ -6,7 +6,7 @@
<name>Avalon Meta Model SPI</name>
<package>org.apache.avalon.meta</package>
- <currentVersion>1.2-dev</currentVersion>
+ <currentVersion>1.2.1-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Meta Model SPI</shortDescription>
@@ -25,7 +25,7 @@
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
</dependencies>
1.4 +5 -4 avalon/meta/tools/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/meta/tools/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 17 Oct 2003 04:22:02 -0000 1.3
+++ project.xml 19 Oct 2003 06:09:32 -0000 1.4
@@ -6,7 +6,7 @@
<name>Meta Management Toolkit</name>
<package>org.apache.avalon.meta</package>
- <currentVersion>1.2-dev</currentVersion>
+ <currentVersion>1.2.1-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Meta Model Toolkit</shortDescription>
@@ -39,17 +39,17 @@
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-spi</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-impl</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
@@ -61,6 +61,7 @@
<id>ant</id>
<version>1.5</version>
</dependency>
+
<dependency>
<id>qdox</id>
<version>1.1</version>
1.4 +2 -13
avalon/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/TypeTag.java
Index: TypeTag.java
===================================================================
RCS file:
/home/cvs/avalon/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/TypeTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TypeTag.java 17 Oct 2003 02:03:07 -0000 1.3
+++ TypeTag.java 19 Oct 2003 06:09:32 -0000 1.4
@@ -119,11 +119,6 @@
public static final String LIFESTYLE_COLLECTION_PARAM = "collection";
/**
- * The lifestyle destruction policy parameter
- */
- public static final String LIFESTYLE_DESTRUCTION_PARAM = "destruction";
-
- /**
* Type tag constructor.
* @param clazz the javadoc class descriptor
*/
@@ -149,13 +144,12 @@
final Version version = getVersion( tag );
final String lifestyle = getLifestyle( tag );
final String collection = getLifestyleCollectionPolicy( tag );
- final String destruction = getLifestyleDestructionPolicy( tag );
final String type = getJavaClass().getFullyQualifiedName();
final Properties properties = new AttributeTag( getJavaClass()
).getProperties();
final String schema = new SchemaTag( getJavaClass()
).getConfigurationSchema();
final InfoDescriptor info =
new InfoDescriptor(
- name, type, version, lifestyle, collection, destruction, schema,
properties );
+ name, type, version, lifestyle, collection, schema, properties );
final ServiceDescriptor[] services = new ServicesTag( getJavaClass()
).getServices();
final CategoryDescriptor[] loggers = new LoggerTag( getJavaClass()
).getCategories();
final DependencyDescriptor[] dependencies =
@@ -180,11 +174,6 @@
private String getLifestyleCollectionPolicy(DocletTag tag)
{
return getNamedParameter( tag, LIFESTYLE_COLLECTION_PARAM, null );
- }
-
- private String getLifestyleDestructionPolicy(DocletTag tag)
- {
- return getNamedParameter( tag, LIFESTYLE_DESTRUCTION_PARAM, null );
}
private Version getVersion(DocletTag tag)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
