Return-Path: 
 <avalon-cvs-return-7480-qmlist-jakarta-archive-avalon-cvs=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org
Received: (qmail 15428 invoked from network); 10 Jun 2002 17:13:32 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 10 Jun 2002 17:13:32 -0000
Received: (qmail 15870 invoked by uid 97); 10 Jun 2002 17:12:46 -0000
Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org
Received: (qmail 15855 invoked by uid 97); 10 Jun 2002 17:12:45 -0000
Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:avalon-cvs-subscribe@jakarta.apache.org>
List-Help: <mailto:avalon-cvs-help@jakarta.apache.org>
List-Post: <mailto:avalon-cvs@jakarta.apache.org>
List-Id: "Avalon CVS List" <avalon-cvs.jakarta.apache.org>
Reply-To: "Avalon Developers List" <avalon-dev@jakarta.apache.org>
Delivered-To: mailing list avalon-cvs@jakarta.apache.org
Received: (qmail 15831 invoked by uid 97); 10 Jun 2002 17:12:44 -0000
X-Antivirus: nagoya (v4198 created Apr 24 2002)
Date: 10 Jun 2002 17:11:13 -0000
Message-ID: <20020610171113.86807.qmail@icarus.apache.org>
From: mcconnell@apache.org
To: jakarta-avalon-excalibur-cvs@apache.org
Subject: cvs commit:
 jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/metainfo
 Resources.properties ComponentDescriptor.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

mcconnell    2002/06/10 10:11:13

  Modified:    containerkit/src/java/org/apache/excalibur/containerkit/metainfo
                        ComponentDescriptor.java
  Added:       containerkit/src/java/org/apache/excalibur/containerkit/metainfo
                        Resources.properties
  Log:
  classname validation
  
  Revision  Changes    Path
  1.10      +12 -1     jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/metainfo/ComponentDescriptor.java
  
  Index: ComponentDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/metainfo/ComponentDescriptor.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ComponentDescriptor.java	9 Jun 2002 00:27:02 -0000	1.9
  +++ ComponentDescriptor.java	10 Jun 2002 17:11:13 -0000	1.10
  @@ -49,11 +49,15 @@
    * </pre>
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.9 $ $Date: 2002/06/09 00:27:02 $
  + * @version $Revision: 1.10 $ $Date: 2002/06/10 17:11:13 $
    */
   public final class ComponentDescriptor
       extends FeatureDescriptor
   {
  +
  +    private static final Resources REZ =
  +        ResourceManager.getPackageResources( ComponentDescriptor.class );
  +
       /**
        * The short name of the Component Type. Useful for displaying
        * human readable strings describing the type in
  @@ -83,6 +87,13 @@
                                   final Properties attributes )
       {
           super( attributes );
  +
  +        if( classname.indexOf("/") > -1 )
  +        {
  +            message = REZ.getString( "component.invalid-classname", classname );
  +            throw new IllegalArgumentException( message );
  +        }
  +
           m_name = name;
           m_displayName = displayName;
           m_classname = classname;
  
  
  
  1.1                  jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/metainfo/Resources.properties
  
  Index: Resources.properties
  ===================================================================
  #From ComponentDescriptor class
  component.invalid-classname.error=Invalid classname {1}.
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>