You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hivemind.apache.org by ah...@apache.org on 2006/06/12 23:44:58 UTC

svn commit: r413747 [1/4] - in /jakarta/hivemind/branches/branch-2-0-annot: ./ examples/src/java/org/apache/examples/ framework/src/descriptor/META-INF/ framework/src/java/org/apache/hivemind/ framework/src/java/org/apache/hivemind/ant/ framework/src/j...

Author: ahuegen
Date: Mon Jun 12 14:44:52 2006
New Revision: 413747

URL: http://svn.apache.org/viewvc?rev=413747&view=rev
Log:
First part of the refactoring aimed at annotation support

Added:
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationPointDefinition.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ContributionDefinition.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionDefinition.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ImplMessages.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ImplStrings.properties
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ModuleDefinition.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/RegistryDefinition.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/RegistryNature.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceImplementationDefinition.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceInterceptorDefinition.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServicePointDefinition.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/UnresolvedExtension.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryPostProcessor.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryProvider.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryProviderAutoDetector.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/internal/ConfigurationConstructor.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/internal/ServiceInterceptorConstructor.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/descriptor/META-INF/
      - copied from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/descriptor/META-INF/
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/descriptor/META-INF/MANIFEST.MF
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/Attribute.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/Attribute.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/Element.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/Element.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ModuleDescriptorProvider.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/ModuleDescriptorProvider.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/TranslatorManager.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/conditional/
      - copied from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/conditional/
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/AttributeImpl.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/AttributeImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/ContributionImpl.java
      - copied, changed from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ContributionImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/CreateClassServiceConstructor.java
      - copied, changed from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/CreateClassServiceConstructor.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/ElementImpl.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ElementImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/InvokeFactoryInterceptorConstructor.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/InvokeFactoryServiceConstructor.java
      - copied, changed from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/InvokeFactoryServiceConstructor.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/SchemaElement.java
      - copied, changed from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/SchemaElement.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/SchemaProcessorImpl.java
      - copied, changed from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/SchemaProcessorImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/ServiceInterceptorContributionImpl.java
      - copied, changed from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ServiceInterceptorContributionImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/TranslatorContribution.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/TranslatorContribution.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/TranslatorManagerImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlConfigurationConstructor.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProcessor.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleReader.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlRegistryProvider.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/natures/
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/natures/XmlConfigurationPointNature.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/natures/XmlRegistryNature.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/natures/XmlServicePointNature.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/
      - copied from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/parse/
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/AttributeModel.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/schema/AttributeModel.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/ElementModel.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/schema/ElementModel.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/Rule.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/schema/Rule.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/Schema.java
      - copied, changed from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/schema/Schema.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/SchemaProcessor.java
      - copied, changed from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/schema/SchemaProcessor.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/Translator.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/schema/Translator.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/impl/
      - copied from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/schema/impl/
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/package.html
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/schema/package.html
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/rules/
      - copied from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/schema/rules/
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/ObjectProvider.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/ObjectProvider.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/impl/
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/impl/BuilderClassResolverFacet.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderClassResolverFacet.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/impl/BuilderErrorHandlerFacet.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderErrorHandlerFacet.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/impl/BuilderErrorLogFacet.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderErrorLogFacet.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/impl/BuilderFacet.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderFacet.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/impl/BuilderFactory.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderFactory.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/impl/BuilderFactoryLogic.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderFactoryLogic.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/impl/BuilderLogFacet.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderLogFacet.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/impl/BuilderMessagesFacet.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderMessagesFacet.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/impl/BuilderParameter.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderParameter.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/impl/BuilderPropertyFacet.java
      - copied, changed from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderPropertyFacet.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/impl/BuilderServiceIdFacet.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderServiceIdFacet.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/impl/ClassObjectProvider.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/ClassObjectProvider.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/impl/ConfigurationObjectProvider.java
      - copied, changed from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/ConfigurationObjectProvider.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/impl/ObjectInstanceObjectProvider.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/ObjectInstanceObjectProvider.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/impl/ObjectTranslator.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/ObjectTranslator.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/impl/ServiceObjectProvider.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/ServiceObjectProvider.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/service/impl/ServicePropertyObjectProvider.java
      - copied unchanged from r413141, jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/ServicePropertyObjectProvider.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/test/
Removed:
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/descriptor/META-INF/
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/Attribute.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/Element.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/ModuleDescriptorProvider.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/ant/
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/conditional/
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/AttributeImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ContributionImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/CreateClassServiceConstructor.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ElementImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ElementsInnerProxyMap.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/InvokeFactoryServiceConstructor.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryAssembly.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryAssemblyImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/SchemaElement.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/SchemaProcessorImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ServiceInterceptorContributionImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/TranslatorContribution.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/TranslatorManager.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProvider.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/parse/
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/schema/AttributeModel.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/schema/ElementModel.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/schema/Rule.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/schema/Schema.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/schema/SchemaProcessor.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/schema/Translator.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/schema/impl/
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/schema/package.html
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/schema/rules/
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/ObjectProvider.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderClassResolverFacet.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderErrorHandlerFacet.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderErrorLogFacet.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderFacet.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderFactory.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderFactoryLogic.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderLogFacet.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderMessagesFacet.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderParameter.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderPropertyFacet.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/BuilderServiceIdFacet.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/ClassObjectProvider.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/ConfigurationObjectProvider.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/ObjectInstanceObjectProvider.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/ObjectTranslator.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/ServiceObjectProvider.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/service/impl/ServicePropertyObjectProvider.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/impl/TestRegistryAssemblyImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/library/src/java/org/apache/hivemind/lib/groovy/
Modified:
    jakarta/hivemind/branches/branch-2-0-annot/.classpath
    jakarta/hivemind/branches/branch-2-0-annot/examples/src/java/org/apache/examples/ExampleUtils.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/Registry.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/AbstractExtensionPoint.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ConfigurationPointImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ElementsInnerProxyList.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ImplMessages.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ImplStrings.properties
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/InterceptorStackImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ModuleImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryInfrastructureConstructor.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryInfrastructureImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/ServicePointImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/servicemodel/AbstractServiceModelImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/internal/ConfigurationPoint.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/internal/Contribution.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/internal/ExtensionPoint.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/internal/Module.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/internal/RegistryInfrastructure.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/internal/ServiceImplementationConstructor.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/internal/ServicePoint.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/servlet/HiveMindFilter.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/test/HiveMindTestCase.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/FrameworkTestCase.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/TestRegistryBuilder.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/config/TestConfigurationPoint.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/config/TestConversion.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/config/TestUniqueElementAttribute.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/parse/TestModuleDescriptor.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/parse/TestToString.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/rules/TestConfigurationTranslator.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/rules/TestInstanceTranslator.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/rules/TestInvokeParentRule.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/rules/TestSetPropertyRule.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/ConstructorFactory.xml
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/ConstructorAccessImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestTranslatorManager.java
    jakarta/hivemind/branches/branch-2-0-annot/jmx/src/test/org/apache/hivemind/management/TestMBeanRegistry.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/   (props changed)
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/descriptor/META-INF/hivemodule.xml
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/ConstructRegistry.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/RegistrySerializer.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/ConfigurationPointDescriptor.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/ConversionDescriptor.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/CreateInstanceDescriptor.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/DescriptorParser.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/DescriptorParser.properties
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/InstanceBuilder.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/InvokeFactoryDescriptor.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/impl/ElementModelImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/impl/SchemaImpl.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/rules/ConfigurationTranslator.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/rules/InvokeParentRule.java
    jakarta/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/rules/RuleUtils.java

Modified: jakarta/hivemind/branches/branch-2-0-annot/.classpath
URL: http://svn.apache.org/viewvc/jakarta/hivemind/branches/branch-2-0-annot/.classpath?rev=413747&r1=413746&r2=413747&view=diff
==============================================================================
--- jakarta/hivemind/branches/branch-2-0-annot/.classpath (original)
+++ jakarta/hivemind/branches/branch-2-0-annot/.classpath Mon Jun 12 14:44:52 2006
@@ -33,5 +33,8 @@
 	<classpathentry kind="var" path="M2_REPO/oro/oro/2.0.8/oro-2.0.8.jar"/>
 	<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-full/1.0.1/spring-full-1.0.1.jar"/>
+	<classpathentry output="xml/target/eclipse-classes" kind="src" path="xml/src/java"/>
+	<classpathentry output="xml/target/eclipse-classes" kind="src" path="xml/src/descriptor"/>
+	<classpathentry output="xml/target/eclipse-test-classes" kind="src" path="xml/src/test"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: jakarta/hivemind/branches/branch-2-0-annot/examples/src/java/org/apache/examples/ExampleUtils.java
URL: http://svn.apache.org/viewvc/jakarta/hivemind/branches/branch-2-0-annot/examples/src/java/org/apache/examples/ExampleUtils.java?rev=413747&r1=413746&r2=413747&view=diff
==============================================================================
--- jakarta/hivemind/branches/branch-2-0-annot/examples/src/java/org/apache/examples/ExampleUtils.java (original)
+++ jakarta/hivemind/branches/branch-2-0-annot/examples/src/java/org/apache/examples/ExampleUtils.java Mon Jun 12 14:44:52 2006
@@ -15,17 +15,14 @@
 package org.apache.examples;
 
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Locale;
 
 import org.apache.hivemind.ClassResolver;
-import org.apache.hivemind.ModuleDescriptorProvider;
 import org.apache.hivemind.Registry;
 import org.apache.hivemind.Resource;
 import org.apache.hivemind.impl.DefaultClassResolver;
 import org.apache.hivemind.impl.RegistryBuilder;
-import org.apache.hivemind.impl.XmlModuleDescriptorProvider;
+import org.apache.hivemind.impl.XmlModuleReader;
 import org.apache.hivemind.util.URLResource;
 
 /**
@@ -58,30 +55,22 @@
         throws Exception
     {
         ClassResolver resolver = new DefaultClassResolver();
+        
+        RegistryBuilder builder = new RegistryBuilder();
+        builder.autoDetectModules();
 
-        List descriptorResources = new ArrayList();
-        for(int i = 0; i < files.length; i++)
+        for (int i = 0; i < files.length; i++)
         {
             Resource resource = getResource(files[i]);
-            descriptorResources.add(resource);
-        }
-
-        ModuleDescriptorProvider provider = new XmlModuleDescriptorProvider(resolver, descriptorResources);
-
-        return buildRegistry(provider);
-    }
-
-    protected static Registry buildRegistry(ModuleDescriptorProvider customProvider)
-    {
-        ClassResolver resolver = new DefaultClassResolver();
-
-        RegistryBuilder builder = new RegistryBuilder();
 
-        builder.addModuleDescriptorProvider(new XmlModuleDescriptorProvider(resolver));
-        builder.addModuleDescriptorProvider(customProvider);
+            XmlModuleReader reader = new XmlModuleReader(builder.getRegistryDefinition(),
+                    resolver, builder.getErrorHandler());
+            reader.readModule(resource);
+        }
 
         return builder.constructRegistry(Locale.getDefault());
     }
+
 
     /**
      * Returns the given file as a {@link Resource} from the classpath.

Modified: jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/Registry.java
URL: http://svn.apache.org/viewvc/jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/Registry.java?rev=413747&r1=413746&r2=413747&view=diff
==============================================================================
--- jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/Registry.java (original)
+++ jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/Registry.java Mon Jun 12 14:44:52 2006
@@ -16,9 +16,6 @@
 
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
-
-import org.apache.hivemind.internal.Module;
 
 /**
  * The HiveMind registry; primarily this is used to gain access to services.
@@ -57,45 +54,15 @@
     public boolean containsService(String serviceId, Class serviceInterface);
 
     /**
-     * Returns a configuration as a List of elements (as defined by the schema for the configuration
-     * point, or as {@link org.apache.hivemind.Element}s if no configuration point does not define
-     * a schema.
+     * Returns the container of the configuration point.
      * 
      * @param configurationId
      *            the fully qualified id of the configuration to obtain
-     * @return the configuration as an immutable List
-     * @throws ApplicationRuntimeException
-     *             if the configuration does not exist, etc.
-     */
-    public List getConfiguration(String configurationId);
-
-    /**
-     * Returns true if the elements contributed to the given configuration point can be
-     * {@link #getConfigurationAsMap(String) retrieved as a Map}.
-     * 
-     * @param configurationId
-     *            the fully qualified id of the configuration
+     * @return the configuration container 
      * @throws ApplicationRuntimeException
      *             if the configuration does not exist, etc.
-     * @see Module#isConfigurationMappable(String)
-     * @since 1.1
-     */
-    public boolean isConfigurationMappable(String configurationId);
-
-    /**
-     * Returns the elements of the given configuration point as an unmodifiable {@link Map}. It may
-     * be empty, but not null.
-     * 
-     * @param configurationId
-     *            the fully qualified id of the configuration
-     * @throws ApplicationRuntimeException
-     *             if no public configuration point with the given id exists or if the elements
-     *             can't be mapped.
-     * @see Module#getConfigurationAsMap(String)
-     * @see #isConfigurationMappable(String)
-     * @since 1.1
      */
-    public Map getConfigurationAsMap(String configurationId);
+    public Object getConfiguration(String configurationId);
 
     /**
      * Expands any substitution symbols in the input string, replacing each symbol with the symbols

Added: jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationPointDefinition.java
URL: http://svn.apache.org/viewvc/jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationPointDefinition.java?rev=413747&view=auto
==============================================================================
--- jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationPointDefinition.java (added)
+++ jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationPointDefinition.java Mon Jun 12 14:44:52 2006
@@ -0,0 +1,75 @@
+package org.apache.hivemind.definition;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.hivemind.Location;
+import org.apache.hivemind.Occurances;
+import org.apache.hivemind.internal.ConfigurationConstructor;
+import org.apache.hivemind.internal.Visibility;
+
+public class ConfigurationPointDefinition extends ExtensionPointDefinition
+{
+    private ConfigurationConstructor _constructor;
+
+    private String _containerClassName;
+
+    private Occurances _expectedContributions;
+
+    private List _contributions = new ArrayList();
+
+    public ConfigurationPointDefinition()
+    {
+    }
+
+    public ConfigurationPointDefinition(String id, Location location, Visibility visibility,
+            ConfigurationConstructor constructor, String containerClassName,
+            Occurances expectedContributions)
+    {
+        super(id, location, visibility);
+        _constructor = constructor;
+        _containerClassName = containerClassName;
+        _expectedContributions = expectedContributions;
+    }
+
+    public ConfigurationConstructor getConstructor()
+    {
+        return _constructor;
+    }
+
+    public void setConstructor(ConfigurationConstructor constructor)
+    {
+        _constructor = constructor;
+    }
+
+    public String getContainerClassName()
+    {
+        return _containerClassName;
+    }
+
+    public void setContainerClassName(String containerClassName)
+    {
+        _containerClassName = containerClassName;
+    }
+
+    public Occurances getExpectedContributions()
+    {
+        return _expectedContributions;
+    }
+
+    public void setExpectedContributions(Occurances expectedContributions)
+    {
+        _expectedContributions = expectedContributions;
+    }
+
+    public List getContributions()
+    {
+        return _contributions;
+    }
+
+    public void addContribution(ContributionDefinition contribution)
+    {
+        _contributions.add(contribution);
+    }
+
+}

Added: jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ContributionDefinition.java
URL: http://svn.apache.org/viewvc/jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ContributionDefinition.java?rev=413747&view=auto
==============================================================================
--- jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ContributionDefinition.java (added)
+++ jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ContributionDefinition.java Mon Jun 12 14:44:52 2006
@@ -0,0 +1,30 @@
+package org.apache.hivemind.definition;
+
+import org.apache.hivemind.Location;
+import org.apache.hivemind.internal.Contribution;
+
+public class ContributionDefinition extends ExtensionDefinition
+{
+    private Contribution _contributionConstructor;
+
+    public ContributionDefinition()
+    {
+    }
+
+    public ContributionDefinition(Location location,
+            Contribution contributionConstructor)
+    {
+        super(location);
+        _contributionConstructor = contributionConstructor;
+    }
+
+    public Contribution getContributionConstructor()
+    {
+        return _contributionConstructor;
+    }
+
+    public void setContributionConstructor(Contribution contributionConstructor)
+    {
+        _contributionConstructor = contributionConstructor;
+    }
+}

Added: jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionDefinition.java
URL: http://svn.apache.org/viewvc/jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionDefinition.java?rev=413747&view=auto
==============================================================================
--- jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionDefinition.java (added)
+++ jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionDefinition.java Mon Jun 12 14:44:52 2006
@@ -0,0 +1,43 @@
+package org.apache.hivemind.definition;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.hivemind.Location;
+
+public class ExtensionDefinition
+{
+    private Location _location;
+
+    private Map _natures = new HashMap();
+
+    public ExtensionDefinition()
+    {
+    }
+
+    public ExtensionDefinition(Location location)
+    {
+        _location = location;
+    }
+
+    public Location getLocation()
+    {
+        return _location;
+    }
+
+    public void setLocation(Location location)
+    {
+        _location = location;
+    }
+
+    public Object getNature(Class natureClass)
+    {
+        return _natures.get(natureClass);
+    }
+
+    public void addNature(Class natureClass, Object nature)
+    {
+        _natures.put(natureClass, nature);
+    }
+
+}

Added: jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java
URL: http://svn.apache.org/viewvc/jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java?rev=413747&view=auto
==============================================================================
--- jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java (added)
+++ jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java Mon Jun 12 14:44:52 2006
@@ -0,0 +1,75 @@
+package org.apache.hivemind.definition;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.hivemind.Location;
+import org.apache.hivemind.internal.Visibility;
+
+public class ExtensionPointDefinition
+{
+    private String _id;
+
+    private Location _location;
+
+    private Visibility _visibility;
+    
+    private Map _natures = new HashMap();
+
+    public ExtensionPointDefinition()
+    {
+    }
+
+    public ExtensionPointDefinition(String id, Location location, Visibility visibility)
+    {
+        _id = id;
+        _location = location;
+        _visibility = visibility;
+    }
+
+    public String getId()
+    {
+        return _id;
+    }
+
+    public void setId(String id)
+    {
+        _id = id;
+    }
+
+    public Location getLocation()
+    {
+        return _location;
+    }
+
+    public void setLocation(Location location)
+    {
+        _location = location;
+    }
+
+    public Visibility getVisibility()
+    {
+        return _visibility;
+    }
+
+    public void setVisibility(Visibility visibility)
+    {
+        _visibility = visibility;
+    }
+
+    public Object getNature(Class natureClass)
+    {
+        return _natures.get(natureClass);
+    }
+    
+    public Map getNatures()
+    {
+        return _natures;
+    }
+
+    public void addNature(Class natureClass, Object nature)
+    {
+        _natures.put(natureClass, nature);
+    }
+
+}

Added: jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ImplMessages.java
URL: http://svn.apache.org/viewvc/jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ImplMessages.java?rev=413747&view=auto
==============================================================================
--- jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ImplMessages.java (added)
+++ jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ImplMessages.java Mon Jun 12 14:44:52 2006
@@ -0,0 +1,398 @@
+// Copyright 2004, 2005 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.hivemind.definition;
+
+import java.net.URL;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.apache.hivemind.ClassResolver;
+import org.apache.hivemind.Element;
+import org.apache.hivemind.HiveMind;
+import org.apache.hivemind.Location;
+import org.apache.hivemind.Occurances;
+import org.apache.hivemind.Resource;
+import org.apache.hivemind.events.RegistryShutdownListener;
+import org.apache.hivemind.impl.MessageFormatter;
+import org.apache.hivemind.impl.ServicePointImpl;
+import org.apache.hivemind.impl.TranslatorContribution;
+import org.apache.hivemind.internal.ConfigurationPoint;
+import org.apache.hivemind.internal.ExtensionPoint;
+import org.apache.hivemind.internal.Module;
+import org.apache.hivemind.internal.ServiceInterceptorContribution;
+import org.apache.hivemind.internal.ServicePoint;
+import org.apache.hivemind.parse.ContributionDescriptor;
+import org.apache.hivemind.schema.SchemaProcessor;
+
+/**
+ * Used to format messages used in errors and log output for classes within the impl package.
+ * 
+ * @author Howard Lewis Ship
+ */
+class ImplMessages
+{
+    private static final MessageFormatter _formatter = new MessageFormatter(ImplMessages.class,
+            "ImplStrings");
+
+    static String recursiveServiceBuild(ServicePoint point)
+    {
+        return _formatter.format("recursive-service-build", point.getExtensionPointId());
+    }
+
+    static String recursiveConfiguration(String pointId)
+    {
+        return _formatter.format("recursive-configuration", pointId);
+    }
+
+    static String unableToConstructConfiguration(String pointId, Throwable exception)
+    {
+        return _formatter.format("unable-to-construct-configuration", pointId, exception
+                .getMessage());
+    }
+
+    static String unknownServiceModel(String name)
+    {
+        return _formatter.format("unknown-service-model", name);
+    }
+
+    static String unknownTranslatorName(String name, String configurationId)
+    {
+        return _formatter.format("unknown-translator-name", name, configurationId);
+    }
+
+    static String duplicateTranslatorName(String name, Location oldLocation)
+    {
+        return _formatter.format("duplicate-translator-name", name, HiveMind
+                .getLocationString(oldLocation));
+    }
+
+    static String translatorInstantiationFailure(Class translatorClass, Throwable cause)
+    {
+        return _formatter.format(
+                "translator-instantiation-failure",
+                translatorClass.getName(),
+                cause);
+    }
+
+    static String unqualifiedServicePoint( String serviceId, String matchingIds )
+    {
+        return _formatter.format( "unqualified-service-point", serviceId, matchingIds );
+    }
+    
+    static String noSuchServicePoint(String serviceId)
+    {
+        return _formatter.format("no-such-service-point", serviceId);
+    }
+
+    static String unableToLoadClass(String name, ClassLoader loader, Throwable cause)
+    {
+        return _formatter.format("unable-to-load-class", name, loader, cause);
+    }
+
+    static String nullInterceptor(ServiceInterceptorContribution contribution,
+            ServicePoint point)
+    {
+        return _formatter.format("null-interceptor", contribution.getFactoryServiceId(), point
+                .getExtensionPointId());
+    }
+
+    static String interceptorDoesNotImplementInterface(Object interceptor,
+            ServiceInterceptorContribution contribution, ServicePoint point, Class serviceInterface)
+    {
+        return _formatter.format("interceptor-does-not-implement-interface", new Object[]
+        { interceptor, contribution.getFactoryServiceId(), point.getExtensionPointId(),
+                serviceInterface.getName() });
+    }
+
+    static String unableToReadMessages(URL url)
+    {
+        return _formatter.format("unable-to-read-messages", url);
+    }
+
+    static String unableToParse(Resource resource, Throwable cause)
+    {
+        return _formatter.format("unable-to-parse", resource, cause);
+    }
+
+    static String unableToFindModules(ClassResolver resolver, Throwable cause)
+    {
+        return _formatter.format("unable-to-find-modules", resolver, cause);
+    }
+
+    static String duplicateModuleId(String moduleId, Location locationOfExisting,
+            Location locationOfDuplicate)
+    {
+        return _formatter.format(
+                "duplicate-module-id",
+                moduleId,
+                locationOfExisting.getResource(),
+                locationOfDuplicate.getResource());
+    }
+
+    static String duplicateExtensionPointId(String pointId, ExtensionPoint existingPoint)
+    {
+        return _formatter.format("duplicate-extension-point", pointId, existingPoint.getLocation());
+    }
+
+    static String unknownConfigurationPoint(String moduleId,
+            String configurationId)
+    {
+        return _formatter.format("unknown-configuration-extension-point", moduleId, configurationId);
+    }
+
+    static String unknownServicePoint(String moduleId, String pointId)
+    {
+        return _formatter.format(
+                "unknown-service-extension-point",
+                moduleId,
+                pointId);
+    }
+
+    static String missingService(ServicePoint point)
+    {
+        return _formatter.format("missing-service", point.getExtensionPointId());
+    }
+
+    static String duplicateFactory(Module sourceModule, String pointId,
+            ServicePointImpl existing)
+    {
+        return _formatter.format("duplicate-factory", sourceModule.getModuleId(), pointId, existing
+                .getServiceConstructor().getContributingModuleId());
+    }
+
+    static String wrongNumberOfContributions(ConfigurationPoint point, int actualCount,
+            Occurances expectation)
+    {
+        return _formatter.format(
+                "wrong-number-of-contributions",
+                point.getExtensionPointId(),
+                contributionCount(actualCount),
+                occurances(expectation));
+    }
+
+    static String occurances(Occurances occurances)
+    {
+        return _formatter.getMessage("occurances." + occurances.getName());
+    }
+
+    static String contributionCount(int count)
+    {
+        return _formatter.format("contribution-count", new Integer(count));
+    }
+
+    static String wrongNumberOfParameters(String factoryServiceId, int actualCount,
+            Occurances expectation)
+    {
+        return _formatter.format(
+                "wrong-number-of-parameters",
+                factoryServiceId,
+                contributionCount(actualCount),
+                occurances(expectation));
+
+    }
+
+    static String noSuchConfiguration(String pointId)
+    {
+        return _formatter.format("no-such-configuration", pointId);
+    }
+
+    static String noSuchSymbol(String name)
+    {
+        return _formatter.format("no-such-symbol", name);
+    }
+
+    static String symbolSourceContribution()
+    {
+        return _formatter.getMessage("symbol-source-contribution");
+    }
+
+    static String unknownAttribute(String name)
+    {
+        return _formatter.format("unknown-attribute", name);
+    }
+
+    static String missingAttribute(String name)
+    {
+        return _formatter.format("missing-attribute", name);
+    }
+
+    static String uniqueAttributeConstraintBroken(String name, String value,
+            Location priorLocation)
+    {
+        return _formatter.format("unique-attribute-constraint-broken", name, value, priorLocation);
+    }
+
+    static String elementErrors(SchemaProcessor processor, Element element)
+    {
+        return _formatter.format("element-errors", processor.getElementPath(), element
+                .getLocation());
+    }
+
+    static String unknownElement(SchemaProcessor processor, Element element)
+    {
+        return _formatter.format("unknown-element", processor.getElementPath());
+    }
+
+    static String badInterface(String interfaceName, String pointId)
+    {
+        return _formatter.format("bad-interface", interfaceName, pointId);
+    }
+
+    static String serviceWrongInterface(ServicePoint servicePoint, Class requestedInterface)
+    {
+        return _formatter.format(
+                "service-wrong-interface",
+                servicePoint.getExtensionPointId(),
+                requestedInterface.getName(),
+                servicePoint.getServiceInterface().getName());
+    }
+
+    static String shutdownCoordinatorFailure(RegistryShutdownListener listener,
+            Throwable cause)
+    {
+        return _formatter.format("shutdown-coordinator-failure", listener, cause);
+    }
+
+    static String unlocatedError(String message)
+    {
+        return _formatter.format("unlocated-error", message);
+    }
+
+    static String locatedError(Location location, String message)
+    {
+        return _formatter.format("located-error", location, message);
+    }
+
+    static String interceptorContribution()
+    {
+        return _formatter.getMessage("interceptor-contribution");
+    }
+
+    static String registryAlreadyStarted()
+    {
+        return _formatter.getMessage("registry-already-started");
+    }
+
+    static String noServicePointForInterface(Class interfaceClass)
+    {
+        return _formatter.format("no-service-point-for-interface", interfaceClass.getName());
+    }
+
+    static String multipleServicePointsForInterface(Class interfaceClass,
+            Collection matchingPoints)
+    {
+        StringBuffer buffer = new StringBuffer("{");
+
+        boolean following = false;
+
+        Iterator i = matchingPoints.iterator();
+        while (i.hasNext())
+        {
+            if (following)
+                buffer.append(", ");
+
+            ServicePoint p = (ServicePoint) i.next();
+
+            buffer.append(p.getExtensionPointId());
+
+            following = true;
+        }
+
+        buffer.append("}");
+
+        return _formatter.format(
+                "multiple-service-points-for-interface",
+                interfaceClass.getName(),
+                buffer);
+    }
+
+    static String incompleteTranslator(TranslatorContribution c)
+    {
+        return _formatter.format("incomplete-translator", c.getName());
+    }
+
+    static String schemaStackViolation(SchemaProcessor processor)
+    {
+        return _formatter.format("schema-stack-violation", processor.getElementPath());
+    }
+
+    static String subModuleDoesNotExist(Resource subModuleDescriptor)
+    {
+        return _formatter.format("sub-module-does-not-exist", subModuleDescriptor);
+    }
+
+    static String dependencyOnUnknownModule(String toModuleId)
+    {
+        return _formatter.format("dependency-on-unknown-module", toModuleId);
+    }
+
+    private static String convertModule(Module module)
+    {
+        if (module == null)
+            return _formatter.getMessage("null-module");
+
+        return _formatter.format("module", module.getModuleId());
+    }
+
+    static String unableToResolveSchema(String schemaId)
+    {
+        return _formatter.format("unable-to-resolve-schema", schemaId);
+    }
+
+    static String schemaNotVisible(String schemaId, String moduleId)
+    {
+        return _formatter.format("schema-not-visible", schemaId, moduleId);
+    }
+
+    static String serviceNotVisible(String serviceId, Module module)
+    {
+        return _formatter.format("service-not-visible", serviceId, convertModule(module));
+    }
+
+    static String configurationNotVisible(String configurationId, Module module)
+    {
+        return _formatter.format(
+                "configuration-not-visible",
+                configurationId,
+                convertModule(module));
+    }
+
+    static String configurationPointNotVisible(ConfigurationPoint point,
+            Module contributingModule)
+    {
+        return _formatter.format(
+                "configuration-point-not-visible",
+                point.getExtensionPointId(),
+                contributingModule.getModuleId());
+    }
+
+    static String servicePointNotVisible(ServicePoint point, Module contributingModule)
+    {
+        return _formatter.format(
+                "service-point-not-visible",
+                point.getExtensionPointId(),
+                contributingModule.getModuleId());
+    }
+
+    static String unableToMapConfiguration(ConfigurationPoint point)
+    {
+        return _formatter.format("unable-to-map-configuration", point.getExtensionPointId());
+    }
+
+    static String unableToConvertType(String type, String packageName)
+    {
+        return _formatter.format("unable-to-convert-type", type, packageName);
+    }
+}
\ No newline at end of file

Added: jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ImplStrings.properties
URL: http://svn.apache.org/viewvc/jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ImplStrings.properties?rev=413747&view=auto
==============================================================================
--- jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ImplStrings.properties (added)
+++ jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ImplStrings.properties Mon Jun 12 14:44:52 2006
@@ -0,0 +1,88 @@
+# Copyright 2004, 2005 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+recursive-service-build=A recursive call to construct service {0} has occured.  This indicates a cycle between one or more services or configurations.
+recursive-configuration=A recursive call to construct configuration {0} has occured.  This indicates a cycle between one or more configurations or services.
+unable-to-construct-configuration=Unable to construct configuration {0}: {1}
+unknown-service-model=Service model ''{0}'' is not defined.
+unknown-translator-name=No translator named ''{0}'' has been registered in configuration point {1}.
+duplicate-translator-name=Translator ''{0}'' duplicates a previous definition at {1} and has been ignored.
+translator-instantiation-failure=Unable to instantiate translator class {0}: {1}
+registry-shutdown=The HiveMind Registry has been shutdown.
+no-such-service-point=Service point {0} does not exist.
+unqualified-service-point=The service id specified ("{0}") is not fully qualified.  Perhaps you meant one of {1}.
+no-service-point-for-interface=There is no service point for interface {0}.
+multiple-service-points-for-interface=There are multiple service points for interface {0}: {1}.
+unable-to-load-class=Could not load class {0} from {1}: {2}
+null-interceptor=Service {0} generated a null interceptor (for service point {1}).
+interceptor-does-not-implement-interface=The service interceptor ({0}) generated by service {1} for service point {2} does not implement the {3} interface defined by the service point.
+unable-to-read-messages=Unable to read message properties from {0}.
+unable-to-parse=Unable to parse module deployment descriptor {0}: {1}
+unable-to-find-modules=Unable to locate HiveMind module deployment descriptors in {0}: {1}
+duplicate-module-id=Module {0} is duplicated!  Definition in {2} has been ignored in favor of existing definition from {1}.
+duplicate-extension-point=Extension point {0} conflicts with definition at {1} and has been ignored.
+unknown-configuration-extension-point=Module {0} has contributed to unknown configuration point {1}. The contribution has been ignored.
+unknown-service-extension-point=Module {0} contributed to unknown service point {1}. The contribution has been ignored.
+missing-service=No module has contributed a service constructor for service point {0}.
+duplicate-factory=Module {0} has contributed a instance builder to service point {1}, which conflicts with an existing contribution by module {2}. The duplicate contribution has been ignored.  
+
+occurances.NONE=no contributions
+occurances.OPTIONAL=an optional contribution
+occurances.REQUIRED=exactly one contribution
+occurances.ONE_PLUS=at least one contribution
+
+contribution-count={0,choice,0#no contributions|1#one contribution|1<{0,number,integer} contributions}
+
+wrong-number-of-contributions=Configuration point {0} contains {1} but expects {2}.
+wrong-number-of-parameters=Parameters to service implementation factory {0} contains {1} but expects {2}.
+
+no-such-configuration=Configuration point {0} does not exist.
+no-such-symbol=No value available for symbol ''{0}''.
+symbol-source-contribution=symbol source
+unknown-attribute=Attribute ''{0}'' is not defined in the schema.
+missing-attribute=Attribute ''{0}'' is required but no value was provided.
+unique-attribute-constraint-broken=Value for attribute ''{0}'' (''{1}'') duplicates a prior instance at {2}.
+element-errors=Element {0} (at {1}) contains errors:
+unknown-element=Element {0} is not allowed here.
+bad-interface=Unable to find interface {0} (for service {1}).
+service-wrong-interface=Service {0} does not implement the requested interface ({1}).  The declared service interface type is {2}.
+shutdown-coordinator-failure=Unable to shutdown {0}: {1}
+sub-module-does-not-exist=Sub-module {0} does not exist.
+
+dependency-on-unknown-module=Required module {0} does not exist.
+dependency-version-mismatch=Version of required module {0} does not match expected version {1}.
+
+unlocated-error=Error: {0}
+located-error=Error at {0}: {1}
+
+interceptor-contribution=interceptor contribution
+registry-already-started=The HiveMind Registry has already been started.
+
+incomplete-translator=Translator contribution ''{0}'' must specify either the service-id or class attribute.
+
+schema-stack-violation=The rules for processing element {0} have incorrectly manipulated the schema processor object stack.
+
+null-module=the application
+module=module {0}
+
+unable-to-resolve-schema=Unable to resolve reference to schema ''{0}''.
+schema-not-visible=Schema ''{0}'' is not visible to module {1}.
+service-not-visible=Service point {0} is not visible to {1}.
+configuration-not-visible=Configuration point {0} is not visible to {1}.
+
+configuration-point-not-visible=Configuration point {0} is not visible to module {1}.
+service-point-not-visible=Service point {0} is not visible to module {1}.
+
+unable-to-map-configuration=Unable to map the contributions to configuration point {0}. All top-level schema elements must define a key attribute.
+unable-to-convert-type=Unable to convert type ''{0}'' to a Java class, either as is, or in package {1}.
\ No newline at end of file

Added: jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ModuleDefinition.java
URL: http://svn.apache.org/viewvc/jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ModuleDefinition.java?rev=413747&view=auto
==============================================================================
--- jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ModuleDefinition.java (added)
+++ jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ModuleDefinition.java Mon Jun 12 14:44:52 2006
@@ -0,0 +1,120 @@
+package org.apache.hivemind.definition;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.hivemind.ClassResolver;
+import org.apache.hivemind.Location;
+
+public class ModuleDefinition
+{
+    private String _id;
+
+    private Location _location;
+
+    private String _packageName;
+
+    private ClassResolver _classResolver;
+    
+    private Map _servicePoints = new HashMap();
+    
+    private Map _configurationPoints = new HashMap();
+    
+    private Collection _dependencies = new ArrayList();
+
+    public ModuleDefinition()
+    {
+    }
+
+    public ModuleDefinition(String id, Location location, ClassResolver resolver, String packageName)
+    {
+        _id = id;
+        _location = location;
+        _classResolver = resolver;
+        _packageName = packageName;
+    }
+
+    public ClassResolver getClassResolver()
+    {
+        return _classResolver;
+    }
+
+    public void setClassResolver(ClassResolver classResolver)
+    {
+        _classResolver = classResolver;
+    }
+
+    public Location getLocation()
+    {
+        return _location;
+    }
+
+    public void setLocation(Location location)
+    {
+        _location = location;
+    }
+
+    public String getId()
+    {
+        return _id;
+    }
+
+    public void setId(String moduleId)
+    {
+        this._id = moduleId;
+    }
+
+    public String getPackageName()
+    {
+        return _packageName;
+    }
+
+    public void setPackageName(String packageName)
+    {
+        _packageName = packageName;
+    }
+    
+    public void addServicePoint(ServicePointDefinition servicePoint) 
+    {
+        _servicePoints.put(servicePoint.getId(), servicePoint);
+    }
+
+    public ServicePointDefinition getServicePoint(String id)
+    {
+        return (ServicePointDefinition) _servicePoints.get(id);
+    }
+    
+    public Collection getServicePoints()
+    {
+        return _servicePoints.values();
+    }
+ 
+    public void addConfigurationPoint(ConfigurationPointDefinition configurationPoint) 
+    {
+        _configurationPoints.put(configurationPoint.getId(), configurationPoint);
+    }
+
+    public ConfigurationPointDefinition getConfigurationPoint(String id)
+    {
+        return (ConfigurationPointDefinition) _configurationPoints.get(id);
+    }
+    
+    public Collection getConfigurationPoints()
+    {
+        return _configurationPoints.values();
+    }
+
+    public Collection getDependencies()
+    {
+        return _dependencies;
+    }
+    
+    public void addDependency(String dependsOnModuleId) 
+    {
+        _dependencies.add(dependsOnModuleId);
+    }
+   
+    
+}

Added: jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/RegistryDefinition.java
URL: http://svn.apache.org/viewvc/jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/RegistryDefinition.java?rev=413747&view=auto
==============================================================================
--- jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/RegistryDefinition.java (added)
+++ jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/RegistryDefinition.java Mon Jun 12 14:44:52 2006
@@ -0,0 +1,257 @@
+package org.apache.hivemind.definition;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hivemind.ErrorHandler;
+import org.apache.hivemind.impl.RegistryPostProcessor;
+import org.apache.hivemind.util.IdUtils;
+
+/**
+ * 
+ * The order of additions of 
+ * registry parts is arbitrary. For example there is no guarantee that a configuration
+ * point is added before a corresponding contribution is added. 
+ * 
+ * @author Achim Huegen
+ */
+public class RegistryDefinition
+{
+    private static final Log LOG = LogFactory.getLog(RegistryDefinition.class);
+
+    private ErrorHandler _errorHandler;
+
+    private Map _modules = new HashMap();
+
+    private Map _natures = new HashMap();
+
+    private List _unresolvedImplementations = new ArrayList();
+
+    private List _unresolvedContributions = new ArrayList();
+
+    private List _unresolvedInterceptors = new ArrayList();
+    
+    private List _postProcessors = new ArrayList();
+
+    public RegistryDefinition(ErrorHandler errorHandler)
+    {
+        _errorHandler = errorHandler;
+    }
+
+    public void addModule(ModuleDefinition module)
+    {
+        if (_modules.containsKey(module.getId()))
+        {
+            ModuleDefinition existing = (ModuleDefinition) _modules.get(module.getId());
+
+            _errorHandler.error(LOG, ImplMessages.duplicateModuleId(module.getId(), existing
+                    .getLocation(), module.getLocation()), null, null);
+
+        }
+        else
+        {
+            if (LOG.isDebugEnabled())
+                LOG.debug("Adding module " + module.getId() + " to registry definition");
+
+            _modules.put(module.getId(), module);
+        }
+    }
+    
+    public void addPostProcessor(RegistryPostProcessor postProcessor)
+    {
+        _postProcessors.add(postProcessor);
+    }
+
+    public List getPostProcessors()
+    {
+        return _postProcessors;
+    }
+    
+    public Collection getModules()
+    {
+        return _modules.values();
+    }
+
+    public ModuleDefinition getModule(String id)
+    {
+        return (ModuleDefinition) _modules.get(id);
+    }
+
+    public Object getNature(Class natureClass)
+    {
+        return _natures.get(natureClass);
+    }
+
+    public void addNature(Class natureClass, Object nature)
+    {
+        _natures.put(natureClass, nature);
+    }
+    
+    public Map getNatures()
+    {
+        return _natures;
+    }
+
+    public ServicePointDefinition getServicePoint(String qualifiedServicePointId)
+    {
+        String moduleId = IdUtils.extractModule(qualifiedServicePointId);
+        String servicePointId = IdUtils.stripModule(qualifiedServicePointId);
+
+        ServicePointDefinition servicePoint = null;
+        ModuleDefinition module = getModule(moduleId);
+        if (module != null)
+        {
+            servicePoint = module.getServicePoint(servicePointId);
+        }
+        return servicePoint;
+    }
+
+    public ConfigurationPointDefinition getConfigurationPoint(String qualifiedConfigurationPointId)
+    {
+        String moduleId = IdUtils.extractModule(qualifiedConfigurationPointId);
+        String configurationPointId = IdUtils.stripModule(qualifiedConfigurationPointId);
+
+        ConfigurationPointDefinition configurationPoint = null;
+        ModuleDefinition module = getModule(moduleId);
+        if (module != null)
+        {
+            configurationPoint = module.getConfigurationPoint(configurationPointId);
+        }
+        return configurationPoint;
+    }
+
+    public void addServiceImplementation(String qualifiedServicePointId,
+            ServiceImplementationDefinition implementation)
+    {
+        ServicePointDefinition servicePoint = getServicePoint(qualifiedServicePointId);
+        if (servicePoint != null)
+        {
+            servicePoint.addImplementation(implementation);
+        }
+        else
+        {
+            UnresolvedExtension unresolvedExtension = new UnresolvedExtension(implementation,
+                    qualifiedServicePointId);
+            _unresolvedImplementations.add(unresolvedExtension);
+        }
+    }
+
+    public void addServiceInterceptor(String qualifiedServicePointId,
+            ServiceInterceptorDefinition interceptor)
+    {
+        ServicePointDefinition servicePoint = getServicePoint(qualifiedServicePointId);
+        if (servicePoint != null)
+        {
+            servicePoint.addInterceptor(interceptor);
+        }
+        else
+        {
+            UnresolvedExtension unresolvedExtension = new UnresolvedExtension(interceptor,
+                    qualifiedServicePointId);
+            _unresolvedInterceptors.add(unresolvedExtension);
+        }
+    }
+
+    public void addContribution(String qualifiedConfigurationPointId,
+            ContributionDefinition contribution)
+    {
+        ConfigurationPointDefinition configurationPoint = getConfigurationPoint(qualifiedConfigurationPointId);
+        if (configurationPoint != null)
+        {
+            configurationPoint.addContribution(contribution);
+        }
+        else
+        {
+            UnresolvedExtension unresolvedExtension = new UnresolvedExtension(contribution,
+                    qualifiedConfigurationPointId);
+            _unresolvedContributions.add(unresolvedExtension);
+        }
+    }
+
+    /**
+     * Resolves all extensions, that couldn't be resolved already because the extension was added
+     * before the referenced extension point.
+     */
+    public void resolveExtensions()
+    {
+        resolveImplementations();
+        resolveInterceptors();
+        resolveConfigurations();
+    }
+
+    public void resolveImplementations()
+    {
+        for (Iterator iter = _unresolvedImplementations.iterator(); iter.hasNext();)
+        {
+            UnresolvedExtension unresolved = (UnresolvedExtension) iter.next();
+            String servicePointId = unresolved.getExtensionPointId();
+            ServicePointDefinition servicePoint = getServicePoint(servicePointId);
+            if (servicePoint == null)
+            {
+                _errorHandler.error(
+                        LOG,
+                        ImplMessages.unknownServicePoint(
+                                IdUtils.extractModule(servicePointId),
+                                IdUtils.stripModule(servicePointId)),
+                        unresolved.getExtension().getLocation(),
+                        null);
+            } else {
+                servicePoint.addImplementation((ServiceImplementationDefinition) unresolved.getExtension());
+            }
+
+        }
+    }
+    
+    public void resolveInterceptors()
+    {
+        for (Iterator iter = _unresolvedInterceptors.iterator(); iter.hasNext();)
+        {
+            UnresolvedExtension unresolved = (UnresolvedExtension) iter.next();
+            String servicePointId = unresolved.getExtensionPointId();
+            ServicePointDefinition servicePoint = getServicePoint(servicePointId);
+            if (servicePoint == null)
+            {
+                _errorHandler.error(
+                        LOG,
+                        ImplMessages.unknownServicePoint(
+                                IdUtils.extractModule(servicePointId),
+                                IdUtils.stripModule(servicePointId)),
+                        unresolved.getExtension().getLocation(),
+                        null);
+            } else {
+                servicePoint.addInterceptor((ServiceInterceptorDefinition) unresolved.getExtension());
+            }
+
+        }
+    }
+    
+    public void resolveConfigurations()
+    {
+        for (Iterator iter = _unresolvedContributions.iterator(); iter.hasNext();)
+        {
+            UnresolvedExtension unresolved = (UnresolvedExtension) iter.next();
+            String configurationPointId = unresolved.getExtensionPointId();
+            ConfigurationPointDefinition configurationPoint = getConfigurationPoint(configurationPointId);
+            if (configurationPoint == null)
+            {
+                _errorHandler.error(
+                        LOG,
+                        ImplMessages.unknownConfigurationPoint(
+                                IdUtils.extractModule(configurationPointId),
+                                IdUtils.stripModule(configurationPointId)),
+                        unresolved.getExtension().getLocation(),
+                        null);
+            } else {
+                configurationPoint.addContribution((ContributionDefinition) unresolved.getExtension());
+            }
+
+        }
+    }
+
+}

Added: jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/RegistryNature.java
URL: http://svn.apache.org/viewvc/jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/RegistryNature.java?rev=413747&view=auto
==============================================================================
--- jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/RegistryNature.java (added)
+++ jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/RegistryNature.java Mon Jun 12 14:44:52 2006
@@ -0,0 +1,8 @@
+package org.apache.hivemind.definition;
+
+import org.apache.hivemind.internal.RegistryInfrastructure;
+
+public interface RegistryNature
+{
+    public void setRegistry(RegistryInfrastructure registry);
+}

Added: jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceImplementationDefinition.java
URL: http://svn.apache.org/viewvc/jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceImplementationDefinition.java?rev=413747&view=auto
==============================================================================
--- jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceImplementationDefinition.java (added)
+++ jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceImplementationDefinition.java Mon Jun 12 14:44:52 2006
@@ -0,0 +1,53 @@
+package org.apache.hivemind.definition;
+
+import org.apache.hivemind.Location;
+import org.apache.hivemind.internal.ServiceImplementationConstructor;
+
+public class ServiceImplementationDefinition extends ExtensionDefinition
+{
+    private String _serviceModel;
+    private ServiceImplementationConstructor _serviceConstructor;
+    private boolean _isDefault;
+    
+    public ServiceImplementationDefinition()
+    {
+    }
+
+    public ServiceImplementationDefinition(Location location, ServiceImplementationConstructor serviceConstructor, String serviceModel, boolean isDefault)
+    {
+        super(location);
+        _serviceConstructor = serviceConstructor;
+        _serviceModel = serviceModel;
+        _isDefault = isDefault;
+    }
+
+   public String getServiceModel()
+    {
+        return _serviceModel;
+    }
+
+    public void setServiceModel(String interfaceClassName)
+    {
+        _serviceModel = interfaceClassName;
+    }
+
+    public boolean isDefault()
+    {
+        return _isDefault;
+    }
+
+    public void setDefault(boolean isDefault)
+    {
+        _isDefault = isDefault;
+    }
+
+    public ServiceImplementationConstructor getServiceConstructor()
+    {
+        return _serviceConstructor;
+    }
+
+    public void setServiceConstructor(ServiceImplementationConstructor serviceConstructor)
+    {
+        _serviceConstructor = serviceConstructor;
+    }
+}

Added: jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceInterceptorDefinition.java
URL: http://svn.apache.org/viewvc/jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceInterceptorDefinition.java?rev=413747&view=auto
==============================================================================
--- jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceInterceptorDefinition.java (added)
+++ jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceInterceptorDefinition.java Mon Jun 12 14:44:52 2006
@@ -0,0 +1,30 @@
+package org.apache.hivemind.definition;
+
+import org.apache.hivemind.Location;
+import org.apache.hivemind.internal.ServiceInterceptorConstructor;
+
+public class ServiceInterceptorDefinition extends ExtensionDefinition
+{
+    private ServiceInterceptorConstructor _interceptorConstructor;
+
+    public ServiceInterceptorDefinition()
+    {
+    }
+
+    public ServiceInterceptorDefinition(Location location,
+            ServiceInterceptorConstructor interceptorConstructor)
+    {
+        super(location);
+        _interceptorConstructor = interceptorConstructor;
+    }
+
+    public ServiceInterceptorConstructor getServiceConstructor()
+    {
+        return _interceptorConstructor;
+    }
+
+    public void setServiceConstructor(ServiceInterceptorConstructor serviceConstructor)
+    {
+        _interceptorConstructor = serviceConstructor;
+    }
+}

Added: jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServicePointDefinition.java
URL: http://svn.apache.org/viewvc/jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServicePointDefinition.java?rev=413747&view=auto
==============================================================================
--- jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServicePointDefinition.java (added)
+++ jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServicePointDefinition.java Mon Jun 12 14:44:52 2006
@@ -0,0 +1,74 @@
+package org.apache.hivemind.definition;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.hivemind.Location;
+import org.apache.hivemind.internal.Visibility;
+
+public class ServicePointDefinition extends ExtensionPointDefinition
+{
+    private String _interfaceClassName;
+    
+    private List _implementations = new ArrayList();
+
+    private List _interceptors = new ArrayList(); 
+
+    public ServicePointDefinition()
+    {
+    }
+
+    public ServicePointDefinition(String id, Location location, Visibility visibility, String interfaceClassName)
+    {
+        super(id, location, visibility);
+        _interfaceClassName = interfaceClassName;
+    }
+
+   public String getInterfaceClassName()
+    {
+        return _interfaceClassName;
+    }
+
+    public void setInterfaceClassName(String interfaceClassName)
+    {
+        _interfaceClassName = interfaceClassName;
+    }
+
+    public List getImplementations()
+    {
+        return _implementations;
+    }
+    
+    public ServiceImplementationDefinition getDefaultImplementation()
+    {
+        ServiceImplementationDefinition defaulImplementation = null;
+        for (Iterator iter = _implementations.iterator(); iter.hasNext();)
+        {
+            ServiceImplementationDefinition impl = (ServiceImplementationDefinition) iter.next();
+            if (defaulImplementation == null)
+                defaulImplementation = impl;
+            if (impl.isDefault()) {
+                defaulImplementation = impl;
+                break;
+            }
+        }
+        
+        return defaulImplementation;
+    }
+
+    public void addImplementation(ServiceImplementationDefinition implementation)
+    {
+        _implementations.add(implementation);
+    }
+    
+    public List getInterceptors()
+    {
+        return _interceptors;
+    }
+
+    public void addInterceptor(ServiceInterceptorDefinition interceptor)
+    {
+        _interceptors.add(interceptor);
+    }
+}

Added: jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/UnresolvedExtension.java
URL: http://svn.apache.org/viewvc/jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/UnresolvedExtension.java?rev=413747&view=auto
==============================================================================
--- jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/UnresolvedExtension.java (added)
+++ jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/UnresolvedExtension.java Mon Jun 12 14:44:52 2006
@@ -0,0 +1,28 @@
+package org.apache.hivemind.definition;
+
+
+public class UnresolvedExtension
+{
+    private String _extensionPointId;
+    private ExtensionDefinition _extension;
+    
+    public UnresolvedExtension(ExtensionDefinition extension, String qualifiedExtensionPointId)
+    {
+        _extension = extension;
+        _extensionPointId = qualifiedExtensionPointId;
+    }
+
+    /**
+     * @return  qualified id of the extension point which is referenced by the extension 
+     */
+    public String getExtensionPointId()
+    {
+        return _extensionPointId;
+    }
+
+    public ExtensionDefinition getExtension()
+    {
+        return _extension;
+    }
+
+}

Modified: jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/AbstractExtensionPoint.java
URL: http://svn.apache.org/viewvc/jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/AbstractExtensionPoint.java?rev=413747&r1=413746&r2=413747&view=diff
==============================================================================
--- jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/AbstractExtensionPoint.java (original)
+++ jakarta/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/AbstractExtensionPoint.java Mon Jun 12 14:44:52 2006
@@ -14,6 +14,9 @@
 
 package org.apache.hivemind.impl;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hivemind.ErrorLog;
@@ -27,6 +30,9 @@
  * 
  * @author Howard Lewis Ship
  */
+/**
+ * @author Huegen
+ */
 public abstract class AbstractExtensionPoint extends BaseLocatable implements ExtensionPoint
 {
     private Module _module;
@@ -39,6 +45,8 @@
     /** @since 1.1 */
 
     private ErrorLog _errorLog;
+    
+    private Map _natures = new HashMap();
 
     public synchronized String toString()
     {
@@ -115,4 +123,21 @@
 
         return _errorLog;
     }
+
+    /**
+     * @see org.apache.hivemind.internal.ExtensionPoint#getNature(java.lang.Class)
+     */
+    public Object getNature(Class natureType)
+    {
+        return _natures.get(natureType);
+    }
+
+    /**
+     * @see org.apache.hivemind.internal.ExtensionPoint#addNature(java.lang.Class, java.lang.Object)
+     */
+    public void addNature(Class natureType, Object nature)
+    {
+        _natures.put(natureType, nature);
+    }
+    
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: hivemind-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: hivemind-cvs-help@jakarta.apache.org