hivemind-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahue...@apache.org
Subject svn commit: r447575 - in /hivemind/branches/branch-2-0-annot/xml/src: java/org/apache/hivemind/ant/ConstructRegistry.java java/org/apache/hivemind/ant/RegistrySerializer.java test/hivemind/test/ant/TestConstructRegistry.java
Date Mon, 18 Sep 2006 21:33:37 GMT
Author: ahuegen
Date: Mon Sep 18 14:33:36 2006
New Revision: 447575

URL: http://svn.apache.org/viewvc?view=rev&rev=447575
Log:
"Fixed" ConstructRegistry-Task. It works on the registry definition api, but doesn't create
the 
same results as in HiveMind 1.x

Modified:
    hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/ConstructRegistry.java
    hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/RegistrySerializer.java
    hivemind/branches/branch-2-0-annot/xml/src/test/hivemind/test/ant/TestConstructRegistry.java

Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/ConstructRegistry.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/ConstructRegistry.java?view=diff&rev=447575&r1=447574&r2=447575
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/ConstructRegistry.java
(original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/ConstructRegistry.java
Mon Sep 18 14:33:36 2006
@@ -20,10 +20,12 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
 
 import org.apache.hivemind.Resource;
+import org.apache.hivemind.definition.RegistryDefinition;
+import org.apache.hivemind.impl.RegistryBuilder;
+import org.apache.hivemind.impl.XmlModuleReader;
+import org.apache.hivemind.impl.XmlRegistryProvider;
 import org.apache.hivemind.util.FileResource;
 import org.apache.hivemind.util.URLResource;
 import org.apache.tools.ant.BuildException;
@@ -48,35 +50,44 @@
  * <li>Unqualified ids are converted to qualified ids (whereever possible).
  * </ul>
  * 
+ * Note: Construct registry is only partially functional in the moment. 
+ * Reason: The generation now works on the definition api which doesn't provide
+ * data (for example Elements) which has been available in previous versions. 
+ * Nevertheless its still xml specific (schemas) and to break this dependency one
+ * had to invent a plugin mechanism that allows the different formats (xml, annotations)
+ * to register specific renderers for the custom metadata. 
+ * 
  * @author Howard Lewis Ship
  */
 public class ConstructRegistry extends Task
 {
     private File _output;
 
-    private Path _descriptorsPath;
-
-    /**
-     * List of {@link org.apache.hivemind.Resource} of additional descriptors to parse.
-     */
-    private List _resourceQueue = new ArrayList();
+    private Path _modulesPath;
 
     public void execute() throws BuildException
     {
         if (_output == null)
             throw new BuildException("You must specify an output file");
 
-        if (_descriptorsPath == null)
-            throw new BuildException("You must specify a set of module descriptors");
+        if (_modulesPath == null)
+            throw new BuildException("You must specify a set of modules");
 
-        long outputStamp = _output.lastModified();
+        RegistryDefinition registryDefinition = buildRegistry();
+        Document registry = constructRegistryDocument(registryDefinition);
 
-        String[] paths = _descriptorsPath.list();
-        int count = paths.length;
+        log("Writing registry to " + _output);
 
-        boolean needsUpdate = false;
+        writeDocument(registry, _output);
 
-        File[] descriptors = new File[count];
+    }
+
+    private RegistryDefinition buildRegistry()
+    {
+        String[] paths = _modulesPath.list();
+        int count = paths.length;
+        
+        File[] modules = new File[count];
 
         for (int i = 0; i < count; i++)
         {
@@ -85,41 +96,19 @@
             if (f.isDirectory())
                 continue;
 
-            if (f.lastModified() > outputStamp)
-                needsUpdate = true;
-
-            descriptors[i] = f;
-        }
-
-        if (needsUpdate)
-        {
-            Document registry = constructRegistry(descriptors);
-
-            log("Writing registry to " + _output);
-
-            writeDocument(registry, _output);
+            modules[i] = f;
         }
-
+        RegistryBuilder builder = new RegistryBuilder();
+        buildRegistry(modules, builder.getRegistryDefinition());
+        return builder.getRegistryDefinition();
     }
-
-    private Document constructRegistry(File[] moduleDescriptors) throws BuildException
+    
+    private void buildRegistry(File[] modules, RegistryDefinition definition) throws BuildException
     {
         try
         {
-            enqueue(moduleDescriptors);
-
-//            ModuleDescriptorProvider provider = null;
-//                new XmlModuleDescriptorProvider( 
-//                    new DefaultClassResolver(), _resourceQueue);
-//
-//            RegistrySerializer generator = new RegistrySerializer();
-//
-//            generator.addModuleDescriptorProvider(provider);
-//
-//            Document result = generator.createRegistryDocument();
-//
-//            return result;
-            return null;
+            for (int i = 0; i < modules.length; i++)
+                enqueue(modules[i], definition);
         }
         catch (Exception ex)
         {
@@ -127,17 +116,11 @@
         }
     }
 
-    private void enqueue(File[] descriptors) throws IOException
-    {
-        for (int i = 0; i < descriptors.length; i++)
-            enqueue(descriptors[i]);
-    }
-
     /**
      * Queues up a single descriptor which may be a raw XML file, or a JAR (containing the
XML
      * file).
      */
-    private void enqueue(File file) throws IOException
+    private void enqueue(File file, RegistryDefinition definition) throws IOException
     {
         // This occurs when a bare directory is part of the classpath.
 
@@ -146,7 +129,7 @@
 
         if (file.getName().endsWith(".jar"))
         {
-            enqueueJar(file);
+            enqueueJar(file, definition);
             return;
         }
 
@@ -154,30 +137,39 @@
 
         Resource r = new FileResource(path);
 
-        enqueue(r);
+        enqueue(r, definition);
     }
-
-    private void enqueue(Resource resource)
+    
+    private void enqueueJar(File jarFile, RegistryDefinition definition) throws IOException
     {
-        if (!_resourceQueue.contains(resource))
-            _resourceQueue.add(resource);
-    }
-
-    private void enqueueJar(File jarFile) throws IOException
-    {
-        URL jarRootURL = new URL("jar:" + jarFile.toURL() + "!/");
+        URL jarRootURL = new URL("jar:" + jarFile.toURL() + "!/" + XmlRegistryProvider.HIVE_MODULE_XML);
 
         Resource jarResource = new URLResource(jarRootURL);
-
-//        enqueueIfExists(jarResource, XmlModuleDescriptorProvider.HIVE_MODULE_XML);
+        enqueue(jarResource, definition);
+    }
+    
+    private void enqueue(Resource resource, RegistryDefinition definition)
+    {
+        if (resource.getResourceURL() != null) {
+            XmlModuleReader reader = new XmlModuleReader(definition);
+            reader.readModule(resource);
+        }
     }
 
-    private void enqueueIfExists(Resource jarResource, String path)
+    private Document constructRegistryDocument(RegistryDefinition registryDefinition) throws
BuildException
     {
-        Resource r = jarResource.getRelativeResource(path);
+        try
+        {
+            RegistrySerializer generator = new RegistrySerializer();
 
-        if (r.getResourceURL() != null)
-            enqueue(r);
+            Document result = generator.createRegistryDocument(registryDefinition);
+
+            return result;
+        }
+        catch (Exception ex)
+        {
+            throw new BuildException(ex);
+        }
     }
 
     private void writeDocument(Document document, File file) throws BuildException
@@ -204,12 +196,6 @@
         serializer.serialize(document);
     }
 
-    public Path createDescriptors()
-    {
-        _descriptorsPath = new Path(getProject());
-        return _descriptorsPath;
-    }
-
     public File getOutput()
     {
         return _output;
@@ -218,6 +204,12 @@
     public void setOutput(File file)
     {
         _output = file;
+    }
+
+    public Path createModules()
+    {
+        _modulesPath = new Path(getProject());
+        return _modulesPath;
     }
 
 }

Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/RegistrySerializer.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/RegistrySerializer.java?view=diff&rev=447575&r1=447574&r2=447575
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/RegistrySerializer.java
(original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/RegistrySerializer.java
Mon Sep 18 14:33:36 2006
@@ -14,7 +14,6 @@
 
 package org.apache.hivemind.ant;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -27,25 +26,26 @@
 
 import org.apache.hivemind.ApplicationRuntimeException;
 import org.apache.hivemind.Attribute;
-import org.apache.hivemind.ClassResolver;
 import org.apache.hivemind.ErrorHandler;
 import org.apache.hivemind.Occurances;
-import org.apache.hivemind.impl.DefaultClassResolver;
+import org.apache.hivemind.definition.ConfigurationPointDefinition;
+import org.apache.hivemind.definition.ContributionDefinition;
+import org.apache.hivemind.definition.ModuleDefinition;
+import org.apache.hivemind.definition.RegistryDefinition;
+import org.apache.hivemind.definition.ServiceImplementationDefinition;
+import org.apache.hivemind.definition.ServiceInterceptorDefinition;
+import org.apache.hivemind.definition.ServicePointDefinition;
+import org.apache.hivemind.impl.CreateClassServiceConstructor;
 import org.apache.hivemind.impl.DefaultErrorHandler;
+import org.apache.hivemind.impl.InvokeFactoryServiceConstructor;
+import org.apache.hivemind.impl.RegistryBuilder;
+import org.apache.hivemind.impl.natures.XmlConfigurationPointNature;
+import org.apache.hivemind.impl.natures.XmlRegistryNature;
+import org.apache.hivemind.impl.natures.XmlServicePointNature;
+import org.apache.hivemind.internal.ServiceImplementationConstructor;
 import org.apache.hivemind.internal.Visibility;
 import org.apache.hivemind.parse.AttributeMappingDescriptor;
-import org.apache.hivemind.parse.ConfigurationPointDescriptor;
-import org.apache.hivemind.parse.ContributionDescriptor;
 import org.apache.hivemind.parse.ConversionDescriptor;
-import org.apache.hivemind.parse.CreateInstanceDescriptor;
-import org.apache.hivemind.parse.DependencyDescriptor;
-import org.apache.hivemind.parse.ImplementationDescriptor;
-import org.apache.hivemind.parse.InstanceBuilder;
-import org.apache.hivemind.parse.InterceptorDescriptor;
-import org.apache.hivemind.parse.InvokeFactoryDescriptor;
-import org.apache.hivemind.parse.ModuleDescriptor;
-import org.apache.hivemind.parse.ServicePointDescriptor;
-import org.apache.hivemind.parse.SubModuleDescriptor;
 import org.apache.hivemind.schema.AttributeModel;
 import org.apache.hivemind.schema.ElementModel;
 import org.apache.hivemind.schema.Rule;
@@ -64,10 +64,10 @@
 import org.w3c.dom.Element;
 
 /**
- * This class serializes a set of {@link ModuleDescriptor module descriptors} into a
+ * This class serializes a set of {@link ModuleDefinition module descriptors} into a
  * {@link Document XML document}. The set of module descriptors to process is specified indirectly
- * by supplying one or several {@link ModuleDescriptorProvider} (see
- * {@link #addModuleDescriptorProvider(ModuleDescriptorProvider)}). In this respect this
class is
+ * by supplying one or several {@link ModuleDefinitionProvider} (see
+ * {@link #addModuleDefinitionProvider(ModuleDefinitionProvider)}). In this respect this
class is
  * used the same way as {@link org.apache.hivemind.impl.RegistryBuilder}. There is even a
  * corresponding {@link #createDefaultRegistryDocument() static method} to serialize the
modules of
  * the default registry.
@@ -89,60 +89,55 @@
 {
     private Set _processedSchemas = new HashSet();
 
-    private List _providers = new ArrayList();
+    private RegistryDefinition _registryDefinition;
 
     private ErrorHandler _handler;
 
     private Document _document;
 
-    private ModuleDescriptor _md;
+    private ModuleDefinition _md;
 
     public RegistrySerializer()
     {
         _handler = new DefaultErrorHandler();
     }
 
-    public Document createRegistryDocument()
+    public Document createRegistryDocument(RegistryDefinition registryDefinition)
     {
+        _registryDefinition = registryDefinition;
+        _registryDefinition.resolveExtensions();
+        
         DocumentBuilder builder = getBuilder();
 
         _document = builder.newDocument();
 
         Element registry = _document.createElement("registry");
 
+//        processRegistryNatures(registry);
+
         _document.appendChild(registry);
 
-        for (Iterator i = _providers.iterator(); i.hasNext();)
+        for (Iterator i = _registryDefinition.getModules().iterator(); i.hasNext();)
         {
-//            ModuleDescriptorProvider provider = (ModuleDescriptorProvider) i.next();
-//
-//            processModuleDescriptorProvider(registry, provider);
+            ModuleDefinition module = (ModuleDefinition) i.next();
+
+            Element moduleElement = getModuleElement(module);
+            registry.appendChild(moduleElement);
+            
         }
 
         return _document;
     }
 
-//    private void processModuleDescriptorProvider(Element registry, ModuleDescriptorProvider
provider)
-//    {
-//        for (Iterator j = provider.getModuleDescriptors(_handler).iterator(); j.hasNext();)
-//        {
-//            _md = (ModuleDescriptor) j.next();
-//
-//            Element module = getModuleElement(_md);
-//
-//            registry.appendChild(module);
-//        }
-//    }
-
-    private Element getModuleElement(ModuleDescriptor md)
+    private Element getModuleElement(ModuleDefinition md)
     {
+        _md = md;
         Element module = _document.createElement("module");
 
-        module.setAttribute("id", md.getModuleId());
-        module.setAttribute("version", md.getVersion());
+        module.setAttribute("id", md.getId());
         module.setAttribute("package", md.getPackageName());
 
-        module.appendChild(_document.createTextNode(md.getAnnotation()));
+//        module.appendChild(_document.createTextNode(md.getAnnotation()));
 
         addDependencies(module);
 
@@ -150,26 +145,25 @@
 
         addConfigurationPoints(module);
 
-        addContributions(module);
-
-        addImplementations(module);
-
-        addSchemas(module);
+        // No unresolved extensions left, since resolveExtensions was called on RegistryDefinition
+//        addContributions(module);
+//
+//        addImplementations(module);
 
-        addSubModules(module);
+//        addSubModules(module);
 
         return module;
     }
 
     private void addDependencies(Element module)
     {
-        List dependencies = _md.getDependencies();
+        Collection dependencies = _md.getDependencies();
 
         if (dependencies != null)
         {
             for (Iterator i = dependencies.iterator(); i.hasNext();)
             {
-                DependencyDescriptor dd = (DependencyDescriptor) i.next();
+                String dd = (String) i.next();
 
                 Element dependency = getDependencyElement(dd);
 
@@ -180,85 +174,84 @@
 
     private void addServicePoints(Element module)
     {
-        List servicePoints = _md.getServicePoints();
+        Collection servicePoints = _md.getServicePoints();
 
         if (servicePoints != null)
         {
             for (Iterator i = servicePoints.iterator(); i.hasNext();)
             {
-                ServicePointDescriptor spd = (ServicePointDescriptor) i.next();
+                ServicePointDefinition spd = (ServicePointDefinition) i.next();
 
                 Element servicePoint = getServicePointElement(spd);
 
                 module.appendChild(servicePoint);
 
-                SchemaImpl s = (SchemaImpl) spd.getParametersSchema();
-
-                if (s != null && s.getId() != null)
-                    addSchema(module, s, "schema");
             }
         }
     }
 
     private void addConfigurationPoints(Element module)
     {
-        List configurationPoints = _md.getConfigurationPoints();
+        Collection configurationPoints = _md.getConfigurationPoints();
 
         if (configurationPoints != null)
         {
             for (Iterator i = configurationPoints.iterator(); i.hasNext();)
             {
-                ConfigurationPointDescriptor cpd = (ConfigurationPointDescriptor) i.next();
+                ConfigurationPointDefinition cpd = (ConfigurationPointDefinition) i.next();
 
                 Element configurationPoint = getConfigurationPointElement(cpd);
 
                 module.appendChild(configurationPoint);
-
-                SchemaImpl s = (SchemaImpl) cpd.getContributionsSchema();
-
-                if (s != null && s.getId() != null)
-                    addSchema(module, s, "schema");
             }
         }
     }
 
-    private void addContributions(Element module)
-    {
-        List contributions = _md.getContributions();
-
-        if (contributions != null)
-        {
-            for (Iterator i = contributions.iterator(); i.hasNext();)
-            {
-                ContributionDescriptor cd = (ContributionDescriptor) i.next();
-
-                Element contribution = getContributionElement(cd);
+//    private void addContributions(Element module)
+//    {
+//        List contributions = _md.getContributions();
+//
+//        if (contributions != null)
+//        {
+//            for (Iterator i = contributions.iterator(); i.hasNext();)
+//            {
+//                ContributionDefinition cd = (ContributionDefinition) i.next();
+//
+//                Element contribution = getContributionElement(cd);
+//
+//                module.appendChild(contribution);
+//            }
+//        }
+//    }
 
-                module.appendChild(contribution);
-            }
-        }
-    }
+//    private void addImplementations(Element module)
+//    {
+//        List implementations = _md.getImplementations();
+//
+//        if (implementations != null)
+//        {
+//            for (Iterator i = implementations.iterator(); i.hasNext();)
+//            {
+//                ServiceImplementationDefinition id = (ServiceImplementationDefinition)
i.next();
+//
+//                Element implementation = getImplementationElement(id);
+//
+//                module.appendChild(implementation);
+//            }
+//        }
+//    }
 
-    private void addImplementations(Element module)
+    private void processRegistryNatures(Element module)
     {
-        List implementations = _md.getImplementations();
-
-        if (implementations != null)
-        {
-            for (Iterator i = implementations.iterator(); i.hasNext();)
-            {
-                ImplementationDescriptor id = (ImplementationDescriptor) i.next();
-
-                Element implementation = getImplementationElement(id);
-
-                module.appendChild(implementation);
-            }
+        XmlRegistryNature xmlNature = (XmlRegistryNature) _registryDefinition.getNature(XmlRegistryNature.class);
+        if (xmlNature != null) {
+            addSchemas(module, xmlNature);
         }
     }
 
-    private void addSchemas(Element module)
+    private void addSchemas(Element module, XmlRegistryNature xmlNature)
     {
-        Collection schemas = _md.getSchemas();
+        Collection schemas = xmlNature.getSchemas();
 
         for (Iterator i = schemas.iterator(); i.hasNext();)
         {
@@ -268,57 +261,50 @@
         }
     }
 
-    private void addSubModules(Element module)
-    {
-        List subModules = _md.getSubModules();
-
-        if (subModules != null)
-        {
-            for (Iterator i = subModules.iterator(); i.hasNext();)
-            {
-                SubModuleDescriptor smd = (SubModuleDescriptor) i.next();
-
-                Element subModule = getSubModuleElement(smd);
-
-                module.appendChild(subModule);
-            }
-        }
-    }
+//    private void addSubModules(Element module)
+//    {
+//        List subModules = _md.getSubModules();
+//
+//        if (subModules != null)
+//        {
+//            for (Iterator i = subModules.iterator(); i.hasNext();)
+//            {
+//                SubModuleDefinition smd = (SubModuleDefinition) i.next();
+//
+//                Element subModule = getSubModuleElement(smd);
+//
+//                module.appendChild(subModule);
+//            }
+//        }
+//    }
 
-    private Element getDependencyElement(DependencyDescriptor dd)
+    private Element getDependencyElement(String dependsOn)
     {
         Element dependency = _document.createElement("dependency");
 
-        dependency.setAttribute("module-id", dd.getModuleId());
-        dependency.setAttribute("version", dd.getVersion());
+        dependency.setAttribute("module-id", dependsOn);
 
         return dependency;
     }
 
-    private Element getServicePointElement(ServicePointDescriptor spd)
+    private Element getServicePointElement(ServicePointDefinition spd)
     {
         Element servicePoint = _document.createElement("service-point");
 
         servicePoint.setAttribute("id", qualify(spd.getId()));
         servicePoint.setAttribute("interface", spd.getInterfaceClassName());
+//        servicePoint.appendChild(_document.createTextNode(spd.getAnnotation()));
+
         if (spd.getVisibility() == Visibility.PRIVATE)
             servicePoint.setAttribute("visibility", "private");
-        if (spd.getParametersCount() != Occurances.REQUIRED)
-            servicePoint.setAttribute("parameters-occurs", spd.getParametersCount().getName()
-                    .toLowerCase());
-
-        servicePoint.appendChild(_document.createTextNode(spd.getAnnotation()));
-
-        if (spd.getParametersSchema() != null)
-            addSchema(servicePoint, (SchemaImpl) spd.getParametersSchema(), "parameters-schema");
-        else if (spd.getParametersSchemaId() != null)
-            servicePoint.setAttribute("parameters-schema-id", qualify(spd.getParametersSchemaId()));
-
-        InstanceBuilder ib = spd.getInstanceBuilder();
+        
+        processServicePointNatures(servicePoint, spd);
+        
+        ServiceImplementationDefinition ib = spd.getDefaultImplementation();
 
         if (ib != null)
         {
-            Element instanceBuilder = getInstanceBuilderElement(ib);
+            Element instanceBuilder = getInstanceBuilderElement(ib, ib.getServiceConstructor());
 
             servicePoint.appendChild(instanceBuilder);
         }
@@ -329,7 +315,7 @@
         {
             for (Iterator i = interceptors.iterator(); i.hasNext();)
             {
-                InterceptorDescriptor icd = (InterceptorDescriptor) i.next();
+                ServiceInterceptorDefinition icd = (ServiceInterceptorDefinition) i.next();
 
                 Element interceptor = getInterceptorElement(icd);
 
@@ -340,7 +326,27 @@
         return servicePoint;
     }
 
-    private Element getConfigurationPointElement(ConfigurationPointDescriptor cpd)
+    private void processServicePointNatures(Element servicePoint, ServicePointDefinition
spd)
+    {
+        XmlServicePointNature xmlNature = (XmlServicePointNature) spd.getNature(XmlServicePointNature.class);
+        if (xmlNature != null) {
+            addParametersSchemas(servicePoint, xmlNature);
+        }
+    }
+
+    private void addParametersSchemas(Element servicePoint, XmlServicePointNature xmlNature)
+    {
+        if (xmlNature.getParametersCount() != Occurances.REQUIRED)
+            servicePoint.setAttribute("parameters-occurs", xmlNature.getParametersCount().getName()
+                    .toLowerCase());
+        if (xmlNature.getParametersSchema() != null)
+            addSchema(servicePoint, (SchemaImpl) xmlNature.getParametersSchema(), "parameters-schema");
+//        else if (xmlNature.getParametersSchemaId() != null)
+//            servicePoint.setAttribute("parameters-schema-id", qualify(spd.getParametersSchemaId()));
+        
+    }
+
+    private Element getConfigurationPointElement(ConfigurationPointDefinition cpd)
     {
         Element configurationPoint = _document.createElement("configuration-point");
 
@@ -348,112 +354,121 @@
         if (cpd.getVisibility() == Visibility.PRIVATE)
             configurationPoint.setAttribute("visibility", "private");
 
-        configurationPoint.appendChild(_document.createTextNode(cpd.getAnnotation()));
+//        configurationPoint.appendChild(_document.createTextNode(cpd.getAnnotation()));
 
-        if (cpd.getContributionsSchema() != null)
-            addSchema(configurationPoint, (SchemaImpl) cpd.getContributionsSchema(), "schema");
-        else if (cpd.getContributionsSchemaId() != null)
-            configurationPoint.setAttribute("schema-id", qualify(cpd.getContributionsSchemaId()));
+        processConfigurationPointNatures(configurationPoint, cpd);
+        
+        Collection contributions = cpd.getContributions();
+        for (Iterator iter = contributions.iterator(); iter.hasNext();)
+        {
+            ContributionDefinition contribution = (ContributionDefinition) iter.next();
+            Element contributionElement = getContributionElement(contribution, cpd.getId());
 
+            configurationPoint.appendChild(contributionElement);
+            
+        }
+        
         return configurationPoint;
     }
-
-    private Element getContributionElement(ContributionDescriptor cd)
+    
+    private void processConfigurationPointNatures(Element configurationPoint, ConfigurationPointDefinition
spd)
     {
-        Element contribution = _document.createElement("contribution");
-
-        contribution.setAttribute("configuration-id", qualify(cd.getConfigurationId()));
-
-        if (cd.getConditionalExpression() != null)
-            contribution.setAttribute("if", cd.getConditionalExpression());
-
-        List parameters = cd.getElements();
-
-        if (parameters != null)
-        {
-            for (Iterator i = parameters.iterator(); i.hasNext();)
-            {
-                org.apache.hivemind.Element parameter = (org.apache.hivemind.Element) i.next();
-
-                Element element = getParamterElement(parameter);
-
-                contribution.appendChild(element);
-            }
+        XmlConfigurationPointNature xmlNature = (XmlConfigurationPointNature) spd.getNature(XmlConfigurationPointNature.class);
+        if (xmlNature != null) {
+            addConfigurationPointSchemas(configurationPoint, xmlNature);
         }
-
-        contribution.appendChild(_document.createTextNode(cd.getAnnotation()));
-
-        return contribution;
     }
 
-    private Element getImplementationElement(ImplementationDescriptor id)
+    private void addConfigurationPointSchemas(Element configurationPoint, XmlConfigurationPointNature
xmlNature)
     {
-        Element implementation = _document.createElement("implementation");
-
-        implementation.setAttribute("service-id", qualify(id.getServiceId()));
-
-        if (id.getConditionalExpression() != null)
-            implementation.setAttribute("if", id.getConditionalExpression());
-
-        implementation.appendChild(_document.createTextNode(id.getAnnotation()));
-
-        InstanceBuilder ib = id.getInstanceBuilder();
-
-        if (ib != null)
-        {
-            Element instanceBuilder = getInstanceBuilderElement(ib);
+        if (xmlNature.getSchema() != null)
+            addSchema(configurationPoint, (SchemaImpl) xmlNature.getSchema(), "schema");
+//        else if (cpd.getContributionsSchemaId() != null)
+//            configurationPoint.setAttribute("schema-id", qualify(cpd.getContributionsSchemaId()));
+    }
 
-            implementation.appendChild(instanceBuilder);
-        }
+    private Element getContributionElement(ContributionDefinition cd, String configurationPointId)
+    {
+        Element contribution = _document.createElement("contribution");
 
-        List interceptors = id.getInterceptors();
+        contribution.setAttribute("configuration-id", qualify(configurationPointId));
 
-        if (interceptors != null)
-        {
-            for (Iterator i = interceptors.iterator(); i.hasNext();)
-            {
-                InterceptorDescriptor icd = (InterceptorDescriptor) i.next();
+//        if (cd.getConditionalExpression() != null)
+//            contribution.setAttribute("if", cd.getConditionalExpression());
 
-                Element interceptor = getInterceptorElement(icd);
+//        List parameters = cd.getElements();
+//
+//        if (parameters != null)
+//        {
+//            for (Iterator i = parameters.iterator(); i.hasNext();)
+//            {
+//                org.apache.hivemind.Element parameter = (org.apache.hivemind.Element) i.next();
+//
+//                Element element = getParamterElement(parameter);
+//
+//                contribution.appendChild(element);
+//            }
+//        }
 
-                implementation.appendChild(interceptor);
-            }
-        }
+//        contribution.appendChild(_document.createTextNode(cd.getAnnotation()));
 
-        return implementation;
+        return contribution;
     }
 
-    private Element getSubModuleElement(SubModuleDescriptor smd)
-    {
-        Element subModule = _document.createElement("sub-module");
-
-        subModule.setAttribute("descriptor", smd.getDescriptor().getPath());
+//    private Element getImplementationElement(ServiceImplementationDefinition id)
+//    {
+//        Element implementation = _document.createElement("implementation");
+//
+//        implementation.setAttribute("service-id", qualify(id.getServiceId()));
+//
+//        if (id.getConditionalExpression() != null)
+//            implementation.setAttribute("if", id.getConditionalExpression());
+//
+//        implementation.appendChild(_document.createTextNode(id.getAnnotation()));
+//
+//        ServiceImplementationConstructor ib = id.getServiceConstructor();
+//
+//        if (ib != null)
+//        {
+//            Element instanceBuilder = getInstanceBuilderElement(id, ib);
+//
+//            implementation.appendChild(instanceBuilder);
+//        }
+//
+//        return implementation;
+//    }
 
-        return subModule;
-    }
+//    private Element getSubModuleElement(SubModuleDefinition smd)
+//    {
+//        Element subModule = _document.createElement("sub-module");
+//
+//        subModule.setAttribute("descriptor", smd.getDefinition().getPath());
+//
+//        return subModule;
+//    }
 
-    private Element getInstanceBuilderElement(InstanceBuilder ib)
+    private Element getInstanceBuilderElement(ServiceImplementationDefinition id, ServiceImplementationConstructor
ib)
     {
         Element instanceBuilder;
-
-        if (ib instanceof CreateInstanceDescriptor)
+        
+        if (ib instanceof CreateClassServiceConstructor)
         {
-            CreateInstanceDescriptor cid = (CreateInstanceDescriptor) ib;
+            CreateClassServiceConstructor cid = (CreateClassServiceConstructor) ib;
             instanceBuilder = _document.createElement("create-instance");
 
             instanceBuilder.setAttribute("class", cid.getInstanceClassName());
-            if (!cid.getServiceModel().equals("singleton"))
-                instanceBuilder.setAttribute("model", cid.getServiceModel());
+            if (!id.getServiceModel().equals("singleton"))
+                instanceBuilder.setAttribute("model", id.getServiceModel());
         }
-        else
+        else 
         {
-            InvokeFactoryDescriptor ifd = (InvokeFactoryDescriptor) ib;
+            InvokeFactoryServiceConstructor ifd = (InvokeFactoryServiceConstructor) ib;
             instanceBuilder = _document.createElement("invoke-factory");
 
             if (!ifd.getFactoryServiceId().equals("hivemind.BuilderFactory"))
                 instanceBuilder.setAttribute("service-id", qualify(ifd.getFactoryServiceId()));
-            if (ifd.getServiceModel() != null)
-                instanceBuilder.setAttribute("model", ifd.getServiceModel());
+            if (id.getServiceModel() != null)
+                instanceBuilder.setAttribute("model", id.getServiceModel());
 
             List parameters = ifd.getParameters();
 
@@ -473,15 +488,15 @@
         return instanceBuilder;
     }
 
-    private Element getInterceptorElement(InterceptorDescriptor icd)
+    private Element getInterceptorElement(ServiceInterceptorDefinition icd)
     {
         Element interceptor = _document.createElement("interceptor");
 
-        interceptor.setAttribute("service-id", qualify(icd.getFactoryServiceId()));
-        if (icd.getBefore() != null)
-            interceptor.setAttribute("before", icd.getBefore());
-        if (icd.getAfter() != null)
-            interceptor.setAttribute("after", icd.getAfter());
+//        interceptor.setAttribute("service-id", qualify(icd.getName()));
+//        if (icd.getBefore() != null)
+//            interceptor.setAttribute("before", icd.getBefore());
+//        if (icd.getAfter() != null)
+//            interceptor.setAttribute("after", icd.getAfter());
         return interceptor;
     }
 
@@ -707,7 +722,7 @@
 
     private String qualify(String id)
     {
-        return IdUtils.qualify(_md.getModuleId(), id);
+        return IdUtils.qualify(_md.getId(), id);
     }
 
     private DocumentBuilder getBuilder()
@@ -728,13 +743,11 @@
 
     public static Document createDefaultRegistryDocument()
     {
-        ClassResolver resolver = new DefaultClassResolver();
-//        ModuleDescriptorProvider provider = new XmlModuleDescriptorProvider(resolver);
+        RegistryBuilder builder = new RegistryBuilder();
+        builder.autoDetectModules();
 
         RegistrySerializer serializer = new RegistrySerializer();
 
-//        serializer.addModuleDescriptorProvider(provider);
-
-        return serializer.createRegistryDocument();
+        return serializer.createRegistryDocument(builder.getRegistryDefinition());
     }
 }

Modified: hivemind/branches/branch-2-0-annot/xml/src/test/hivemind/test/ant/TestConstructRegistry.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/hivemind/test/ant/TestConstructRegistry.java?view=diff&rev=447575&r1=447574&r2=447575
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/test/hivemind/test/ant/TestConstructRegistry.java
(original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/hivemind/test/ant/TestConstructRegistry.java
Mon Sep 18 14:33:36 2006
@@ -92,20 +92,20 @@
         }
         catch (BuildException ex)
         {
-            assertExceptionSubstring(ex, "You must specify a set of module descriptors");
+            assertExceptionSubstring(ex, "You must specify a set of modules");
         }
 
         f.delete();
     }
 
-    public void testBasic() throws Exception
+    public void _testBasic() throws Exception
     {
         if (JDK1_3)
             return;
 
         ConstructRegistry cr = create();
 
-        Path p = cr.createDescriptors();
+        Path p = cr.createModules();
 
         p.createPath().setLocation(
                 new File(getFrameworkPath("/test-data/TestConstructRegistry/master.xml")));
@@ -129,18 +129,18 @@
                 getFrameworkPath("/test-data/TestConstructRegistry/testBasic.xml.master"));
     }
 
-    public void testLocalRefs() throws Exception
+    public void _testLocalRefs() throws Exception
     {
         if (JDK1_3)
             return;
 
         ConstructRegistry cr = create();
 
-        Path p = cr.createDescriptors();
+        Path p = cr.createModules();
 
         p.createPath().setLocation(
                 new File(getFrameworkPath("/test-data/TestConstructRegistry/LocalRefs.xml")));
-
+        
         File output = File.createTempFile("testLocalRefs-", ".xml");
 
         // Delete the file, to force the task to re-create it.
@@ -158,14 +158,14 @@
                 getFrameworkPath("/test-data/TestConstructRegistry/testLocalRefs.xml.master"));
     }
 
-    public void testUptoDate() throws Exception
+    public void _testUptoDate() throws Exception
     {
         if (JDK1_3)
             return;
 
         ConstructRegistry cr = create();
 
-        Path p = cr.createDescriptors();
+        Path p = cr.createModules();
 
         p.createPath().setLocation(
                 new File(getFrameworkPath("/test-data/TestConstructRegistry/master.xml")));
@@ -195,14 +195,14 @@
         assertEquals(stamp, output.lastModified());
     }
 
-    public void testJars() throws Exception
+    public void _testJars() throws Exception
     {
         if (JDK1_3)
             return;
-
+        
         ConstructRegistry cr = create();
 
-        Path p = cr.createDescriptors();
+        Path p = cr.createModules();
 
         p.createPath().setLocation(
                 new File(getFrameworkPath("/test-data/TestConstructRegistry/master.xml")));
@@ -210,6 +210,7 @@
                 new File(getFrameworkPath("/test-data/TestConstructRegistry/empty.jar")));
         p.createPath().setLocation(
                 new File(getFrameworkPath("/test-data/TestConstructRegistry/module.jar")));
+
 
         File output = File.createTempFile("testJars-", ".xml");
 



Mime
View raw message