cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject cvs commit: cocoon-2.2/src/kernel/org/apache/cocoon/kernel/identification AbstractDescriptor.java Descriptor.java
Date Fri, 16 Apr 2004 14:14:14 GMT
pier        2004/04/16 07:14:14

  Modified:    src/kernel/org/apache/cocoon/kernel/identification
                        AbstractDescriptor.java Descriptor.java
  Log:
  Namespaces nags.
  
  Revision  Changes    Path
  1.6       +8 -1      cocoon-2.2/src/kernel/org/apache/cocoon/kernel/identification/AbstractDescriptor.java
  
  Index: AbstractDescriptor.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/identification/AbstractDescriptor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractDescriptor.java	31 Mar 2004 13:01:39 -0000	1.5
  +++ AbstractDescriptor.java	16 Apr 2004 14:14:13 -0000	1.6
  @@ -82,6 +82,13 @@
       throws ConfigurationException, IdentificationException {
           super(configuration.getStringAttribute("id"));
           
  +        /* Check the namespace */
  +        if (!NAMESPACE.equals(configuration.namespace())) {
  +            throw new ConfigurationException("Invalid descriptor namespace \""
  +                                             + configuration.namespace()
  +                                             + "\"", configuration);
  +        }
  +        
           /* The identifier of the block we extend */
           String idstring = configuration.getStringAttribute("extends", null);
           if (idstring != null) try {
  
  
  
  1.5       +2 -2      cocoon-2.2/src/kernel/org/apache/cocoon/kernel/identification/Descriptor.java
  
  Index: Descriptor.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/identification/Descriptor.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Descriptor.java	31 Mar 2004 13:13:14 -0000	1.4
  +++ Descriptor.java	16 Apr 2004 14:14:13 -0000	1.5
  @@ -33,7 +33,7 @@
   
       /** <p>The XML namespace of all block {@link Descriptor}s.</p> */
       public static final String NAMESPACE = 
  -                                "http://apache.org/cocoon/blocks/descriptor/1.0";
  +                            "http://apache.org/cocoon/blocks/descriptor/1.0";
   
       /** <p>Identifies a library with &quot;<b>private</b>&quot;
access.</p> */
       public static final int ACCESS_PRIVATE = 0;
  
  
  

Mime
View raw message