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/05/12 04:02:27 UTC
cvs commit: jakarta-avalon-phoenix/src/schema blockinfo.dtd
donaldp 02/05/11 19:02:27
Modified: src/java/org/apache/avalon/phoenix/metainfo
BlockDescriptor.java
src/java/org/apache/avalon/phoenix/tools/infobuilder
BlockInfoBuilder.java
src/schema blockinfo.dtd
Log:
Allow the "name" attribute on <block/> section of BlockInfo.
Revision Changes Path
1.7 +21 -2 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/BlockDescriptor.java
Index: BlockDescriptor.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/BlockDescriptor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BlockDescriptor.java 11 Dec 2001 10:13:35 -0000 1.6
+++ BlockDescriptor.java 12 May 2002 02:02:26 -0000 1.7
@@ -15,22 +15,41 @@
*/
public class BlockDescriptor
{
+ /**
+ * The short name of the Block. Useful for displaying
+ * human readable strings describing the type in
+ * assembly tools or generators.
+ */
+ private final String m_name;
private final String m_classname;
private final Version m_version;
//private final ConfigSchema m_schema;
- public BlockDescriptor( final String classname, final Version version )
+ public BlockDescriptor( final String name,
+ final String classname,
+ final Version version )
{
+ m_name = name;
m_classname = classname;
m_version = version;
}
/**
+ * Retrieve the name of Block type.
+ *
+ * @return the name of Block type.
+ */
+ public String getName()
+ {
+ return m_name;
+ }
+
+ /**
* Retrieve the Class Name of Block.
*
* @return the Class Name of block
*/
- public String getClassName()
+ public String getClassname()
{
return m_classname;
}
1.13 +5 -3 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/infobuilder/BlockInfoBuilder.java
Index: BlockInfoBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/infobuilder/BlockInfoBuilder.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- BlockInfoBuilder.java 10 May 2002 02:43:04 -0000 1.12
+++ BlockInfoBuilder.java 12 May 2002 02:02:26 -0000 1.13
@@ -25,7 +25,7 @@
* is specified in the BlockInfo specification.
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version $Revision: 1.12 $ $Date: 2002/05/10 02:43:04 $
+ * @version $Revision: 1.13 $ $Date: 2002/05/12 02:02:26 $
*/
public final class BlockInfoBuilder
extends AbstractLogEnabled
@@ -205,15 +205,17 @@
{
if( 0 == block.getChildren().length )
{
- final String message = REZ.getString( "missing-block", classname );
+ final String message =
+ REZ.getString( "missing-block", classname );
getLogger().warn( message );
System.err.println( message );
return null;
}
+ final String name = block.getAttribute( "name", null );
final Version version = buildVersion( block.getChild( "version" ).getValue() );
- return new BlockDescriptor( classname, version );
+ return new BlockDescriptor( name, classname, version );
}
/**
1.6 +6 -2 jakarta-avalon-phoenix/src/schema/blockinfo.dtd
Index: blockinfo.dtd
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/schema/blockinfo.dtd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- blockinfo.dtd 22 Jan 2002 14:27:45 -0000 1.5
+++ blockinfo.dtd 12 May 2002 02:02:27 -0000 1.6
@@ -32,10 +32,14 @@
<!--
The block element describes the block, it defines:
+name the human readable name of block type. Must be a string
+ containing alphanumeric characters, '.', '_' and starting
+ with a letter.
version the version of the block in (in the format #.#.#, #.# or # where
# is a integer
-->
<!ELEMENT block (version)>
+ <!ATTLIST block name CDATA #IMPLIED>
<!ELEMENT version (#PCDATA) >
<!--
@@ -49,10 +53,10 @@
# is a integer
-->
<!ELEMENT service EMPTY >
- <!ATTLIST service
+ <!ATTLIST service
name CDATA #REQUIRED
version CDATA #IMPLIED
- >
+ >
<!--
The service dependency describes a service that the block
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>