hammant 2002/06/23 15:19:24
Modified: src/java/org/apache/avalon/phoenix/tools/verifier
Resources.properties SarVerifier.java
Log:
Changed to allow dots in block and sar names.
Revision Changes Path
1.12 +3 -3
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/Resources.properties
Index: Resources.properties
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/Resources.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Resources.properties 4 Jun 2002 04:36:13 -0000 1.11
+++ Resources.properties 23 Jun 2002 22:19:24 -0000 1.12
@@ -9,9 +9,9 @@
listener-noimpl-listener=BlockListener interface is not implemented by class
"{1}" designated for BlockListener named "{0}".
dependency-noblock=Dependency "{0}" of Block "{1}" has not been specified.
dependency-noservice=Dependency "{0}" of Block "{2}" does not offer the
service "{1}" required.
-invalid-block-name=The Block name "{0}" is invalid. Valid names contain only
letters, digits and the '-' character.
-invalid-listener-name=The Listener name "{0}" is invalid. Valid names
contain only letters, digits and the '-' character.
-invalid-sar-name=The Sar name "{0}" is invalid. Valid names contain only
letters, digits and the '-' character.
+invalid-block-name=The Block name "{0}" is invalid. Valid names contain only
letters, digits and the '-' & '.' characters.
+invalid-listener-name=The Listener name "{0}" is invalid. Valid names
contain only letters, digits and the '-' & '.' characters.
+invalid-sar-name=The Sar name "{0}" is invalid. Valid names contain only
letters, digits and the '-' & '.' characters.
dependency-circular=Block named "{0}" has a circular dependency via path:
{1}.
verify-unique-names=Verifying that the name specified for Blocks and
BlockListeners are unique.
1.24 +3 -3
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java
Index: SarVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- SarVerifier.java 6 Jun 2002 15:19:45 -0000 1.23
+++ SarVerifier.java 23 Jun 2002 22:19:24 -0000 1.24
@@ -539,7 +539,7 @@
/**
* Return true if specified name is valid.
- * Valid names consist of letters, digits or the '_' character.
+ * Valid names consist of letters, digits or the '-' & '.' characters.
*
* @param name the name to check
* @return true if valid, false otherwise
@@ -551,7 +551,7 @@
{
final char ch = name.charAt( i );
- if( !Character.isLetterOrDigit( ch ) && '-' != ch )
+ if( !Character.isLetterOrDigit( ch ) && '-' != ch && '.' != ch)
{
return false;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
