DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Sat Mar 19 18:17:44 2005
New Revision: 2091

Added:
   
development/main/metro/testing/dynamics/src/main/net/dpml/test/dynamics/DefaultGizmo.xprofile
   
development/main/metro/testing/dynamics/src/main/net/dpml/test/dynamics/DefaultWidget.xprofile
   
development/main/metro/testing/playground/src/main/net/dpml/test/playground/ComplexComponent.xprofile
   
development/main/metro/testing/playground/src/main/net/dpml/test/playground/DemoManager.xprofile
   
development/main/metro/testing/playground/src/main/net/dpml/test/playground/ExploitationManager.xprofile
   
development/main/metro/testing/playground/src/main/net/dpml/test/playground/SimpleComponent.xprofile
   
development/main/metro/testing/playground/src/main/net/dpml/test/playground/TerminalComponent.xprofile
   
development/main/metro/testing/testcyclic/src/main/net/dpml/test/testcyclic/TestCyclicA.xprofile
   
development/main/metro/testing/testcyclic/src/main/net/dpml/test/testcyclic/TestCyclicB.xprofile
Modified:
   
development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/XMLContainmentProfileCreator.java
Log:
Update the metro codebase to include explicit profiles enabling a complete 
build of metro with strict mode enabled.

Modified: 
development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/XMLContainmentProfileCreator.java
==============================================================================
--- 
development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/XMLContainmentProfileCreator.java
        (original)
+++ 
development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/XMLContainmentProfileCreator.java
        Sat Mar 19 18:17:44 2005
@@ -70,6 +70,16 @@
     public ContainmentProfile createContainmentProfile( Configuration config 
)
       throws Exception
     {
+        String root = config.getName();
+        if( false == isaValidProfileRootName( root ) )
+        {
+            final String error =
+              "Supplied configuration element ["
+              + root
+              + "] is not recognized.";
+            throw new ConfigurationException( error );
+        }
+
         //
         // build the containment description 
         //
@@ -84,14 +94,6 @@
         // then run with it, otherwise continue with the container defintion
         //
 
-/* NH: implementation is assigned but not used later...
-       so removing this code does not make it worse, but it could be a bug...
-        Configuration implementation = config;
-        if( config.getChild( "implementation", false ) != null )
-        {
-            implementation = config.getChild( "implementation" );
-        }
-*/
         ClassLoaderDirective classloader =
           createClassLoaderDirective(
              config.getChild( "classloader", false ) );
@@ -116,6 +118,26 @@
         return new ContainmentProfile( name, classloader, exports, 
categories, profiles );
     }
 
+    private boolean isaValidProfileRootName( String name )
+    {
+        if( "profile".equals( name ) )
+        {
+            return true;
+        }
+        else if( "container".equals( name ) )
+        {
+            return true;
+        }
+        else if( "block".equals( name ) )
+        {
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
     private ClassLoaderDirective createClassLoaderDirective( Configuration 
config )
        throws ConfigurationException
     {

Added: 
development/main/metro/testing/dynamics/src/main/net/dpml/test/dynamics/DefaultGizmo.xprofile
==============================================================================
--- (empty file)
+++ 
development/main/metro/testing/dynamics/src/main/net/dpml/test/dynamics/DefaultGizmo.xprofile
       Sat Mar 19 18:17:44 2005
@@ -0,0 +1,3 @@
+<profiles>
+  <profile name="gizmo"/>
+</profiles>

Added: 
development/main/metro/testing/dynamics/src/main/net/dpml/test/dynamics/DefaultWidget.xprofile
==============================================================================
--- (empty file)
+++ 
development/main/metro/testing/dynamics/src/main/net/dpml/test/dynamics/DefaultWidget.xprofile
      Sat Mar 19 18:17:44 2005
@@ -0,0 +1,3 @@
+<profiles>
+  <profile name="widget"/>
+</profiles>

Added: 
development/main/metro/testing/playground/src/main/net/dpml/test/playground/ComplexComponent.xprofile
==============================================================================
--- (empty file)
+++ 
development/main/metro/testing/playground/src/main/net/dpml/test/playground/ComplexComponent.xprofile
       Sat Mar 19 18:17:44 2005
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<!--  
+Copyright (C) The Apache Software Foundation. All rights reserved.
+This software is published under the terms of the Apache Software License
+version 1.1, a copy of which has been included with this distribution in
+the LICENSE.txt file.
+
+@author  Avalon Development Team
+@version $Id$
+-->
+
+<profiles>
+   <profile name="complex"/>
+</profiles>
+

Added: 
development/main/metro/testing/playground/src/main/net/dpml/test/playground/DemoManager.xprofile
==============================================================================
--- (empty file)
+++ 
development/main/metro/testing/playground/src/main/net/dpml/test/playground/DemoManager.xprofile
    Sat Mar 19 18:17:44 2005
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<!--  
+Copyright (C) The Apache Software Foundation. All rights reserved.
+This software is published under the terms of the Apache Software License
+version 1.1, a copy of which has been included with this distribution in
+the LICENSE.txt file.
+
+@author  Avalon Development Team
+@version $Id$
+-->
+
+<profiles>
+   <profile name="demo"/>
+</profiles>
+

Added: 
development/main/metro/testing/playground/src/main/net/dpml/test/playground/ExploitationManager.xprofile
==============================================================================
--- (empty file)
+++ 
development/main/metro/testing/playground/src/main/net/dpml/test/playground/ExploitationManager.xprofile
    Sat Mar 19 18:17:44 2005
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<!--  
+Copyright (C) The Apache Software Foundation. All rights reserved.
+This software is published under the terms of the Apache Software License
+version 1.1, a copy of which has been included with this distribution in
+the LICENSE.txt file.
+
+@author  Avalon Development Team
+@version $Id$
+-->
+
+<profiles>
+   <profile name="exploitation"/>
+</profiles>
+

Added: 
development/main/metro/testing/playground/src/main/net/dpml/test/playground/SimpleComponent.xprofile
==============================================================================
--- (empty file)
+++ 
development/main/metro/testing/playground/src/main/net/dpml/test/playground/SimpleComponent.xprofile
        Sat Mar 19 18:17:44 2005
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<!--  
+Copyright (C) The Apache Software Foundation. All rights reserved.
+This software is published under the terms of the Apache Software License
+version 1.1, a copy of which has been included with this distribution in
+the LICENSE.txt file.
+
+@author  Avalon Development Team
+@version $Id$
+-->
+
+<profiles>
+   <profile name="simple"/>
+</profiles>
+

Added: 
development/main/metro/testing/playground/src/main/net/dpml/test/playground/TerminalComponent.xprofile
==============================================================================
--- (empty file)
+++ 
development/main/metro/testing/playground/src/main/net/dpml/test/playground/TerminalComponent.xprofile
      Sat Mar 19 18:17:44 2005
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<!--  
+Copyright (C) The Apache Software Foundation. All rights reserved.
+This software is published under the terms of the Apache Software License
+version 1.1, a copy of which has been included with this distribution in
+the LICENSE.txt file.
+
+@author  Avalon Development Team
+@version $Id$
+-->
+
+<profiles>
+   <profile name="terminal"/>
+</profiles>
+

Added: 
development/main/metro/testing/testcyclic/src/main/net/dpml/test/testcyclic/TestCyclicA.xprofile
==============================================================================
--- (empty file)
+++ 
development/main/metro/testing/testcyclic/src/main/net/dpml/test/testcyclic/TestCyclicA.xprofile
    Sat Mar 19 18:17:44 2005
@@ -0,0 +1,3 @@
+<profiles>
+  <profile name="a"/>
+</profiles>

Added: 
development/main/metro/testing/testcyclic/src/main/net/dpml/test/testcyclic/TestCyclicB.xprofile
==============================================================================
--- (empty file)
+++ 
development/main/metro/testing/testcyclic/src/main/net/dpml/test/testcyclic/TestCyclicB.xprofile
    Sat Mar 19 18:17:44 2005
@@ -0,0 +1,3 @@
+<profiles>
+  <profile name="b"/>
+</profiles>