Return-Path: 
 <avalon-cvs-return-7481-qmlist-jakarta-archive-avalon-cvs=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org
Received: (qmail 16110 invoked from network); 10 Jun 2002 17:14:35 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 10 Jun 2002 17:14:35 -0000
Received: (qmail 20925 invoked by uid 97); 10 Jun 2002 17:14:28 -0000
Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org
Received: (qmail 20844 invoked by uid 97); 10 Jun 2002 17:14:27 -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 20759 invoked by uid 97); 10 Jun 2002 17:14:26 -0000
X-Antivirus: nagoya (v4198 created Apr 24 2002)
Date: 10 Jun 2002 17:14:19 -0000
Message-ID: <20020610171419.87375.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
 ComponentDescriptor.java ContextDescriptor.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:14:18

  Modified:    containerkit/src/java/org/apache/excalibur/containerkit/metainfo
                        ComponentDescriptor.java ContextDescriptor.java
  Log:
  classname validation
  
  Revision  Changes    Path
  1.11      +3 -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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ComponentDescriptor.java	10 Jun 2002 17:11:13 -0000	1.10
  +++ ComponentDescriptor.java	10 Jun 2002 17:14:18 -0000	1.11
  @@ -9,6 +9,8 @@
   
   import java.util.Properties;
   import org.apache.avalon.framework.Version;
  +import org.apache.avalon.excalibur.i18n.ResourceManager;
  +import org.apache.avalon.excalibur.i18n.Resources;
   
   /**
    * This class is used to provide explicit information to assembler
  @@ -49,7 +51,7 @@
    * </pre>
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.10 $ $Date: 2002/06/10 17:11:13 $
  + * @version $Revision: 1.11 $ $Date: 2002/06/10 17:14:18 $
    */
   public final class ComponentDescriptor
       extends FeatureDescriptor
  
  
  
  1.3       +13 -1     jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/metainfo/ContextDescriptor.java
  
  Index: ContextDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/metainfo/ContextDescriptor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ContextDescriptor.java	9 Jun 2002 01:04:55 -0000	1.2
  +++ ContextDescriptor.java	10 Jun 2002 17:14:18 -0000	1.3
  @@ -8,6 +8,8 @@
   package org.apache.excalibur.containerkit.metainfo;
   
   import java.util.Properties;
  +import org.apache.avalon.excalibur.i18n.ResourceManager;
  +import org.apache.avalon.excalibur.i18n.Resources;
   
   /**
    * A descriptor describing the Context that the Component
  @@ -24,11 +26,15 @@
    * about Context requirements.</p>
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.2 $ $Date: 2002/06/09 01:04:55 $
  + * @version $Revision: 1.3 $ $Date: 2002/06/10 17:14:18 $
    */
   public class ContextDescriptor
       extends FeatureDescriptor
   {
  +
  +    private static final Resources REZ =
  +        ResourceManager.getPackageResources( ContextDescriptor.class );
  +
       private final String m_classname;
       private final EntryDescriptor[] m_entrys;
   
  @@ -58,6 +64,12 @@
           if( null == entrys )
           {
               throw new NullPointerException( "entrys" );
  +        }
  +
  +        if( classname.indexOf("/") > -1 )
  +        {
  +            message = REZ.getString( "component.invalid-classname", classname );
  +            throw new IllegalArgumentException( message );
           }
   
           m_classname = classname;
  
  
  

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